[ros-diffs] [jimtabor] 49613: [Win32k] - Fix style, use client style.

jimtabor at svn.reactos.org jimtabor at svn.reactos.org
Thu Nov 18 16:26:54 UTC 2010


Author: jimtabor
Date: Thu Nov 18 16:26:54 2010
New Revision: 49613

URL: http://svn.reactos.org/svn/reactos?rev=49613&view=rev
Log:
[Win32k]
- Fix style, use client style.

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

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/window.c?rev=49613&r1=49612&r2=49613&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Nov 18 16:26:54 2010
@@ -1898,7 +1898,6 @@
 {
    PWND Window = NULL, ParentWindow = NULL, OwnerWindow;
    HWND hWnd, hWndParent, hWndOwner, hwndInsertAfter;
-   DWORD dwStyle;
    PWINSTATION_OBJECT WinSta;
    PCLS Class = NULL;
    SIZE Size;
@@ -1987,8 +1986,6 @@
    UserRefObjectCo(Window, &Ref);
    ObDereferenceObject(WinSta);
 
-   dwStyle = Window->style;
-
    //// Check for a hook to eliminate overhead. ////
    if ( ISITHOOKED(WH_CBT) ||  (pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CBT)) )
    {
@@ -1998,7 +1995,7 @@
 
       /* Fill the new CREATESTRUCTW */
       RtlCopyMemory(pCsw, Cs, sizeof(CREATESTRUCTW));
-      pCsw->style = dwStyle; /* HCBT_CREATEWND needs the real window style */
+      pCsw->style = Window->style; /* HCBT_CREATEWND needs the real window style */
 
       // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes.
       if (!IS_ATOM(ClassName->Buffer))
@@ -2077,7 +2074,7 @@
    Size.cx = Cs->cx;
    Size.cy = Cs->cy;
 
-   if ((dwStyle & WS_THICKFRAME) || !(dwStyle & (WS_POPUP | WS_CHILD)))
+   if ((Cs->style & WS_THICKFRAME) || !(Cs->style & (WS_POPUP | WS_CHILD)))
    {
       POINT MaxSize, MaxPos, MinTrack, MaxTrack;
 
@@ -2105,7 +2102,7 @@
    if (NULL != ParentWindow)
    {
       /* link the window into the siblings list */
-      if ((dwStyle & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD)
+      if ((Cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD)
           IntLinkHwnd(Window, HWND_BOTTOM);
       else
           IntLinkHwnd(Window, hwndInsertAfter);




More information about the Ros-diffs mailing list