Changeset 3499 for trunk/src/user32/winmouse.cpp

Timestamp:

May 5, 2000, 8:23:07 PM (25 years ago)

Author:

sandervl

Message:

SetCapture bugfix

File:

• trunk/src/user32/winmouse.cpp (modified) (3 diffs)

trunk/src/user32/winmouse.cpp

@@ -1 @@
-/* $Id: winmouse.cpp,v 1.9 2000-05-03 18:35:56 sandervl Exp $ */
+/* $Id: winmouse.cpp,v 1.10 2000-05-05 18:23:07 sandervl Exp $ */
 /*
  * Mouse handler for DINPUT
@@ -117 +117 @@
 //******************************************************************************
 //******************************************************************************
-HWND WIN32API SetCapture( HWND hwnd)
+HWND WIN32API SetCapture(HWND hwnd)
 {
  HWND hwndPrev = GetCapture();
+ BOOL rc;
 
     if(hwnd == 0) {
@@ -125 +126 @@
         return hwndPrev;
     }
-    OSLibWinSetCapture(Win32Window::Win32ToOS2Handle(hwnd));
-    dprintf(("USER32: SetCapture %x (prev %x)", hwnd, hwndPrev));
+    if(hwndPrev != NULL) {
+        //SvL: WinSetCapture returns an error if mouse is already captured
+        ReleaseCapture();
+    }
+    rc = OSLibWinSetCapture(Win32Window::Win32ToOS2Handle(hwnd));
+    dprintf(("USER32: SetCapture %x (prev %x) returned %d", hwnd, hwndPrev, rc));
     if(hwndPrev) {
         SendMessageA(hwndPrev, WM_CAPTURECHANGED, 0L, hwnd);
     }
     return hwndPrev;
-//    return 0;
 }
 //******************************************************************************