commit 0801ffc5a3d507eaf38b41fa0d56d29fe27b24d1
author Alexandre Julliard <julliard@winehq.org> Fri Aug 24 00:26:59 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Aug 24 00:26:59 2001 +0000
tree f205356ce82f5a6d721a472b73e95dd38c872b2d
parent 8af0eda77ac1021ab00b913e69c8c9de3b0eda84

Implemented GetAncestor and removed WIN_GetTopParent.
Removed a few more accesses to the WND structure.

windows/nonclient.c

diff --git a/windows/nonclient.c b/windows/nonclient.c
index 65a3f2e..172e122 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -1787,7 +1787,7 @@
         NC_GetInsideRect( hwnd, rect );
         OffsetRect( rect, wndPtr->rectWindow.left, wndPtr->rectWindow.top);
         if (wndPtr->dwStyle & WS_CHILD)
-            ClientToScreen( wndPtr->parent->hwndSelf, (POINT *)rect );
+            ClientToScreen( GetParent(hwnd), (POINT *)rect );
         if (TWEAK_WineLook == WIN31_LOOK) {
             rect->right = rect->left + GetSystemMetrics(SM_CXSIZE);
             rect->bottom = rect->top + GetSystemMetrics(SM_CYSIZE);
@@ -2065,7 +2065,7 @@
     {
     case HTCAPTION:
         {
-            HWND top = WIN_GetTopParent(hwnd);
+            HWND top = GetAncestor( hwnd, GA_ROOT );
 
             if( WINPOS_SetActiveWindow(top, TRUE, TRUE) || (GetActiveWindow() == top) )
                 SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam );
@@ -2187,8 +2187,11 @@
 
     TRACE("Handling WM_SYSCOMMAND %x %ld,%ld\n", wParam, pt.x, pt.y );
 
-    if (wndPtr->parent && (uCommand != SC_KEYMENU))
-        ScreenToClient( wndPtr->parent->hwndSelf, &pt );
+    if (uCommand != SC_KEYMENU)
+    {
+        HWND parent = GetAncestor( hwnd, GA_PARENT );
+        if (parent != GetDesktopWindow()) ScreenToClient( parent, &pt );
+    }
 
     switch (uCommand)
     {