[ros-diffs] [jimtabor] 42720: - Use the correct flag for hidden popup actions.

Author: jimtabor
Date: Sun Aug 16 00:24:26 2009
New Revision: 42720

URL: http://svn.reactos.org/svn/reactos?rev=42720&view=rev
Log:
- Use the correct flag for hidden popup actions.

Modified:
    trunk/reactos/subsystems/win32/win32k/include/winpos.h
    trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c

Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] Sun Aug 16 00:24:26 2009
@@ -4,8 +4,6 @@
 /* Undocumented flags. */
 #define SWP_NOCLIENTMOVE          0x0800
 #define SWP_NOCLIENTSIZE          0x1000
-
-#define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000140)

#define IntPtInWindow(WndObject,x,y) \
   ((x) >= (WndObject)->Wnd->rcWindow.left && \

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Sun Aug 16 00:24:26 2009
@@ -133,12 +133,12 @@
          if (LOWORD(lParam))
          {
             if (wParam)
-            {//                      WNDS_HIDDENPOPUP
-               if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break;
-               Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP;
+            {
+               if (!(Wnd->state & WNDS_HIDDENPOPUP)) break;
+               Wnd->state &= ~WNDS_HIDDENPOPUP;
             }
             else
-                Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP;
+                Wnd->state |= WNDS_HIDDENPOPUP;

co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE);
          }

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Aug 16 00:24:26 2009
@@ -4974,7 +4974,7 @@

if (fShow)
       {
-         if (pWnd->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)
+         if (pWnd->Wnd->state & WNDS_HIDDENPOPUP)
          {
             /* In Windows, ShowOwnedPopups(TRUE) generates
              * WM_SHOWWINDOW messages with SW_PARENTOPENING,