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

Timestamp:

May 22, 2000, 7:21:11 PM (25 years ago)

Author:

cbratschi

Message:

merged controls with Corel WINE 20000513, maximize/minimize fix

File:

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

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.21 2000-05-09 18:56:56 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.22 2000-05-22 17:21:09 cbratschi Exp $*/
 /*
  * Menu functions
@@ -9 +9 @@
  * Copyright 1999 Christoph Bratschi
  *
- * Corel version: 20000317
+ * Corel version: 200005313
  * (WINE version: 20000130)
  *
@@ -837 +837 @@
         lpitem->rect.right  += mis.itemWidth;
 
-        //SvL: Add size of space between two menu items (fixes RealPlayer 7 menu)
+        //SvL: Add size of space between two menu items (fixes RealPlayer 7 menu)
         if(menuBar)
         {
@@ -1599 +1599 @@
             if (!pTopPopupWnd)
             {
-                DebugInt3();
+                DebugInt3();
                 return FALSE;
             }
@@ -1616 +1616 @@
                 if( !menu->hWnd )
                 {
-                    DebugInt3();
+                    DebugInt3();
                     return FALSE;
                 }
@@ -2187 +2187 @@
         if(win32wnd==NULL) {
             //SvL: This happens in Moraff's YourJongg 2.0, return here
-            //TODO: Check if this is supposed to happen at all...
+            //TODO: Check if this is supposed to happen at all...
             return (HMENU)0;
-        }
+        }
 
         ht = win32wnd->HandleNCHitTest(pt);
@@ -2433 +2433 @@
               functionality.
             */
-            pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,hPtMenu,FALSE,wFlags,&pmt->pt);
+            pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,hPtMenu,FALSE,wFlags,&pmt->pt);
             return TRUE;
          }
@@ -2784 +2784 @@
                     goto buttondown;
                 case WM_LBUTTONDBLCLK:
-                    if (bSysMenu && (hmenu == mt.hTopMenu))
-                    {
-                        fEndMenu = TRUE;
-                        break;
-                    }
-                    /* fall through */
+                    if (bSysMenu && (hmenu == mt.hTopMenu))
+                    {
+                        fEndMenu = TRUE;
+                        break;
+                    }
+                    /* fall through */
                 case WM_LBUTTONDOWN:
                     /* If the message belongs to the menu, removes it from the queue */
                     /* Else, end menu tracking */
 
-                 buttondown:
+                 buttondown:
                     /* Forcing mouse popup NOW - Ensure timer doesn't popup menu also */
-                    mouseOverMenuID = -1;
+                    mouseOverMenuID = -1;
                     fRemove = MENU_ButtonDown( &mt, hmenu, wFlags );
                     fEndMenu = !fRemove;
@@ -2809 +2809 @@
                     {
                         /* Forcing mouse popup NOW - Ensure timer doesn't popup menu also */
-                        mouseOverMenuID = -1;
+                        mouseOverMenuID = -1;
                         executedMenuId = MENU_ButtonUp( &mt, hmenu, wFlags);
 
@@ -2852 +2852 @@
                    MENU_FindItemByCoords( ptmenu, mt.pt, &id );
 
-                 /* If it is over the same item that set up the timer originally .... */
-                 if (mouseOverMenuID != -1 && mouseOverMenuID == id)
-                 {
-                   /* .... Pop up the menu */
+                 /* If it is over the same item that set up the timer originally .... */
+                 if (mouseOverMenuID != -1 && mouseOverMenuID == id)
+                 {
+                   /* .... Pop up the menu */
                    mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, hmenu, FALSE, wFlags,&mt.pt);
-                  }
+                  }
               }
 
@@ -2968 +2968 @@
             }  /* switch(msg.message) - kbd */
         }
-        else if (msg.message == WM_SYSCOMMAND)
-        {
-                /* The user clicked on the system menu/button */
+        else if (msg.message == WM_SYSCOMMAND)
+        {
+                /* The user clicked on the system menu/button */
         fEndMenu = TRUE;
         break;
-        }
+        }
         else
         {
@@ -3482 +3482 @@
     //TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
     //             hMenu, wItemID, str, nMaxSiz, wFlags );
-    if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
-    if (!IS_STRING_ITEM(item->fType)) return 0;
-    if (!str || !nMaxSiz) return strlen(item->text);
+
+    item = MENU_FindItem( &hMenu, &wItemID, wFlags );
+
+    if (!str || !nMaxSiz)
+    {
+        if (item && IS_STRING_ITEM(item->fType))
+            return strlen(item->text);
+        else
+            return 0;
+    }
+
     str[0] = '\0';
-    lstrcpynA( str, item->text, nMaxSiz );
-    //TRACE("returning '%s'\n", str );
+
+    if (item)
+    {
+        if (!IS_STRING_ITEM(item->fType)) return 0;
+        lstrcpynA( str, item->text, nMaxSiz );
+    }
+
     return strlen(str);
 }
@@ -3504 +3517 @@
     //TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
     //             hMenu, wItemID, str, nMaxSiz, wFlags );
-    if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
-    if (!IS_STRING_ITEM(item->fType)) return 0;
-    if (!str || !nMaxSiz) return strlen(item->text);
+
+    item = MENU_FindItem( &hMenu, &wItemID, wFlags );
+
+    if (!str || !nMaxSiz)
+    {
+        if (item && IS_STRING_ITEM(item->fType))
+            return strlen(item->text);
+        else
+            return 0;
+    }
+
     str[0] = '\0';
-    lstrcpynAtoW( str, item->text, nMaxSiz );
+
+    if (item)
+    {
+        if (!IS_STRING_ITEM(item->fType)) return 0;
+        lstrcpynAtoW( str, item->text, nMaxSiz );
+    }
+
     return lstrlenW(str);
 }
@@ -4727 +4754 @@
  *         IsMenuActive    (Internal)
  */
-BOOL IsMenuActive()
+BOOL IsMenuActive(void)
 {
     return pTopPopupWnd &&  (GetWindowLongA(pTopPopupWnd,GWL_STYLE) & WS_VISIBLE);