• R/O
  • SSH

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoapythonrubywindowsphpgameguibathyscaphec翻訳omegatframework計画中(planning stage)twitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

K.Takata's patch queue for Vim


Commit MetaInfo

Revision1093a6380f17f31fa88169068757c497738d04f5 (tree)
Zeit2022-01-21 20:48:53
AutorK.Takata <kentkt@csc....>
CommiterK.Takata

Log Message

Update for 8.2.4170

Delete a merged patch.

Ändern Zusammenfassung

  • modified: series (diff)
  • delete: win32-use-unicode-message-api.patch

Diff

diff -r 2e7483d1e6e1 -r 1093a6380f17 series
--- a/series Fri Jan 21 20:19:22 2022 +0900
+++ b/series Fri Jan 21 20:48:53 2022 +0900
@@ -28,6 +28,5 @@
2828 add-msvc-latest-bat.patch
2929 add-testing-option-7970.patch
3030 wip-win32-vimdir-encoding.patch #+wip
31-win32-use-unicode-message-api.patch
3231 win32-directwrite-ambiwidth-auto.patch
3332 fix-config_cache-removal.patch #+rejected
diff -r 2e7483d1e6e1 -r 1093a6380f17 win32-use-unicode-message-api.patch
--- a/win32-use-unicode-message-api.patch Fri Jan 21 20:19:22 2022 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
1-# HG changeset patch
2-# Parent 9c4365bc58314e899f3feee2f039635a77d70093
3-
4-diff --git a/src/gui_w32.c b/src/gui_w32.c
5---- a/src/gui_w32.c
6-+++ b/src/gui_w32.c
7-@@ -636,7 +636,7 @@ gui_mch_set_blinking(long wait, long on,
8- KillTimer(NULL, idEvent);
9-
10- // Eat spurious WM_TIMER messages
11-- while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
12-+ while (PeekMessageW(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
13- ;
14-
15- if (blink_state == BLINK_ON)
16-@@ -665,7 +665,7 @@ gui_mswin_rm_blink_timer(void)
17- {
18- KillTimer(NULL, blink_timer);
19- // Eat spurious WM_TIMER messages
20-- while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
21-+ while (PeekMessageW(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
22- ;
23- blink_timer = 0;
24- }
25-@@ -726,7 +726,7 @@ gui_mch_start_blink(void)
26- s_timed_out = TRUE;
27-
28- // Eat spurious WM_TIMER messages
29-- while (pPeekMessage(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
30-+ while (PeekMessageW(&msg, hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
31- ;
32- if (idEvent == s_wait_timer)
33- s_wait_timer = 0;
34-@@ -1844,7 +1844,7 @@ process_message(void)
35- static char_u k10[] = {K_SPECIAL, 'k', ';', 0};
36- #endif
37-
38-- pGetMessage(&msg, NULL, 0, 0);
39-+ GetMessageW(&msg, NULL, 0, 0);
40-
41- #ifdef FEAT_OLE
42- // Look after OLE Automation commands
43-@@ -1855,7 +1855,7 @@ process_message(void)
44- {
45- // Message can't be ours, forward it. Fixes problem with Ultramon
46- // 3.0.4
47-- pDispatchMessage(&msg);
48-+ DispatchMessageW(&msg);
49- }
50- else
51- {
52-@@ -1868,7 +1868,7 @@ process_message(void)
53-
54- #ifdef MSWIN_FIND_REPLACE
55- // Don't process messages used by the dialog
56-- if (s_findrep_hwnd != NULL && pIsDialogMessage(s_findrep_hwnd, &msg))
57-+ if (s_findrep_hwnd != NULL && IsDialogMessageW(s_findrep_hwnd, &msg))
58- {
59- HandleMouseHide(msg.message, msg.lParam);
60- return;
61-@@ -2065,7 +2065,7 @@ process_message(void)
62- if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE,
63- NULL, NULL) == NULL)
64- #endif
65-- pDispatchMessage(&msg);
66-+ DispatchMessageW(&msg);
67- }
68-
69- /*
70-@@ -2080,7 +2080,7 @@ gui_mch_update(void)
71- MSG msg;
72-
73- if (!s_busy_processing)
74-- while (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)
75-+ while (PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE)
76- && !vim_is_input_buf_full())
77- process_message();
78- }
79-@@ -2095,7 +2095,7 @@ remove_any_timer(void)
80- KillTimer(NULL, s_wait_timer);
81-
82- // Eat spurious WM_TIMER messages
83-- while (pPeekMessage(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
84-+ while (PeekMessageW(&msg, s_hwnd, WM_TIMER, WM_TIMER, PM_REMOVE))
85- ;
86- s_wait_timer = 0;
87- }
88-@@ -2163,7 +2163,7 @@ gui_mch_wait_for_chars(int wtime)
89- if (did_add_timer)
90- break;
91- # endif
92-- if (pPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
93-+ if (PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE))
94- {
95- process_message();
96- break;
97-diff --git a/src/os_mswin.c b/src/os_mswin.c
98---- a/src/os_mswin.c
99-+++ b/src/os_mswin.c
100-@@ -1126,12 +1126,12 @@ AbortProc(HDC hdcPrn UNUSED, int iCode U
101- {
102- MSG msg;
103-
104-- while (!*bUserAbort && pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
105-+ while (!*bUserAbort && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
106- {
107-- if (!hDlgPrint || !pIsDialogMessage(hDlgPrint, &msg))
108-+ if (!hDlgPrint || !IsDialogMessageW(hDlgPrint, &msg))
109- {
110- TranslateMessage(&msg);
111-- pDispatchMessage(&msg);
112-+ DispatchMessageW(&msg);
113- }
114- }
115- return !*bUserAbort;
116-@@ -2579,10 +2579,10 @@ serverProcessPendingMessages(void)
117- {
118- MSG msg;
119-
120-- while (pPeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
121-+ while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
122- {
123- TranslateMessage(&msg);
124-- pDispatchMessage(&msg);
125-+ DispatchMessageW(&msg);
126- }
127- }
128-
129-diff --git a/src/os_win32.c b/src/os_win32.c
130---- a/src/os_win32.c
131-+++ b/src/os_win32.c
132-@@ -4124,10 +4124,10 @@ mch_system_classic(char *cmd, int option
133- {
134- MSG msg;
135-
136-- if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
137-+ if (PeekMessageW(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
138- {
139- TranslateMessage(&msg);
140-- pDispatchMessage(&msg);
141-+ DispatchMessageW(&msg);
142- delay = 1;
143- continue;
144- }
145-@@ -4446,10 +4446,10 @@ mch_system_piped(char *cmd, int options)
146- {
147- MSG msg;
148-
149-- if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
150-+ if (PeekMessageW(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
151- {
152- TranslateMessage(&msg);
153-- pDispatchMessage(&msg);
154-+ DispatchMessageW(&msg);
155- }
156-
157- // write pipe information in the window
158-diff --git a/src/os_win32.h b/src/os_win32.h
159---- a/src/os_win32.h
160-+++ b/src/os_win32.h
161-@@ -202,9 +202,3 @@ Trace(char *pszFormat, ...);
162- #endif
163- #define mch_getenv(x) (char_u *)getenv((char *)(x))
164- #define vim_mkdir(x, y) mch_mkdir(x)
165--
166--// Enable common dialogs input unicode from IME if possible.
167--#define pDispatchMessage DispatchMessageW
168--#define pGetMessage GetMessageW
169--#define pIsDialogMessage IsDialogMessageW
170--#define pPeekMessage PeekMessageW