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

[User32]

Browse source 
- Fix most of the user32 wine win test_mdi tests. Leaving 30 failures dealing with rect size, Class and Title names.

svn path=/trunk/; revision=50208
This commit is contained in:
James Tabor 2010-12-29 08:17:54 +00:00
parent b2a4a3214a
commit 6c87e66f80
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
reactos/dll/win32/user32/windows/window.c
View file

@ -342,6 +342,20 @@ CreateWindowExA(DWORD dwExStyle,
POINT mPos[2]; POINT mPos[2];
UINT id = 0; UINT id = 0;
HWND top_child; HWND top_child;
PWND pWndParent;
PCLS pCls;
pWndParent = ValidateHwnd(hWndParent);
if (!pWndParent) return NULL;
pCls = DesktopPtrToUser(pWndParent->pcls);
if (pCls->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT
{
WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent);
return NULL;
}
/* lpParams of WM_[NC]CREATE is different for MDI children. /* lpParams of WM_[NC]CREATE is different for MDI children.
* MDICREATESTRUCT members have the originally passed values. * MDICREATESTRUCT members have the originally passed values.
@ -358,7 +372,7 @@ CreateWindowExA(DWORD dwExStyle,
lpParam = (LPVOID)&mdi; lpParam = (LPVOID)&mdi;
if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) if (pWndParent->style & MDIS_ALLCHILDSTYLES)
{ {
if (dwStyle & WS_POPUP) if (dwStyle & WS_POPUP)
{ {
@ -454,6 +468,20 @@ CreateWindowExW(DWORD dwExStyle,
POINT mPos[2]; POINT mPos[2];
UINT id = 0; UINT id = 0;
HWND top_child; HWND top_child;
PWND pWndParent;
PCLS pCls;
pWndParent = ValidateHwnd(hWndParent);
if (!pWndParent) return NULL;
pCls = DesktopPtrToUser(pWndParent->pcls);
if (pCls->fnid != FNID_MDICLIENT)
{
WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent);
return NULL;
}
/* lpParams of WM_[NC]CREATE is different for MDI children. /* lpParams of WM_[NC]CREATE is different for MDI children.
* MDICREATESTRUCT members have the originally passed values. * MDICREATESTRUCT members have the originally passed values.
@ -470,7 +498,7 @@ CreateWindowExW(DWORD dwExStyle,
lpParam = (LPVOID)&mdi; lpParam = (LPVOID)&mdi;
if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) if (pWndParent->style & MDIS_ALLCHILDSTYLES)
{ {
if (dwStyle & WS_POPUP) if (dwStyle & WS_POPUP)
{ {