Mercurial > vim
changeset 27283:b4d92a69035b v8.2.4170
patch 8.2.4170: MS-Windows: still using old message API calls
Commit: https://github.com/vim/vim/commit/b7057bdd090ddcce96dc058e4e65340c8ec961d7
Author: K.Takata <kentkt@csc.jp>
Date: Fri Jan 21 11:37:07 2022 +0000
patch 8.2.4170: MS-Windows: still using old message API calls
Problem: MS-Windows: still using old message API calls.
Solution: Call the "W" functions directly. (Ken Takata, closes https://github.com/vim/vim/issues/9582)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 21 Jan 2022 12:45:03 +0100 |
| parents | 76236fcc4f18 |
| children | 9010bd9efbf6 |
| files | src/gui_w32.c src/os_mswin.c src/os_win32.c src/os_win32.h src/version.c |
| diffstat | 5 files changed, 21 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -636,7 +636,7 @@ gui_mch_set_blinking(long wait, long on, KillTimer(NULL, idEvent); // Eat spurious WM_TIMER messages - while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + while (PeekMessageW(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) ; if (blink_state == BLINK_ON) @@ -665,7 +665,7 @@ gui_mswin_rm_blink_timer(void) { KillTimer(NULL, blink_timer); // Eat spurious WM_TIMER messages - while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + while (PeekMessageW(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) ; blink_timer = 0; } @@ -726,7 +726,7 @@ gui_mch_start_blink(void) s_timed_out = TRUE; // Eat spurious WM_TIMER messages - while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + while (PeekMessageW(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) ; if (idEvent == s_wait_timer) s_wait_timer = 0; @@ -1844,7 +1844,7 @@ process_message(void) static char_u k10[] = {K_SPECIAL, 'k', ';', 0}; #endif - pGetMessage(&msg, NULL, 0, 0); + GetMessageW(&msg, NULL, 0, 0); #ifdef FEAT_OLE // Look after OLE Automation commands @@ -1855,7 +1855,7 @@ process_message(void) { // Message can't be ours, forward it. Fixes problem with Ultramon // 3.0.4 - pDispatchMessage(&msg); + DispatchMessageW(&msg); } else { @@ -1868,7 +1868,7 @@ process_message(void) #ifdef MSWIN_FIND_REPLACE // Don't process messages used by the dialog - if (s_findrep_hwnd != NULL && pIsDialogMessage(s_findrep_hwnd, &msg)) + if (s_findrep_hwnd != NULL && IsDialogMessageW(s_findrep_hwnd, &msg)) { HandleMouseHide(msg.message, msg.lParam); return; @@ -2065,7 +2065,7 @@ process_message(void) if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE, NULL, NULL) == NULL) #endif - pDispatchMessage(&msg); + DispatchMessageW(&msg); } /* @@ -2080,7 +2080,7 @@ gui_mch_update(void) MSG msg; if (!s_busy_processing) - while (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) + while (PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE) && !vim_is_input_buf_full()) process_message(); } @@ -2095,7 +2095,7 @@ remove_any_timer(void) KillTimer(NULL, s_wait_timer); // Eat spurious WM_TIMER messages - while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) + while (PeekMessageW(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE)) ; s_wait_timer = 0; } @@ -2163,7 +2163,7 @@ gui_mch_wait_for_chars(int wtime) if (did_add_timer) break; # endif - if (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) + if (PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE)) { process_message(); break;
--- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -1123,12 +1123,12 @@ AbortProc(HDC hdcPrn UNUSED, int iCode U { MSG msg; - while (!*bUserAbort && pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + while (!*bUserAbort && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { - if (!hDlgPrint || !pIsDialogMessage(hDlgPrint, &msg)) + if (!hDlgPrint || !IsDialogMessageW(hDlgPrint, &msg)) { TranslateMessage(&msg); - pDispatchMessage(&msg); + DispatchMessageW(&msg); } } return !*bUserAbort; @@ -2576,10 +2576,10 @@ serverProcessPendingMessages(void) { MSG msg; - while (pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - pDispatchMessage(&msg); + DispatchMessageW(&msg); } }
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -4123,10 +4123,10 @@ mch_system_classic(char *cmd, int option { MSG msg; - if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE)) + if (PeekMessageW(&msg, (HWND)NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - pDispatchMessage(&msg); + DispatchMessageW(&msg); delay = 1; continue; } @@ -4445,10 +4445,10 @@ mch_system_piped(char *cmd, int options) { MSG msg; - if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE)) + if (PeekMessageW(&msg, (HWND)NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - pDispatchMessage(&msg); + DispatchMessageW(&msg); } // write pipe information in the window
--- a/src/os_win32.h +++ b/src/os_win32.h @@ -199,9 +199,3 @@ Trace(char *pszFormat, ...); #endif #define mch_getenv(x) (char_u *)getenv((char *)(x)) #define vim_mkdir(x, y) mch_mkdir(x) - -// Enable common dialogs input unicode from IME if possible. -#define pDispatchMessage DispatchMessageW -#define pGetMessage GetMessageW -#define pIsDialogMessage IsDialogMessageW -#define pPeekMessage PeekMessageW