ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If there no MDI child to activate set hwndActiveChild to 0 in 

WM_MDIDESTROY hander, add a test case.
This commit is contained in:
Dmitry Timoshkov 2004-10-05 02:10:04 +00:00 committed by Alexandre Julliard
parent f2dca03dec
commit 01a88ff01e
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/user/tests/msg.c
View File

@ -1522,6 +1522,7 @@ static BOOL mdi_RegisterWindowClasses(void)
static void test_mdi_messages(void)
{
MDICREATESTRUCTA mdi_cs;
CLIENTCREATESTRUCT client_cs;
HWND mdi_frame, mdi_child, mdi_child2, active_child;
BOOL zoomed;
@ -1807,6 +1808,29 @@ static void test_mdi_messages(void)
flush_sequence();
/* end of test for maximized MDI children */
mdi_cs.szClass = "MDI_child_Class";
mdi_cs.szTitle = "MDI child";
mdi_cs.hOwner = GetModuleHandleA(0);
mdi_cs.x = CW_USEDEFAULT;
mdi_cs.y = CW_USEDEFAULT;
mdi_cs.cx = CW_USEDEFAULT;
mdi_cs.cy = CW_USEDEFAULT;
mdi_cs.style = WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX;
mdi_cs.lParam = 0;
mdi_child = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&mdi_cs);
ok(mdi_child != 0, "MDI child creation failed\n");
active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed);
ok(active_child == mdi_child, "wrong active MDI child %p\n", active_child);
SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0);
ok(!IsWindow(mdi_child), "MDI child should be destroyed\n");
active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed);
ok(!active_child, "wrong active MDI child %p\n", active_child);
SetFocus(0);
flush_sequence();
DestroyWindow(mdi_client);
ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE);

5
windows/mdi.c
View File

@ -525,7 +525,10 @@ static LRESULT MDIDestroyChild( HWND parent, MDICLIENTINFO *ci,
if( child == ci->hwndActiveChild )
{
HWND next = MDI_GetWindow(ci, child, TRUE, 0);
MDI_SwitchActiveChild(ci, next);
if (next)
MDI_SwitchActiveChild(ci, next);
else
ci->hwndActiveChild = 0; /* nothing to activate */
}
for (i = 0; i < ci->nActiveChildren; i++)