[USER32] Move related functions close to each other.

diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c
index 9367d67..96c39b7 100644 (file)
--- 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);
 }
 
     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
 
 /*
  * @implemented


@@ -812,7 +826,6 @@ MessageBoxExA(
     return MessageBoxIndirectA(&msgbox);
 }
 
     return MessageBoxIndirectA(&msgbox);
 }
 

-

 /*
  * @implemented
  */
 /*
  * @implemented
  */


@@ -920,7 +933,6 @@ MessageBoxIndirectA(
     return ret;
 }
 
     return ret;
 }
 

-

 /*
  * @implemented
  */
 /*
  * @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
  */
 /*
  * @implemented
  */


@@ -958,7 +956,7 @@ MessageBoxTimeoutA(
     IN LPCSTR lpCaption,
     IN UINT uType,
     IN WORD wLanguageId,
     IN LPCSTR lpCaption,
     IN UINT uType,
     IN WORD wLanguageId,

-    IN DWORD dwTime)
+    IN DWORD dwTimeout)

 {
     MSGBOXPARAMSW msgboxW;
     UNICODE_STRING textW, captionW;
 {
     MSGBOXPARAMSW msgboxW;
     UNICODE_STRING textW, captionW;


@@ -985,7 +983,7 @@ MessageBoxTimeoutA(
     msgboxW.lpfnMsgBoxCallback = NULL;
     msgboxW.dwLanguageId = wLanguageId;
 
     msgboxW.lpfnMsgBoxCallback = NULL;
     msgboxW.dwLanguageId = wLanguageId;
 

-    ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)dwTime);
+    ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)dwTimeout);

 
     if (!IS_INTRESOURCE(textW.Buffer))
         RtlFreeUnicodeString(&textW);
 
     if (!IS_INTRESOURCE(textW.Buffer))
         RtlFreeUnicodeString(&textW);


@@ -1007,7 +1005,7 @@ MessageBoxTimeoutW(
     IN LPCWSTR lpCaption,
     IN UINT uType,
     IN WORD wLanguageId,
     IN LPCWSTR lpCaption,
     IN UINT uType,
     IN WORD wLanguageId,

-    IN DWORD dwTime)
+    IN DWORD dwTimeout)

 {
     MSGBOXPARAMSW msgbox;
 
 {
     MSGBOXPARAMSW msgbox;
 


@@ -1022,7 +1020,7 @@ MessageBoxTimeoutW(
     msgbox.lpfnMsgBoxCallback = NULL;
     msgbox.dwLanguageId = wLanguageId;
 
     msgbox.lpfnMsgBoxCallback = NULL;
     msgbox.dwLanguageId = wLanguageId;
 

-    return MessageBoxTimeoutIndirectW(&msgbox, (UINT)dwTime);
+    return MessageBoxTimeoutIndirectW(&msgbox, (UINT)dwTimeout);

 }
 
 
 }