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

Timestamp:

Dec 5, 2000, 2:05:52 PM (25 years ago)

Author:

sandervl

Message:

16 bits menu handle fixes

File:

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

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.27 2000-11-21 15:17:12 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.28 2000-12-05 13:05:50 sandervl Exp $*/
 /*
  * Menu functions
@@ -31 +31 @@
 #include "menu.h"
 
+#ifdef __WIN32OS2__
+#include <objhandle.h>
+
 #define DBG_LOCALLOG    DBG_menu
 #include "dbglocal.h"
+#endif
 
 //DEFAULT_DEBUG_CHANNEL(menu)
@@ -100 +104 @@
 #define MENU_MAGIC   0x554d  /* 'MU' */
 
-#ifdef __WIN32OS2__
-//******************************************************************************
-//Used by our menu code (we don't want any logging)
-//******************************************************************************
-BOOL IsWindowInternal(HWND hwnd)
-{
-  Win32BaseWindow *window;
-
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        return FALSE;
-    }
-    return window->IsWindow();
-}
-#define IS_A_MENU(pmenu) ((pmenu) && !IsWindowInternal((HWND)pmenu) && (pmenu)->wMagic == MENU_MAGIC)
-#else
 #define IS_A_MENU(pmenu) ((pmenu) && (pmenu)->wMagic == MENU_MAGIC)
-#endif
 
 #define ITEM_PREV               -1
@@ -343 +330 @@
 POPUPMENU *MENU_GetMenu(HMENU hMenu)
 {
+#ifdef __WIN32OS2__
+    if(ObjGetHandleType(hMenu) == USEROBJ_MENU) {
+        POPUPMENU *menu;
+
+        menu = (POPUPMENU *)ObjGetHandleData(hMenu, USEROBJ_MENU);
+        return menu;
+    }
+    return NULL;
+#else
     POPUPMENU *menu;
     menu = (POPUPMENU*)hMenu;
@@ -351 +347 @@
     }
     return menu;
+#endif
 }
 
@@ -363 +360 @@
 
     if( hMenu ) {
+#ifdef __WIN32OS2__
+        POPUPMENU* menu = MENU_GetMenu(hMenu);
+#else
         POPUPMENU* menu = (POPUPMENU*)hMenu;
+#endif
         menu->wFlags |= MF_SYSMENU | MF_POPUP;
         SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE);
@@ -422 +423 @@
     if (hMenu)
     {
+#ifdef __WIN32OS2__
+        POPUPMENU *menu = MENU_GetMenu(hMenu);
+#else
         POPUPMENU *menu = (POPUPMENU*)hMenu;
+#endif
         menu->wFlags = MF_SYSMENU;
         menu->hWnd = hWnd;
@@ -436 +441 @@
             menu->items[0].fType = MF_SYSMENU | MF_POPUP;
             menu->items[0].fState = 0;
+#ifdef __WIN32OS2__
+            menu = MENU_GetMenu(hPopupMenu);
+#else
             menu = (POPUPMENU*)hPopupMenu;
+#endif
             menu->wFlags |= MF_SYSMENU;
 
@@ -562 +571 @@
     HMENU  hMenu )
 {
+#ifdef __WIN32OS2__
+    POPUPMENU  *menu = MENU_GetMenu(hMenu);
+#else
     POPUPMENU  *menu = (POPUPMENU*)hMenu;
+#endif
     UINT  i = menu->FocusedItem + 1;
 
@@ -590 +603 @@
     HMENU  hMenu )
 {
+#ifdef __WIN32OS2__
+    POPUPMENU const  *menu = MENU_GetMenu(hMenu);
+#else
     POPUPMENU const  *menu = (POPUPMENU*)hMenu;
+#endif
     UINT  i;
 
@@ -1719 +1736 @@
             int pos;
             if((pos=MENU_FindSubMenu(&topmenu, hmenu))!=NO_SELECTED_ITEM){
+#ifdef __WIN32OS2__
+                POPUPMENU *ptm = MENU_GetMenu(topmenu);
+#else
                 POPUPMENU *ptm = (POPUPMENU*)topmenu;
+#endif
                 MENUITEM *ip = &ptm->items[pos];
                 SendMessageA( hwndOwner, WM_MENUSELECT, MAKELONG(pos,
@@ -1867 +1888 @@
     /* Find where to insert new item */
     if (flags & MF_BYPOSITION) {
-        if (pos > menu->nItems) 
+        if (pos > menu->nItems)
             pos = menu->nItems;
     } else {
-        if (!MENU_FindItem( &hMenu, &pos, flags )) 
+        if (!MENU_FindItem( &hMenu, &pos, flags ))
             pos = menu->nItems;
         else {
@@ -3217 +3238 @@
 
     if(lpRect) {
-         dprintf(("USER32: TrackPopupMenu %x %x (%d,%d) %x %x (%d,%d)(%d,%d)", hMenu, wFlags, x, y, nReserved, hWnd, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
+         dprintf(("USER32: TrackPopupMenu %x %x (%d,%d) %x %x (%d,%d)(%d,%d)", hMenu, wFlags, x, y, nReserved, hWnd, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
     }
     else dprintf(("USER32: TrackPopupMenu %x %x (%d,%d) %x %x lpRect=NULL", hMenu, wFlags, x, y, nReserved, hWnd));
@@ -3502 +3523 @@
     if (!str || !nMaxSiz)
     {
-        if (item && IS_STRING_ITEM(item->fType))
-            return strlen(item->text);
-        else
-            return 0;
+    if (item && IS_STRING_ITEM(item->fType))
+        return strlen(item->text);
+    else
+        return 0;
     }
 
@@ -3512 +3533 @@
     if (item)
     {
-        if (!IS_STRING_ITEM(item->fType)) return 0;
-        lstrcpynA( str, item->text, nMaxSiz );
+    if (!IS_STRING_ITEM(item->fType)) return 0;
+    lstrcpynA( str, item->text, nMaxSiz );
     }
 
@@ -3537 +3558 @@
     if (!str || !nMaxSiz)
     {
-        if (item && IS_STRING_ITEM(item->fType))
-            return strlen(item->text);
-        else
-            return 0;
+    if (item && IS_STRING_ITEM(item->fType))
+        return strlen(item->text);
+    else
+        return 0;
     }
 
@@ -3547 +3568 @@
     if (item)
     {
-        if (!IS_STRING_ITEM(item->fType)) return 0;
-        lstrcpynAtoW( str, item->text, nMaxSiz );
+    if (!IS_STRING_ITEM(item->fType)) return 0;
+    lstrcpynAtoW( str, item->text, nMaxSiz );
     }
 
@@ -3883 +3904 @@
     dprintf(("USER32: CreateMenu"));
 
+#ifdef __WIN32OS2__
+    if (!(menu = (LPPOPUPMENU)HeapAlloc(GetProcessHeap(),0,sizeof(POPUPMENU)))) return 0;
+    if(ObjAllocateHandle(&hMenu, (DWORD)menu, USEROBJ_MENU) == FALSE) return 0;
+#else
     if (!(hMenu = (HMENU)HeapAlloc(GetProcessHeap(),0,sizeof(POPUPMENU)))) return 0;
     menu = (LPPOPUPMENU)hMenu;
+#endif
 
     ZeroMemory(menu, sizeof(POPUPMENU));
@@ -3935 +3961 @@
                 HeapFree(GetProcessHeap(), 0, lppop->items );
             }
+#ifdef __WIN32OS2__
+            HeapFree(GetProcessHeap(),0,(LPVOID)lppop);
+            ObjFreeHandle(hMenu);
+#else
             HeapFree(GetProcessHeap(),0,(LPVOID)hMenu);
+#endif
             MENU_ReleaseTopPopupWnd();
         }