Changeset 2433 for trunk/src/user32/new/menu.cpp

Timestamp:

Jan 13, 2000, 9:11:39 PM (26 years ago)

Author:

sandervl

Message:

Client rectangle changes, GetDCEx bugfix (CS_OWNDC), scroll rectangle calculation fixes

File:

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

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.8 2000-01-12 12:40:43 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.9 2000-01-13 20:11:36 sandervl Exp $*/
 /*
  * Menu functions
@@ -3121 +3121 @@
     DWORD ret;
 
-    dprintf(("USER32: CheckMenuItem"));
+    dprintf(("USER32: CheckMenuItem %x %x %x", hMenu, id, flags));
 
     //TRACE("menu=%04x id=%04x flags=%04x\n", hMenu, id, flags );
@@ -3141 +3141 @@
     POPUPMENU *menu;
 
-    dprintf(("USER32: EnableMenuItem"));
+    dprintf(("USER32: EnableMenuItem %x %x %x", hMenu, wItemID, wFlags));
 
     //TRACE("(%04x, %04X, %04X) !\n",
@@ -3310 +3310 @@
     MENUITEM *item;
 
-    dprintf(("USER32: InsertMenuA"));
-
-    //if (IS_STRING_ITEM(flags) && str)
+    if (IS_STRING_ITEM(flags) && str)
+        dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
     //    TRACE("hMenu %04x, pos %d, flags %08x, "
     //                  "id %04x, str '%s'\n",
     //                  hMenu, pos, flags, id, str );
-    //else TRACE("hMenu %04x, pos %d, flags %08x, "
+    else // TRACE("hMenu %04x, pos %d, flags %08x, "
+        dprintf(("USER32: InsertMenuA %x %d %x %d %x", hMenu, pos, flags, id, str));
     //                   "id %04x, str %08lx (not a string)\n",
     //                   hMenu, pos, flags, id, (DWORD)str );
@@ -3343 +3343 @@
 {
     BOOL ret;
-
-    dprintf(("USER32: InsertMenuW"));
 
     if (IS_STRING_ITEM(flags) && str)
@@ -3375 +3373 @@
                              UINT id, LPCWSTR data )
 {
-    dprintf(("USER32: AppendMenuW"));
+    dprintf(("USER32: AppendMenuW %x %x %d %x", hMenu, flags, id, data));
 
     return InsertMenuW( hMenu, -1, flags | MF_BYPOSITION, id, data );
@@ -3389 +3387 @@
     MENUITEM *item;
 
-    dprintf(("USER32: RemoveMenu"));
+    dprintf(("USER32: RemoveMenu %x %d %x", hMenu, nPos, wFlags));
 
     //TRACE("(menu=%04x pos=%04x flags=%04x)\n",hMenu, nPos, wFlags);
@@ -3426 +3424 @@
     MENUITEM *item = MENU_FindItem( &hMenu, &nPos, wFlags );
 
-    dprintf(("USER32: DeleteMenu"));
+    dprintf(("USER32: DeleteMenu %x %d %x", hMenu, nPos, wFlags));
 
     if (!item) return FALSE;
@@ -3444 +3442 @@
     MENUITEM *item;
 
-    dprintf(("USER32: ModifyMenuA"));
 
     if (IS_STRING_ITEM(flags))
     {
+        dprintf(("USER32: ModifyMenuA, %x %d %x %d %s", hMenu, pos, flags, id, str));
         //TRACE("%04x %d %04x %04x '%s'\n",
         //              hMenu, pos, flags, id, str ? str : "#NULL#" );
@@ -3454 +3452 @@
     else
     {
+        dprintf(("USER32: ModifyMenuA, %x %d %x %d %x", hMenu, pos, flags, id, str));
         //TRACE("%04x %d %04x %04x %08lx\n",
         //              hMenu, pos, flags, id, (DWORD)str );
@@ -3470 +3469 @@
 {
     BOOL ret;
-
-    dprintf(("USER32: ModifyMenuW"));
 
     if (IS_STRING_ITEM(flags) && str)
@@ -3516 +3513 @@
  *         SetMenuItemBitmaps32    (USER32.490)
  */
-BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags,
-                                    HBITMAP hNewUnCheck, HBITMAP hNewCheck)
+BOOL WINAPI SetMenuItemBitmaps(HMENU hMenu, UINT nPos, UINT wFlags,
+                               HBITMAP hNewUnCheck, HBITMAP hNewCheck)
 {
     MENUITEM *item;
 
-    dprintf(("USER32: SetMenuItemBitmaps"));
+    dprintf(("USER32: SetMenuItemBitmaps %x %d %x %x %x", hMenu, nPos, wFlags, hNewCheck, hNewUnCheck));
 
     //TRACE("(%04x, %04x, %04x, %04x, %04x)\n",
@@ -3572 +3569 @@
     //TRACE("(%04x)\n", hMenu);
 
-    dprintf(("USER32: DestroyMenu"));
+    dprintf(("USER32: DestroyMenu %x", hMenu));
 
     /* Silently ignore attempts to destroy default system popup */
@@ -3701 +3698 @@
     HMENU retvalue;
 
-    dprintf(("USER32: GetMenu"));
+    dprintf(("USER32: GetMenu %x", hWnd));
 
     if (GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD) return 0;
@@ -3714 +3711 @@
     //TRACE("(%04x, %04x);\n", hWnd, hMenu);
 
-    dprintf(("USER32: SetMenu"));
+    dprintf(("USER32: SetMenu %x %x", hWnd, hMenu));
 
     if (hMenu && !IsMenu(hMenu))
@@ -3756 +3753 @@
     MENUITEM * lpmi;
 
-    dprintf(("USER32: GetSubMenu"));
+    dprintf(("USER32: GetSubMenu %x %d", nPos));
 
     if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return 0;
@@ -3771 +3768 @@
     LPPOPUPMENU lppop;
 
-    dprintf(("USER32: DrawMenuBar"));
+    dprintf(("USER32: DrawMenuBar %x", hWnd));
 
     if (!(GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD) && getMenu(hWnd))
@@ -3812 +3809 @@
     HRSRC hrsrc = FindResourceA( instance, name, RT_MENUA );
 
-    dprintf(("USER32: LoadMenuA"));
+    dprintf(("USER32: LoadMenuA %x %x", instance, name));
 
     if (!hrsrc) return 0;
@@ -3826 +3823 @@
     HRSRC hrsrc = FindResourceW( instance, name, RT_MENUW );
 
-    dprintf(("USER32: LoadMenuW"));
+    dprintf(("USER32: LoadMenuW %x %x", instance, name));
 
     if (!hrsrc) return 0;