Changeset 8872 for trunk/src/user32/menu.cpp

Timestamp:

Jul 15, 2002, 12:19:16 PM (23 years ago)

Author:

sandervl

Message:

handle management updates for GDI32

File:

• trunk/src/user32/menu.cpp (modified) (4 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.48 2002-07-12 19:49:21 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.49 2002-07-15 10:16:28 sandervl Exp $*/
 /*
  * Menu functions
@@ -313 +313 @@
 {
 #ifdef __WIN32OS2__
-    if(ObjGetHandleType(hMenu) == USEROBJ_MENU) {
+    if(ObjQueryHandleType(hMenu) == HNDL_MENU) {
         POPUPMENU *menu;
 
-        menu = (POPUPMENU *)ObjGetHandleData(hMenu, USEROBJ_MENU);
+        menu = (POPUPMENU *)ObjQueryHandleData(hMenu, HNDL_MENU);
         return menu;
     }
@@ -4004 +4004 @@
 #ifdef __WIN32OS2__
     if (!(menu = (LPPOPUPMENU)HeapAlloc(GetProcessHeap(),0,sizeof(POPUPMENU)))) return 0;
-    if(ObjAllocateHandle(&hMenu, (DWORD)menu, USEROBJ_MENU) == FALSE) return 0;
+    if(ObjAllocateHandle(&hMenu, (DWORD)menu, HNDL_MENU) == FALSE) return 0;
 #else
     if (!(hMenu = (HMENU)HeapAlloc(GetProcessHeap(),0,sizeof(POPUPMENU)))) return 0;
@@ -4061 +4061 @@
 #ifdef __WIN32OS2__
             HeapFree(GetProcessHeap(),0,(LPVOID)lppop);
-            ObjFreeHandle(hMenu);
+            ObjDeleteHandle(hMenu, HNDL_MENU);
 #else
             HeapFree(GetProcessHeap(),0,(LPVOID)hMenu);