From cf2fbe1b6db245b8e1e7c95c7b18b6884d70f64a Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Mon, 13 Jun 2011 19:49:46 +0000
Subject: [PATCH] [user32] - Fix several compilation issues with msvc

svn path=/trunk/; revision=52219
---
 reactos/dll/win32/user32/controls/icontitle.c |  3 ++-
 reactos/dll/win32/user32/controls/scrollbar.c | 10 +++++-----
 reactos/dll/win32/user32/windows/defwnd.c     |  6 ++++--
 reactos/dll/win32/user32/windows/menu.c       |  6 ++++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/reactos/dll/win32/user32/controls/icontitle.c b/reactos/dll/win32/user32/controls/icontitle.c
index 6daf27ec125..edcdd6bbfc2 100644
--- a/reactos/dll/win32/user32/controls/icontitle.c
+++ b/reactos/dll/win32/user32/controls/icontitle.c
@@ -188,7 +188,6 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
 {
     HWND owner = GetWindow( hWnd, GW_OWNER );
 
-    if (!IsWindow(hWnd)) return 0;
 #ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
     PWND pWnd;
 
@@ -202,6 +201,8 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
     }    
 #endif    
 
+    if (!IsWindow(hWnd)) return 0;
+
     switch( msg )
     {
         case WM_CREATE:
diff --git a/reactos/dll/win32/user32/controls/scrollbar.c b/reactos/dll/win32/user32/controls/scrollbar.c
index b238b64532a..5a37fa6b8c3 100644
--- a/reactos/dll/win32/user32/controls/scrollbar.c
+++ b/reactos/dll/win32/user32/controls/scrollbar.c
@@ -1243,11 +1243,6 @@ ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt)
 LRESULT WINAPI
 ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
-  if (! IsWindow(Wnd))
-    {
-      return 0;
-    }
-
 #ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
   PWND pWnd;
 
@@ -1261,6 +1256,11 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA
   }    
 #endif    
 
+  if (! IsWindow(Wnd))
+    {
+      return 0;
+    }
+
   switch (Msg)
     {
       case WM_CREATE:
diff --git a/reactos/dll/win32/user32/windows/defwnd.c b/reactos/dll/win32/user32/windows/defwnd.c
index 8f7d809e8bf..e8fda2ffb07 100644
--- a/reactos/dll/win32/user32/windows/defwnd.c
+++ b/reactos/dll/win32/user32/windows/defwnd.c
@@ -753,6 +753,7 @@ DefWndTrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt)
   ScrollTrackScrollBar(Wnd, ScrollBar, Pt );
 }
 
+LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
 
 LRESULT
 DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
@@ -824,7 +825,7 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
       case SC_SCREENSAVE:
         NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
         break;
-LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
+
       case SC_NEXTWINDOW:
       case SC_PREVWINDOW:
         DoAppSwitch( wParam, lParam);
@@ -833,9 +834,10 @@ LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
       case SC_HOTKEY:
         {
            HWND hwnd, hWndLastActive;
+           PWND pWnd;
 
            hwnd = (HWND)lParam;
-           PWND pWnd = ValidateHwnd(hwnd);
+           pWnd = ValidateHwnd(hwnd);
            if (pWnd)
            {
               hWndLastActive = GetLastActivePopup(hwnd);
diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c
index d6332ac5dcf..11b9b1f9500 100644
--- a/reactos/dll/win32/user32/windows/menu.c
+++ b/reactos/dll/win32/user32/windows/menu.c
@@ -1791,7 +1791,6 @@ MenuMoveSelection(HWND WndOwner, PROSMENUINFO MenuInfo, INT Offset)
 //
 LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
 #ifdef __REACTOS__
   PWND pWnd;
 
@@ -1805,6 +1804,8 @@ LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM l
   }    
 #endif    
 
+  TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
+
   switch(Message)
     {
     case WM_CREATE:
@@ -1879,7 +1880,6 @@ LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM l
 LRESULT WINAPI
 PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
 #ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
   PWND pWnd;
 
@@ -1893,6 +1893,8 @@ PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
   }    
 #endif    
 
+  TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
+
   switch(Message)
     {
     case WM_CREATE: