Changeset 5935 for trunk/src/user32/menu.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/menu.cpp (modified) (9 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.31 2001-05-20 08:49:49 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.32 2001-06-09 14:50:18 sandervl Exp $*/
 /*
  * Menu functions
@@ -298 +298 @@
 {
   Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-
-  return win32wnd ? win32wnd->GetMenu():(HMENU)0;
+  
+  if(win32wnd) {
+      HMENU hmenu = win32wnd->GetMenu();
+      RELEASE_WNDOBJ(win32wnd);
+      return hmenu;
+  }
+  return (HMENU)0;
 }
 
@@ -306 +311 @@
   Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
-  if (win32wnd) win32wnd->SetMenu(hMenu);
+  if (win32wnd) {
+      win32wnd->SetMenu(hMenu);
+      RELEASE_WNDOBJ(win32wnd);
+  }
 }
 
@@ -313 +321 @@
   Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
-  return win32wnd ? win32wnd->GetSysMenu():(HMENU)0;
+  if(win32wnd) {
+      HMENU hmenu = win32wnd->GetSysMenu();
+      RELEASE_WNDOBJ(win32wnd);
+      return hmenu;
+  }
+  return (HMENU)0;
 }
 
@@ -320 +333 @@
   Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
-  win32wnd->SetSysMenu(hMenu);
+  if(win32wnd) {
+      win32wnd->SetSysMenu(hMenu);
+      RELEASE_WNDOBJ(win32wnd);
+  }
 }
 
@@ -2174 +2190 @@
           rect.bottom = GetSystemMetrics(SM_CYSIZE);
         }
+        if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     }
     else
@@ -2232 +2249 @@
 
         ht = win32wnd->HandleNCHitTest(pt);
+        RELEASE_WNDOBJ(win32wnd);
         if( menu->wFlags & MF_POPUP )
             ht =  (ht != (UINT)HTNOWHERE &&
@@ -3995 +4013 @@
 {
     HMENU retvalue = 0;
-    Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hWnd);
-
-    dprintf(("USER32: GetSystemMenu"));
-
-    if (win32wnd)
+
+    dprintf(("USER32: GetSystemMenu %x %d", hWnd, bRevert));
+
+    if (IsWindow(hWnd))
     {
         HMENU hSysMenu = getSysMenu(hWnd);
@@ -4063 +4080 @@
         if (win32wnd->GetSysMenu()) DestroyMenu(win32wnd->GetSysMenu());
         win32wnd->SetSysMenu(MENU_GetSysMenu( hwnd, hMenu ));
+        RELEASE_WNDOBJ(win32wnd);
         return TRUE;
     }