Changeset 5935 for trunk/src/user32/winaccel.cpp

Timestamp:

Jun 9, 2001, 4:50:26 PM (24 years ago)

Author:

sandervl

Message:

reference count (window + class objects) rewrite

File:

• trunk/src/user32/winaccel.cpp (modified) (6 diffs)

trunk/src/user32/winaccel.cpp

@@ -1 @@
-/* $Id: winaccel.cpp,v 1.7 2000-02-21 14:25:23 sandervl Exp $ */
+/* $Id: winaccel.cpp,v 1.8 2001-06-09 14:50:24 sandervl Exp $ */
 /*
  * Win32 accelerator key functions for OS/2
@@ -85 +85 @@
                 else
                 {
-                   Win32BaseWindow *window;
+                    Win32BaseWindow *window;
 
                     window = Win32BaseWindow::GetWindowFromHandle(hWnd);
@@ -123 +123 @@
                             mesg=WM_COMMAND;
                     }
+                    RELEASE_WNDOBJ(window);
                 }
                 if ( mesg==WM_COMMAND || mesg==WM_SYSCOMMAND )
@@ -165 +166 @@
     /* YES, Accel16! */
     LPACCEL lpAccelTbl;
-    Win32BaseWindow *window;
     int i;
 
@@ -181 +181 @@
           return 0;
     }
-    window = Win32BaseWindow::GetWindowFromHandle(hWnd);
-    if(!window) {
+    if(!IsWindow(hWnd)) {
           dprintf(("TranslateAccelerator, window %x not found", hWnd));
           SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -233 +232 @@
         }
 
-        mdichild = clientWnd->getActiveChild();
-        if(!mdichild) {
+        hwndChild = clientWnd->getActiveChild();
+        RELEASE_WNDOBJ(clientWnd);
+        if(!hwndChild) {
             dprintf(("TranslateMDISysAccel NO active MDI child!!"));
             return FALSE;
         }
-        hwndChild = mdichild->getWindowHandle();
 
         if(IsWindow(hwndChild) && !(GetWindowLongA(hwndChild,GWL_STYLE) & WS_DISABLED) )