Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-30 09:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k]

Browse source 
- Fix style, use client style.

svn path=/trunk/; revision=49613
This commit is contained in:
James Tabor 2010-11-18 16:26:54 +00:00
parent 7b2f0a799a
commit 4886d14bab
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/subsystems/win32/win32k/ntuser/window.c
View file

@ -1898,7 +1898,6 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs,
{ {
PWND Window = NULL, ParentWindow = NULL, OwnerWindow; PWND Window = NULL, ParentWindow = NULL, OwnerWindow;
HWND hWnd, hWndParent, hWndOwner, hwndInsertAfter; HWND hWnd, hWndParent, hWndOwner, hwndInsertAfter;
DWORD dwStyle;
PWINSTATION_OBJECT WinSta; PWINSTATION_OBJECT WinSta;
PCLS Class = NULL; PCLS Class = NULL;
SIZE Size; SIZE Size;
@ -1987,8 +1986,6 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs,
UserRefObjectCo(Window, &Ref); UserRefObjectCo(Window, &Ref);
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
dwStyle = Window->style;
//// Check for a hook to eliminate overhead. //// //// Check for a hook to eliminate overhead. ////
if ( ISITHOOKED(WH_CBT) || (pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CBT)) ) if ( ISITHOOKED(WH_CBT) || (pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CBT)) )
{ {
@ -1998,7 +1995,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs,
/* Fill the new CREATESTRUCTW */ /* Fill the new CREATESTRUCTW */
RtlCopyMemory(pCsw, Cs, sizeof(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. // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes.
if (!IS_ATOM(ClassName->Buffer)) if (!IS_ATOM(ClassName->Buffer))
@ -2077,7 +2074,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs,
Size.cx = Cs->cx; Size.cx = Cs->cx;
Size.cy = Cs->cy; 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; POINT MaxSize, MaxPos, MinTrack, MaxTrack;
@ -2105,7 +2102,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs,
if (NULL != ParentWindow) if (NULL != ParentWindow)
{ {
/* link the window into the siblings list */ /* 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); IntLinkHwnd(Window, HWND_BOTTOM);
else else
IntLinkHwnd(Window, hwndInsertAfter); IntLinkHwnd(Window, hwndInsertAfter);