ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-31 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restored sequence for setting WindowObject and callers styles.

Browse Source 
svn path=/trunk/; revision=22803
This commit is contained in:
James Tabor
2006-07-03 20:04:17 +00:00
parent a0e5355f01
commit abedc7b76b
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsystems/win32/win32k/ntuser/window.c
+16 -22
View File
@@ -1692,11 +1692,19 @@ co_IntCreateWindowEx(DWORD dwExStyle,
dwExStyle |= WS_EX_WINDOWEDGE;
else
dwExStyle &= ~WS_EX_WINDOWEDGE;
/*
These affect only the style loading into the WindowObject structure.
*/
Window->ExStyle = dwExStyle;
Window->Style = dwStyle & ~WS_VISIBLE;
/* Correct the window style. */
if (!(dwStyle & WS_CHILD))
{
dwStyle |= WS_CLIPSIBLINGS;
DPRINT("3: Style is now %lx\n", dwStyle);
if (!(dwStyle & WS_POPUP))
{
dwStyle |= WS_CAPTION;
Window->Flags |= WINDOWOBJECT_NEED_SIZE;
DPRINT("4: Style is now %lx\n", dwStyle);
}
}
/* create system menu */
if((dwStyle & WS_SYSMENU) &&
@@ -1710,23 +1718,6 @@ co_IntCreateWindowEx(DWORD dwExStyle,
}
}
/* Correct the window style. */
if (!(Window->Style & WS_CHILD))
{
Window->Style |= WS_CLIPSIBLINGS;
if (!(Window->Style & WS_POPUP))
{
Window->Style |= WS_CAPTION;
Window->Flags |= WINDOWOBJECT_NEED_SIZE;
}
}
if ((Window->ExStyle & WS_EX_DLGMODALFRAME) ||
(Window->Style & (WS_DLGFRAME | WS_THICKFRAME)))
Window->ExStyle |= WS_EX_WINDOWEDGE;
else
Window->ExStyle &= ~WS_EX_WINDOWEDGE;
/* Insert the window into the thread's window list. */
InsertTailList (&PsGetWin32Thread()->WindowListHead, &Window->ThreadListEntry);
@@ -1742,6 +1733,9 @@ co_IntCreateWindowEx(DWORD dwExStyle,
Size.cx = nWidth;
Size.cy = nHeight;
Window->ExStyle = dwExStyle;
Window->Style = dwStyle & ~WS_VISIBLE;
/* call hook */
Cs.lpCreateParams = lpParam;
Cs.hInstance = hInstance;