[jimtabor] 23391: Sync, Fix functionality in TWOPARAM_ROUTINE_ROS_SHOWWINDOW. Use one PWINDOW_OBJECT Window in NtUserCallTwoParam to help with cleanup.

Author: jimtabor
Date: Mon Jul 31 12:22:52 2006
New Revision: 23391

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

Modified:
    branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/misc.c

Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/misc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst...
==============================================================================
--- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/misc.c (original)
+++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Jul 31 12:22:52 2006
@@ -11,8 +11,7 @@

#include <w32k.h>

-//#define NDEBUG
-#undef NDEBUG
+#define NDEBUG
 #include <debug.h>

/* registered Logon process */
@@ -494,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);
@@ -508,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));
@@ -568,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));
@@ -577,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;
             }
@@ -597,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);