[ros-diffs] [jimtabor] 22353: Fix functionality in TWOPARAM_ROUTINE_ROS_SHOWWINDOW. Use one PWINDOW_OBJECT Window in NtUserCallTwoParam to help with cleanup.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Thu Jun 15 11:07:54 2006
New Revision: 22353

URL: http://svn.reactos.ru/svn/reactos?rev=22353&view=rev
Log:
Fix functionality in TWOPARAM_ROUTINE_ROS_SHOWWINDOW. Use one PWINDOW_OBJECT Window in NtUserCallTwoParam to help with cleanup.

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/misc.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/misc.c?rev=22353&r1=22352&r2=22353&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Thu Jun 15 11:07:54 2006
@@ -493,7 +493,7 @@
          {
             DWORD Ret;
             RECT rcRect;
-            PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1);
+            Window = UserGetWindowObject((HWND)Param1);
             if (!Window) RETURN(ERROR);
             
             Ret = (DWORD)IntGetWindowRgnBox(Window, &rcRect);
@@ -507,7 +507,7 @@
          }
       case TWOPARAM_ROUTINE_GETWINDOWRGN:
          {
-            PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1);
+            Window = UserGetWindowObject((HWND)Param1);
             if (!Window) RETURN(ERROR);
 
             RETURN( (DWORD)IntGetWindowRgn(Window, (HRGN)Param2));
@@ -567,7 +567,7 @@
 
       case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS:
       {
-         PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1);
+         Window = UserGetWindowObject((HWND)Param1);
          if (!Window) RETURN(0);
          
          RETURN( (DWORD)IntShowOwnedPopups(Window, (BOOL) Param2));
@@ -576,19 +576,18 @@
       case TWOPARAM_ROUTINE_ROS_SHOWWINDOW:
          {
 #define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040)
-            PWINDOW_OBJECT Window;
             DPRINT1("ROS_SHOWWINDOW\n");
             
             if (!(Window = UserGetWindowObject((HWND)Param1)))
             {
-               RETURN( FALSE);
+               RETURN( 1 );
             }
             
             if (Param2)
             {
                if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP))
                {
-                  RETURN( TRUE);
+                  RETURN( -1 );
                }
                Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP;
             }
@@ -596,8 +595,9 @@
                Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP;
 
             DPRINT1("ROS_SHOWWINDOW ---> 0x%x\n",Window->Flags);
-            RETURN( TRUE);
-         }
+            RETURN( 0 );
+         }
+
       case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW:
          UNIMPLEMENTED
          RETURN( 0);