From fcfcf7a5c90ae6f3e3f4a0f36abca0e96b4accc6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 18 Feb 2018 20:37:16 +0100 Subject: [PATCH] [USER32] Move related functions close to each other. --- win32ss/user/user32/windows/messagebox.c | 38 +++++++++++------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 9367d67fdda..96c39b791ca 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -783,6 +783,20 @@ MessageBoxA( return MessageBoxExA(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); } +/* + * @implemented + */ +int +WINAPI +MessageBoxW( + IN HWND hWnd, + IN LPCWSTR lpText, + IN LPCWSTR lpCaption, + IN UINT uType) +{ + return MessageBoxExW(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); +} + /* * @implemented @@ -812,7 +826,6 @@ MessageBoxExA( return MessageBoxIndirectA(&msgbox); } - /* * @implemented */ @@ -920,7 +933,6 @@ MessageBoxIndirectA( return ret; } - /* * @implemented */ @@ -933,20 +945,6 @@ MessageBoxIndirectW( } -/* - * @implemented - */ -int -WINAPI -MessageBoxW( - IN HWND hWnd, - IN LPCWSTR lpText, - IN LPCWSTR lpCaption, - IN UINT uType) -{ - return MessageBoxExW(hWnd, lpText, lpCaption, uType, LANG_NEUTRAL); -} - /* * @implemented */ @@ -958,7 +956,7 @@ MessageBoxTimeoutA( IN LPCSTR lpCaption, IN UINT uType, IN WORD wLanguageId, - IN DWORD dwTime) + IN DWORD dwTimeout) { MSGBOXPARAMSW msgboxW; UNICODE_STRING textW, captionW; @@ -985,7 +983,7 @@ MessageBoxTimeoutA( msgboxW.lpfnMsgBoxCallback = NULL; msgboxW.dwLanguageId = wLanguageId; - ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)dwTime); + ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)dwTimeout); if (!IS_INTRESOURCE(textW.Buffer)) RtlFreeUnicodeString(&textW); @@ -1007,7 +1005,7 @@ MessageBoxTimeoutW( IN LPCWSTR lpCaption, IN UINT uType, IN WORD wLanguageId, - IN DWORD dwTime) + IN DWORD dwTimeout) { MSGBOXPARAMSW msgbox; @@ -1022,7 +1020,7 @@ MessageBoxTimeoutW( msgbox.lpfnMsgBoxCallback = NULL; msgbox.dwLanguageId = wLanguageId; - return MessageBoxTimeoutIndirectW(&msgbox, (UINT)dwTime); + return MessageBoxTimeoutIndirectW(&msgbox, (UINT)dwTimeout); } -- 2.17.1