From: Mark Jansen <mark.jansen@reactos.org>
Date: Mon, 29 Aug 2016 13:15:44 +0000 (+0000)
Subject: Fix the build for msvc users.
X-Git-Tag: backups/sndblst@72664~160
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0c589e512fb0cc4e46254af3b252e111f39e91f1

Fix the build for msvc users.

svn path=/trunk/; revision=72500
---

diff --git a/reactos/win32ss/user/user32/CMakeLists.txt b/reactos/win32ss/user/user32/CMakeLists.txt
index 4d0fe258f2d..fdc280a1a09 100644
--- a/reactos/win32ss/user/user32/CMakeLists.txt
+++ b/reactos/win32ss/user/user32/CMakeLists.txt
@@ -79,6 +79,7 @@ add_library(user32 SHARED
 
 set_module_type(user32 win32dll ENTRYPOINT DllMain 12 UNICODE)
 target_link_libraries(user32 user32_wsprintf wine win32ksys ${PSEH_LIB})
+add_dependencies(user32 asm)
 
 if(MSVC)
     # for __ftol2_sse, float to int cast helper
diff --git a/reactos/win32ss/user/user32/windows/message.c b/reactos/win32ss/user/user32/windows/message.c
index 02e5e90fe0c..51d0e44628f 100644
--- a/reactos/win32ss/user/user32/windows/message.c
+++ b/reactos/win32ss/user/user32/windows/message.c
@@ -17,8 +17,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32);
 #ifdef __i386__
 /* For bad applications which provide bad (non stdcall) WndProc */
 extern
-__cdecl
 LRESULT
+__cdecl
 CALL_EXTERN_WNDPROC(
      WNDPROC WndProc,
      HWND hWnd,
diff --git a/reactos/win32ss/user/user32/windows/wndproc_fixup.S b/reactos/win32ss/user/user32/windows/wndproc_fixup.S
index ff6bf39fcb4..d2c1d91bf7c 100644
--- a/reactos/win32ss/user/user32/windows/wndproc_fixup.S
+++ b/reactos/win32ss/user/user32/windows/wndproc_fixup.S
@@ -15,8 +15,8 @@
 .code
 
 /* 
- * __cdecl 
  * LRESULT
+ * __cdecl 
  * CALL_EXTERN_WNDPROC(
  *     WNDPROC WndProc,
  *     HWND hWnd,
@@ -54,3 +54,5 @@ FUNC _CALL_EXTERN_WNDPROC
     ret
 
 ENDFUNC
+
+END