Changeset 4665 for trunk/src

Timestamp:

Nov 21, 2000, 4:17:14 PM (25 years ago)

Author:

sandervl

Message:

CopyImage fix for icons

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (6 diffs)
• winicon.cpp (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.26 2000-11-01 20:51:37 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.27 2000-11-21 15:17:12 sandervl Exp $*/
 /*
  * Menu functions
@@ -1866 +1866 @@
 
     /* Find where to insert new item */
-
-    /* Find where to insert new item */
-
     if (flags & MF_BYPOSITION) {
         if (pos > menu->nItems) 
@@ -1880 +1877 @@
         }
     }
-
     /* Create new items array */
 
@@ -3532 +3528 @@
     MENUITEM *item;
 
-    dprintf(("USER32: GetMenuStringW"));
+    dprintf(("USER32: GetMenuStringW %x %d %x %d %d", hMenu, wItemID, str, nMaxSiz, wFlags));
 
     //TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
@@ -3618 +3614 @@
     LPPOPUPMENU menu = MENU_GetMenu(hMenu);
 
-    dprintf(("USER32: GetMenuItemCount"));
+    dprintf(("USER32: GetMenuItemCount %x", hMenu));
 
     if (!IS_A_MENU(menu)) return -1;
@@ -3633 +3629 @@
     MENUITEM * lpmi;
 
-    dprintf(("USER32: GetMenuItemID"));
+    dprintf(("USER32: GetMenuItemID %x %d", hMenu, nPos));
 
     if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return 0xFFFFFFFF;

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.15 2000-11-20 20:28:16 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.16 2000-11-21 15:17:14 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -857 +857 @@
                 dprintf(("WARNING: no resource associated with icon/cursor -> copy without scaling!"));
                 hNew = CURSORICON_Copy(Handle);
+                return hNew;
             }