Commit 3c888a74 authored by Michael Müller's avatar Michael Müller Committed by Alexandre Julliard

user32: Preserve beginning of extra data for MDI windows.

parent e931f0e8
...@@ -127,6 +127,7 @@ typedef struct ...@@ -127,6 +127,7 @@ typedef struct
* states it must keep coherency with USER32 on its own. This is true for * states it must keep coherency with USER32 on its own. This is true for
* Windows as well. * Windows as well.
*/ */
LONG reserved;
UINT nActiveChildren; UINT nActiveChildren;
HWND hwndChildMaximized; HWND hwndChildMaximized;
HWND hwndActiveChild; HWND hwndActiveChild;
......
...@@ -3380,6 +3380,7 @@ static void test_mdi_messages(void) ...@@ -3380,6 +3380,7 @@ static void test_mdi_messages(void)
BOOL zoomed; BOOL zoomed;
RECT rc; RECT rc;
HMENU hMenu = CreateMenu(); HMENU hMenu = CreateMenu();
LONG val;
if (!mdi_RegisterWindowClasses()) assert(0); if (!mdi_RegisterWindowClasses()) assert(0);
...@@ -3408,8 +3409,9 @@ static void test_mdi_messages(void) ...@@ -3408,8 +3409,9 @@ static void test_mdi_messages(void)
rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
mdi_frame, 0, GetModuleHandleA(0), &client_cs); mdi_frame, 0, GetModuleHandleA(0), &client_cs);
assert(mdi_client); assert(mdi_client);
ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); SetWindowLongA(mdi_client, 0, 0xdeadbeef);
ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE);
ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow());
ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus()); ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus());
...@@ -3867,6 +3869,8 @@ static void test_mdi_messages(void) ...@@ -3867,6 +3869,8 @@ static void test_mdi_messages(void)
SetFocus(0); SetFocus(0);
flush_sequence(); flush_sequence();
val = GetWindowLongA(mdi_client, 0);
ok(val == 0xdeadbeef || broken(val == 0) /* >= Win Vista */, "Expected 0xdeadbeef, got 0x%x\n", val);
DestroyWindow(mdi_client); DestroyWindow(mdi_client);
ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE); ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment