[ros-diffs] [jimtabor] 22373: Fix functionality in WM_SHOWWINDOW. Part II of last nights patch for TWOPARAM_ROUTINE_ROS_SHOWWINDOW.

Author: jimtabor
Date: Thu Jun 15 20:23:24 2006
New Revision: 22373

URL: http://svn.reactos.ru/svn/reactos?rev=22373&view=rev
Log:
Fix functionality in WM_SHOWWINDOW. Part II of last nights patch for
TWOPARAM_ROUTINE_ROS_SHOWWINDOW.

Modified:
    trunk/reactos/dll/win32/user32/windows/defwnd.c

Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/de…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c Thu Jun 15 20:23:24 2006
@@ -1268,7 +1268,8 @@
         case WM_SHOWWINDOW:
         {
             LONG Style;
-
+            INT Ret = 0;
+            
             if (!lParam)
                 return 0;
             Style = GetWindowLongW(hWnd, GWL_STYLE);
@@ -1280,8 +1281,13 @@
                 return 0;
             if (!GetWindow(hWnd, GW_OWNER))
                 return 0;
-            NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam,
TWOPARAM_ROUTINE_ROS_SHOWWINDOW);
-            ShowWindow(hWnd, wParam ? SW_SHOWNA : SW_HIDE);
+            Ret = NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam,
TWOPARAM_ROUTINE_ROS_SHOWWINDOW);
+            if(Ret)
+            {
+                if( Ret == -1) return 0;
+                return Ret;
+            }
+            ShowWindow(hWnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE);
             break;
         }