commit b19c57ca71ca2f3b77a142509b9335d0f5f8e3ce
author Alexandre Julliard <julliard@winehq.org> Thu May 10 21:06:56 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu May 10 21:06:56 2001 +0000
tree e661f94823e9fc0c572d3ee6c5ab5db567ef3fa2
parent 2418edb101078b9886717dfcd084e0ebcf00bc36

Fixed reparenting to desktop (found by Gerard Patel).

dlls/x11drv/window.c

diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c
index 4a417a9..4508b99 100644
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -398,8 +398,9 @@
 
     dwStyle = wndPtr->dwStyle;
 
-    pWndParent = parent ? WIN_FindWndPtr(parent) : WIN_GetDesktop();
-    if (!pWndParent)
+    if (!parent) parent = GetDesktopWindow();
+
+    if (!(pWndParent = WIN_FindWndPtr(parent)))
     {
         WIN_ReleaseWndPtr( wndPtr );
         return 0;

windows/win.c

diff --git a/windows/win.c b/windows/win.c
index bec9352..6f0faed 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -2391,8 +2391,9 @@
 
     dwStyle = wndPtr->dwStyle;
 
-    pWndParent = parent ? WIN_FindWndPtr(parent) : WIN_GetDesktop();
-    if (!pWndParent)
+    if (!parent) parent = GetDesktopWindow();
+
+    if (!(pWndParent = WIN_FindWndPtr(parent)))
     {
         WIN_ReleaseWndPtr( wndPtr );
         return 0;