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 #9582)
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 9cd5a31..97abfab 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -636,7 +636,7 @@
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 @@
{
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 @@
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 @@
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 @@
{
// Message can't be ours, forward it. Fixes problem with Ultramon
// 3.0.4
- pDispatchMessage(&msg);
+ DispatchMessageW(&msg);
}
else
{
@@ -1868,7 +1868,7 @@
#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 @@
if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE,
NULL, NULL) == NULL)
#endif
- pDispatchMessage(&msg);
+ DispatchMessageW(&msg);
}
/*
@@ -2080,7 +2080,7 @@
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 @@
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 @@
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;
diff --git a/src/os_mswin.c b/src/os_mswin.c
index c6617c8..5db7bb7 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1123,12 +1123,12 @@
{
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 @@
{
MSG msg;
- while (pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+ while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
{
TranslateMessage(&msg);
- pDispatchMessage(&msg);
+ DispatchMessageW(&msg);
}
}
diff --git a/src/os_win32.c b/src/os_win32.c
index 55df506..ae66652 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4123,10 +4123,10 @@
{
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 @@
{
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
diff --git a/src/os_win32.h b/src/os_win32.h
index 32e29ef..116b9e8 100644
--- a/src/os_win32.h
+++ b/src/os_win32.h
@@ -199,9 +199,3 @@
#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
diff --git a/src/version.c b/src/version.c
index b4a16cf..4bf32fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4170,
+/**/
4169,
/**/
4168,