Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-22 13:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win32k]

Browse source 
- Fix wine win.c test_CreateWindow line 5470, pass all those tests.

svn path=/trunk/; revision=62613
This commit is contained in:
James Tabor 2014-04-05 05:06:48 +00:00
parent 785a8b7ebe
commit 15f4004f9f
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/win32ss/user/ntuser/window.c
View file

@ -1353,7 +1353,7 @@ co_IntSetParent(PWND Wnd, PWND WndNewParent)
co_WinPosSetWindowPos( Wnd, co_WinPosSetWindowPos( Wnd,
(0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST), (0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST),
pt.x, pt.y, 0, 0, swFlags); pt.x, pt.y, 0, 0, swFlags);
//ERR("IntSetParent SetWindowPos 2\n"); //ERR("IntSetParent SetWindowPos 2 X %d Y %d\n",pt.x, pt.y);
if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL); if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL);
return WndOldParent; return WndOldParent;
@ -1742,12 +1742,12 @@ IntFixWindowCoordinates(CREATESTRUCTW* Cs, PWND ParentWindow, DWORD* dwShowMode)
/* Allocates and initializes a window */ /* Allocates and initializes a window */
PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
PLARGE_STRING WindowName, PLARGE_STRING WindowName,
PCLS Class, PCLS Class,
PWND ParentWindow, PWND ParentWindow,
PWND OwnerWindow, PWND OwnerWindow,
PVOID acbiBuffer, PVOID acbiBuffer,
PDESKTOP pdeskCreated) PDESKTOP pdeskCreated)
{ {
PWND pWnd = NULL; PWND pWnd = NULL;
HWND hWnd; HWND hWnd;
@ -1759,8 +1759,8 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
pti = pdeskCreated ? gptiDesktopThread : GetW32ThreadInfo(); pti = pdeskCreated ? gptiDesktopThread : GetW32ThreadInfo();
if (!(Cs->dwExStyle & WS_EX_LAYOUTRTL)) if (!(Cs->dwExStyle & WS_EX_LAYOUTRTL))
{ { // Need both here for wine win.c test_CreateWindow.
if (ParentWindow) if (Cs->hwndParent && ParentWindow)
{ {
if ( (Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD && if ( (Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD &&
ParentWindow->ExStyle & WS_EX_LAYOUTRTL && ParentWindow->ExStyle & WS_EX_LAYOUTRTL &&
@ -1776,7 +1776,6 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
*/ */
if ( Class->fnid != FNID_DIALOG ) if ( Class->fnid != FNID_DIALOG )
{ {
ERR("No parent and not a dialog Fix HACK\n");
if (pti->ppi->dwLayout & LAYOUT_RTL) if (pti->ppi->dwLayout & LAYOUT_RTL)
{ {
Cs->dwExStyle |= WS_EX_LAYOUTRTL; Cs->dwExStyle |= WS_EX_LAYOUTRTL;
@ -2115,10 +2114,7 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs,
} }
/* Now find the parent and the owner window */ /* Now find the parent and the owner window */
///////////////
// FIXME!!!! Breaks wine win.c test_CreateWindow line 5470!
hWndParent = pti->rpdesk->pDeskInfo->spwnd->head.h; hWndParent = pti->rpdesk->pDeskInfo->spwnd->head.h;
///////////////
hWndOwner = NULL; hWndOwner = NULL;
if (Cs->hwndParent == HWND_MESSAGE) if (Cs->hwndParent == HWND_MESSAGE)