Authors: Mike McCormack <mike@codeweavers.com>, Dmitry Timoshkov <dmitry@codeweavers.com>

dlls/user/tests/msg.c

@@ -4342,6 +4342,7 @@ static LRESULT WINAPI MsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPAR
     {
 	case WM_NCDESTROY:
 	    ok(!GetWindow(hwnd, GW_CHILD), "children should be unlinked at this point\n");
+	    ok(GetCapture() != hwnd, "capture should be released at this point\n");
 	/* fall through */
 	case WM_DESTROY:
             if (pGetAncestor)
@@ -5504,6 +5505,10 @@ static void test_DestroyWindow(void)
     trace("parent %p, child1 %p, child2 %p, child3 %p, child4 %p\n",
 	   parent, child1, child2, child3, child4);
 
+    SetCapture(child3);
+    test = GetCapture();
+    ok(test == child3, "wrong capture window %p\n", test);
+
     test_DestroyWindow_flag = TRUE;
     ok(DestroyWindow(parent), "DestroyWindow() error %ld\n", GetLastError());
     test_DestroyWindow_flag = FALSE;
@@ -5514,6 +5519,9 @@ static void test_DestroyWindow(void)
     ok(!IsWindow(child2), "child2 still exists");
     ok(!IsWindow(child3), "child3 still exists");
     ok(!IsWindow(child4), "child4 still exists");
+
+    test = GetCapture();
+    ok(!test, "wrong capture window %p\n", test);
 }
 
 

windows/win.c

@@ -614,6 +614,23 @@ BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient )
 
 
 /***********************************************************************
+ *           WIN_ReleaseCapture
+ *
+ * Internal version of ReleaseCapture which doesn't send WM_CAPTURECHANGED
+ * message. Used at the window destruction time.
+ */
+static void WIN_ReleaseCapture( void )
+{
+    SERVER_START_REQ( set_capture_window )
+    {
+        req->handle = 0;
+        req->flags  = 0;
+        wine_server_call_err( req );
+    }
+    SERVER_END_REQ;
+}
+
+/***********************************************************************
  *           WIN_DestroyWindow
  *
  * Destroy storage associated to a window. "Internals" p.358
@@ -650,6 +667,8 @@ LRESULT WIN_DestroyWindow( HWND hwnd )
     RedrawWindow( hwnd, NULL, 0,
                   RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_NOCHILDREN);
 
+    if (hwnd == GetCapture()) WIN_ReleaseCapture();
+
     /* Unlink now so we won't bother with the children later on */
     WIN_UnlinkWindow( hwnd );
 
@@ -661,7 +680,6 @@ LRESULT WIN_DestroyWindow( HWND hwnd )
     /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */
 
     WINPOS_CheckInternalPos( hwnd );
-    if( hwnd == GetCapture()) ReleaseCapture();
 
     /* free resources associated with the window */