[ros-diffs] [gadamopoulos] 52219: [user32] - Fix several compilation issues with msvc

[gadamopoulos at svn.reactos.org]

Author: gadamopoulos
Date: Mon Jun 13 19:49:46 2011
New Revision: 52219

URL: http://svn.reactos.org/svn/reactos?rev=52219&view=rev
Log:
[user32]
- Fix several compilation issues with msvc

Modified:
    trunk/reactos/dll/win32/user32/controls/icontitle.c
    trunk/reactos/dll/win32/user32/controls/scrollbar.c
    trunk/reactos/dll/win32/user32/windows/defwnd.c
    trunk/reactos/dll/win32/user32/windows/menu.c

Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/icontitle.c?rev=52219&r1=52218&r2=52219&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Mon Jun 13 19:49:46 2011
@@ -188,7 +188,6 @@
 {
     HWND owner = GetWindow( hWnd, GW_OWNER );
 
-    if (!IsWindow(hWnd)) return 0;
 #ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
     PWND pWnd;
 
@@ -201,6 +200,8 @@
        }
     }    
 #endif    
+
+    if (!IsWindow(hWnd)) return 0;
 
     switch( msg )
     {

Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/scrollbar.c?rev=52219&r1=52218&r2=52219&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Mon Jun 13 19:49:46 2011
@@ -1243,11 +1243,6 @@
 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;
 
@@ -1260,6 +1255,11 @@
      }
   }    
 #endif    
+
+  if (! IsWindow(Wnd))
+    {
+      return 0;
+    }
 
   switch (Msg)
     {

Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/defwnd.c?rev=52219&r1=52218&r2=52219&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Mon Jun 13 19:49:46 2011
@@ -753,6 +753,7 @@
   ScrollTrackScrollBar(Wnd, ScrollBar, Pt );
 }
 
+LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
 
 LRESULT
 DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
@@ -824,7 +825,7 @@
       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 @@
       case SC_HOTKEY:
         {
            HWND hwnd, hWndLastActive;
+           PWND pWnd;
 
            hwnd = (HWND)lParam;
-           PWND pWnd = ValidateHwnd(hwnd);
+           pWnd = ValidateHwnd(hwnd);
            if (pWnd)
            {
               hWndLastActive = GetLastActivePopup(hwnd);

Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/menu.c?rev=52219&r1=52218&r2=52219&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Mon Jun 13 19:49:46 2011
@@ -1791,7 +1791,6 @@
 //
 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 @@
   }    
 #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
 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;
 
@@ -1892,6 +1892,8 @@
      }
   }    
 #endif    
+
+  TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
 
   switch(Message)
     {