[ros-diffs] 02/11: [USER32] Move related functions close to each other.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcfcf7a5c90ae6f3e3f4a…

commit fcfcf7a5c90ae6f3e3f4a0f36abca0e96b4accc6
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Feb 18 20:37:16 2018 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Aug 17 17:12:19 2018 +0200

    [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 9367d67fdd..96c39b791c 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);
 }