aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.4170: MS-Windows: still using old message API calls

Browse Source 
Problem:    MS-Windows: still using old message API calls.
Solution:   Call the "W" functions directly. (Ken Takata, closes #9582)
This commit is contained in:
K.Takata
2022-01-21 11:37:07 +00:00
committed by Bram Moolenaar
parent 45f9cfbdc7
commit b7057bdd09
5 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui_w32.c
View File

@@ -636,7 +636,7 @@ _OnBlinkTimer(
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 @@ _OnTimer(
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;

10
src/os_mswin.c
View File

@@ -1123,12 +1123,12 @@ AbortProc(HDC hdcPrn UNUSED, int iCode UNUSED)
{
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);
}
}

8
src/os_win32.c
View File

@@ -4123,10 +4123,10 @@ mch_system_classic(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);
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

6
src/os_win32.h
View File

@@ -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

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4170,
/**/
4169,
/**/