Changeset 7887 for trunk/src/user32/window.cpp

Timestamp:

Feb 12, 2002, 2:10:14 PM (24 years ago)

Author:

sandervl

Message:

fixed reference count leak in SetFocus

File:

• trunk/src/user32/window.cpp (modified) (5 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.118 2002-02-11 16:05:59 sandervl Exp $ */
+/* $Id: window.cpp,v 1.119 2002-02-12 13:10:14 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -732 +732 @@
  Win32BaseWindow *oldfocuswnd;
  HWND lastFocus, lastFocus_W, hwnd_O, hwndTopParent;
- BOOL activate;
+ BOOL activate, ret;
  TEB *teb;
 
@@ -770 +770 @@
     if(HOOK_CallHooksA(WH_CBT, HCBT_SETFOCUS, hwnd, (LPARAM)lastFocus_W)) {
         dprintf(("hook cancelled SetFocus call!"));
+        RELEASE_WNDOBJ(window);
         return 0;
     }
@@ -781 +782 @@
         //mp2 = top parent if activation required
         OSLibPostMessageDirect(hwnd_O, WIN32APP_SETFOCUSMSG, hwnd, (activate) ? hwndTopParent : 0);
+        RELEASE_WNDOBJ(window);
         return lastFocus_W;
     }
@@ -787 +789 @@
 
     //NOTE: Don't always activate the window or else the z-order will be changed!!
-    return (OSLibWinSetFocus(OSLIB_HWND_DESKTOP, hwnd_O, activate)) ? lastFocus_W : 0;
+    ret = (OSLibWinSetFocus(OSLIB_HWND_DESKTOP, hwnd_O, activate)) ? lastFocus_W : 0;
+    RELEASE_WNDOBJ(window);
+    return ret;
 }
 //******************************************************************************