Protect SetParent from creating circular window dependencies.
Add a test case.
diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c
index 70bae36..fc3debc 100644
--- a/dlls/user/tests/msg.c
+++ b/dlls/user/tests/msg.c
@@ -5440,6 +5440,7 @@
/* test owner/parent of child2 */
test = GetParent(child2);
ok(test == GetDesktopWindow(), "wrong parent %p\n", test);
+ ok(!IsChild(parent, child2), "wrong parent/child %p/%p\n", parent, child2);
if(pGetAncestor) {
test = pGetAncestor(child2, GA_PARENT);
ok(test == GetDesktopWindow(), "wrong parent %p\n", test);
@@ -5453,6 +5454,9 @@
/* test owner/parent of the parent */
test = GetParent(parent);
ok(!test, "wrong parent %p\n", test);
+todo_wine {
+ ok(!IsChild(GetDesktopWindow(), parent), "wrong parent/child %p/%p\n", GetDesktopWindow(), parent);
+}
if(pGetAncestor) {
test = pGetAncestor(parent, GA_PARENT);
ok(test == GetDesktopWindow(), "wrong parent %p\n", test);
@@ -5463,6 +5467,7 @@
/* test owner/parent of child1 */
test = GetParent(child1);
ok(test == parent, "wrong parent %p\n", test);
+ ok(IsChild(parent, child1), "wrong parent/child %p/%p\n", parent, child1);
if(pGetAncestor) {
test = pGetAncestor(child1, GA_PARENT);
ok(test == parent, "wrong parent %p\n", test);
@@ -5473,6 +5478,7 @@
/* test owner/parent of child2 */
test = GetParent(child2);
ok(test == parent, "wrong parent %p\n", test);
+ ok(IsChild(parent, child2), "wrong parent/child %p/%p\n", parent, child2);
if(pGetAncestor) {
test = pGetAncestor(child2, GA_PARENT);
ok(test == parent, "wrong parent %p\n", test);
@@ -5483,6 +5489,7 @@
/* test owner/parent of child3 */
test = GetParent(child3);
ok(test == child1, "wrong parent %p\n", test);
+ ok(IsChild(parent, child3), "wrong parent/child %p/%p\n", parent, child3);
if(pGetAncestor) {
test = pGetAncestor(child3, GA_PARENT);
ok(test == child1, "wrong parent %p\n", test);
@@ -5493,6 +5500,7 @@
/* test owner/parent of child4 */
test = GetParent(child4);
ok(test == parent, "wrong parent %p\n", test);
+ ok(!IsChild(parent, child4), "wrong parent/child %p/%p\n", parent, child4);
if(pGetAncestor) {
test = pGetAncestor(child4, GA_PARENT);
ok(test == GetDesktopWindow(), "wrong parent %p\n", test);
@@ -5514,11 +5522,11 @@
test_DestroyWindow_flag = FALSE;
ok_sequence(destroy_window_with_children, "destroy window with children", 0);
- ok(!IsWindow(parent), "parent still exists");
- ok(!IsWindow(child1), "child1 still exists");
- ok(!IsWindow(child2), "child2 still exists");
- ok(!IsWindow(child3), "child3 still exists");
- ok(!IsWindow(child4), "child4 still exists");
+ ok(!IsWindow(parent), "parent still exists\n");
+ ok(!IsWindow(child1), "child1 still exists\n");
+ ok(!IsWindow(child2), "child2 still exists\n");
+ ok(!IsWindow(child3), "child3 still exists\n");
+ ok(!IsWindow(child4), "child4 still exists\n");
test = GetCapture();
ok(!test, "wrong capture window %p\n", test);
diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c
index 84e5daa..0f5c977 100644
--- a/dlls/user/tests/win.c
+++ b/dlls/user/tests/win.c
@@ -2281,8 +2281,7 @@
DestroyWindow( child );
}
-
-void nccalchelper( HWND hwnd, INT x, INT y, RECT *prc)
+static void nccalchelper(HWND hwnd, INT x, INT y, RECT *prc)
{
MoveWindow( hwnd, 0, 0, x, y, 0);
GetWindowRect( hwnd, prc);
@@ -2293,7 +2292,7 @@
prc->left,prc->top,prc->right,prc->bottom);
}
-void test_nccalcscroll( HWND parent)
+static void test_nccalcscroll(HWND parent)
{
RECT rc1;
INT sbheight = GetSystemMetrics( SM_CYHSCROLL);
@@ -2333,6 +2332,86 @@
DestroyWindow( hwnd);
}
+
+static void test_SetParent(void)
+{
+ HWND desktop = GetDesktopWindow();
+ BOOL is_win9x = GetWindowLongPtrW(desktop, GWLP_WNDPROC) == 0;
+ HWND parent, child1, child2, child3, child4;
+
+ parent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW,
+ 100, 100, 200, 200, 0, 0, 0, NULL);
+ assert(parent != 0);
+ child1 = CreateWindowExA(0, "static", NULL, WS_CHILD,
+ 0, 0, 50, 50, parent, 0, 0, NULL);
+ assert(child1 != 0);
+ child2 = CreateWindowExA(0, "static", NULL, WS_POPUP,
+ 0, 0, 50, 50, child1, 0, 0, NULL);
+ assert(child2 != 0);
+ child3 = CreateWindowExA(0, "static", NULL, WS_CHILD,
+ 0, 0, 50, 50, child2, 0, 0, NULL);
+ assert(child3 != 0);
+ child4 = CreateWindowExA(0, "static", NULL, WS_POPUP,
+ 0, 0, 50, 50, child3, 0, 0, NULL);
+ assert(child4 != 0);
+
+ trace("parent %p, child1 %p, child2 %p, child3 %p, child4 %p\n",
+ parent, child1, child2, child3, child4);
+
+ check_parents(parent, desktop, 0, 0, 0, parent, parent);
+ check_parents(child1, parent, parent, parent, 0, parent, parent);
+ check_parents(child2, desktop, parent, parent, parent, child2, parent);
+ check_parents(child3, child2, child2, child2, 0, child2, parent);
+ check_parents(child4, desktop, child2, child2, child2, child4, parent);
+
+todo_wine {
+ ok(!IsChild(desktop, parent), "wrong parent/child %p/%p\n", desktop, parent);
+ ok(!IsChild(desktop, child1), "wrong parent/child %p/%p\n", desktop, child1);
+ ok(!IsChild(desktop, child2), "wrong parent/child %p/%p\n", desktop, child2);
+ ok(!IsChild(desktop, child3), "wrong parent/child %p/%p\n", desktop, child3);
+ ok(!IsChild(desktop, child4), "wrong parent/child %p/%p\n", desktop, child4);
+}
+
+ ok(IsChild(parent, child1), "wrong parent/child %p/%p\n", parent, child1);
+todo_wine {
+ ok(!IsChild(desktop, child2), "wrong parent/child %p/%p\n", desktop, child2);
+}
+ ok(!IsChild(parent, child2), "wrong parent/child %p/%p\n", parent, child2);
+ ok(!IsChild(child1, child2), "wrong parent/child %p/%p\n", child1, child2);
+ ok(!IsChild(parent, child3), "wrong parent/child %p/%p\n", parent, child3);
+ ok(IsChild(child2, child3), "wrong parent/child %p/%p\n", child2, child3);
+ ok(!IsChild(parent, child4), "wrong parent/child %p/%p\n", parent, child4);
+ ok(!IsChild(child3, child4), "wrong parent/child %p/%p\n", child3, child4);
+todo_wine {
+ ok(!IsChild(desktop, child4), "wrong parent/child %p/%p\n", desktop, child4);
+}
+
+ if (!is_win9x) /* Win9x doesn't survive this test */
+ {
+ ok(!SetParent(parent, child1), "SetParent should fail\n");
+ ok(!SetParent(child2, child3), "SetParent should fail\n");
+ ok(SetParent(child1, parent) != 0, "SetParent should not fail\n");
+ ok(SetParent(parent, child2) != 0, "SetParent should not fail\n");
+ ok(SetParent(parent, child3) != 0, "SetParent should not fail\n");
+ ok(!SetParent(child2, parent), "SetParent should fail\n");
+ ok(SetParent(parent, child4) != 0, "SetParent should not fail\n");
+
+ check_parents(parent, child4, child4, 0, 0, child4, parent);
+ check_parents(child1, parent, parent, parent, 0, child4, parent);
+ check_parents(child2, desktop, parent, parent, parent, child2, parent);
+ check_parents(child3, child2, child2, child2, 0, child2, parent);
+ check_parents(child4, desktop, child2, child2, child2, child4, parent);
+ }
+
+ ok(DestroyWindow(parent), "DestroyWindow() error %ld\n", GetLastError());
+
+ ok(!IsWindow(parent), "parent still exists\n");
+ ok(!IsWindow(child1), "child1 still exists\n");
+ ok(!IsWindow(child2), "child2 still exists\n");
+ ok(!IsWindow(child3), "child3 still exists\n");
+ ok(!IsWindow(child4), "child4 still exists\n");
+}
+
START_TEST(win)
{
pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" );
@@ -2376,6 +2455,7 @@
test_capture_3(hwndMain, hwndMain2);
test_parent_owner();
+ test_SetParent();
test_shell_window();
test_mdi();
diff --git a/windows/win.c b/windows/win.c
index 1f67170..e372cdb 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -2643,6 +2643,13 @@
return 0;
}
+ /* Some applications try to set a child as a parent */
+ if (IsChild(hwnd, parent))
+ {
+ SetLastError( ERROR_INVALID_PARAMETER );
+ return 0;
+ }
+
if (!(full_handle = WIN_IsCurrentThread( hwnd )))
return (HWND)SendMessageW( hwnd, WM_WINE_SETPARENT, (WPARAM)parent, 0 );
