Changeset 6183 for trunk/src

Timestamp:

Jul 6, 2001, 3:47:00 PM (24 years ago)

Author:

sandervl

Message:

use 16 bits handles for icons & cursors

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (5 diffs)
• winicon.cpp (modified) (16 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.33 2001-06-11 20:08:23 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.34 2001-07-06 13:46:59 sandervl Exp $*/
 /*
  * Menu functions
@@ -3704 +3704 @@
 
     if (IS_STRING_ITEM(flags) && str)
-        dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
+        dprintf(("USER32: InsertMenuA %x %d %x %x %s", hMenu, pos, flags, id, str));
     //    TRACE("hMenu %04x, pos %d, flags %08x, "
     //                  "id %04x, str '%s'\n",
@@ -3754 +3754 @@
                              UINT id, LPCSTR data )
 {
-    dprintf(("USER32: AppendMenuA %x %x %d %x", hMenu, flags, id, data));
+    dprintf(("USER32: AppendMenuA %x %x %x %x", hMenu, flags, id, data));
 
     return InsertMenuA( hMenu, -1, flags | MF_BYPOSITION, id, data );
@@ -3766 +3766 @@
                              UINT id, LPCWSTR data )
 {
-    dprintf(("USER32: AppendMenuW %x %x %d %x", hMenu, flags, id, data));
+    dprintf(("USER32: AppendMenuW %x %x %x %x", hMenu, flags, id, data));
 
     return InsertMenuW( hMenu, -1, flags | MF_BYPOSITION, id, data );
@@ -4158 +4158 @@
     MENUITEM * lpmi;
 
-    dprintf(("USER32: GetSubMenu %x %d", nPos));
+    dprintf(("USER32: GetSubMenu %x %d", hMenu, nPos));
 
     if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return 0;

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.25 2001-07-04 09:55:18 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.26 2001-07-06 13:47:00 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -48 +48 @@
 #include <winicon.h>
 #include <win\cursoricon.h>
+#include <objhandle.h>
 #include "dib.h"
 #include <heapstring.h>
@@ -190 +191 @@
         GetBitmapBits( iconinfo->hbmColor,sizeXor,(char*)(info + 1) +sizeAnd);
         GlobalUnlock(hObj);
+
+#ifdef __WIN32OS2__
+        HICON hIcon;
+        if(ObjAllocateHandle(&hIcon, (DWORD)hObj, USEROBJ_CURSORICON) == FALSE) {
+            GlobalFree(hObj);
+            dprintf(("ERROR: CreateIconIndirect ObjAllocateHandle failed!!"));
+            return 0;
+        }
+#endif
+        return hIcon;
     }
     else {
         dprintf(("ERROR: CreateIconIndirect GlobalAlloc failed!!"));
-    }
-    return hObj;
+        return 0;
+    }
 }
 //******************************************************************************
@@ -216 +227 @@
     CURSORICONINFO  *ciconinfo;
 
+    hIcon = ObjGetHandleData(hIcon, USEROBJ_CURSORICON);
+    if(hIcon == -1) {
+        dprintf(("ERROR: Invalid cursor/icon!"));
+        return 0;
+    }
     ciconinfo = (CURSORICONINFO *)GlobalLock((HGLOBAL)hIcon);
     if (!ciconinfo)
@@ -232 +248 @@
     dprintf(("GetIconInfo %x %x", hIcon, iconinfo));
 
+#ifdef __WIN32OS2__
+    hIcon = ObjGetHandleData(hIcon, USEROBJ_CURSORICON);
+    if(hIcon == -1) {
+        dprintf(("ERROR: Invalid cursor/icon!"));
+        return 0;
+    }
+#endif
     ciconinfo = (CURSORICONINFO *)GlobalLock((HGLOBAL)hIcon);
     if (!ciconinfo)
@@ -361 +384 @@
     hOldCursor = hActiveCursor;
     hActiveCursor = hCursor;
+
+#ifdef __WIN32OS2__
+    hCursor = ObjGetHandleData(hCursor, USEROBJ_CURSORICON);
+    if(hCursor == -1) {
+        dprintf(("ERROR: Invalid cursor/icon!"));
+        return 0;
+    }
+#endif
 
     CURSORICONINFO *iconinfo = (CURSORICONINFO *)GlobalLock((HGLOBAL)hCursor);
@@ -510 +541 @@
     memcpy( ptr + sizeof(CURSORICONINFO) + sizeAnd, lpXORbits, sizeXor );
     GlobalUnlock( handle );
+
+#ifdef __WIN32OS2__
+    HICON hIcon;
+    if(ObjAllocateHandle(&hIcon, (DWORD)handle, USEROBJ_CURSORICON) == FALSE) {
+        GlobalFree(handle);
+        dprintf(("ERROR: CreateCursorIconIndirect ObjAllocateHandle failed!!"));
+        return 0;
+    }
+    return hIcon;
+#else
     return handle;
+#endif
 }
 /**********************************************************************
@@ -562 +604 @@
             info->dwResGroupId  = -1;
 
+            HICON hIcon;
+            if(ObjAllocateHandle(&hIcon, (DWORD)hObj, USEROBJ_CURSORICON) == FALSE) {
+               GlobalUnlock( hObj );
+               GlobalFree(hObj);
+               dprintf(("ERROR: CURSORICON_Load ObjAllocateHandle failed!!"));
+               return 0;
+            }
+
             if (loadflags & LR_SHARED )
-                CURSORICON_AddSharedIcon( -1, hCursor, -1, hObj );
+                CURSORICON_AddSharedIcon( -1, hIcon, -1, hObj );
 
             GlobalUnlock( hObj );
 
-            return hObj;
+            return hIcon;
         }
     }
@@ -1094 +1144 @@
     DeleteObject( hAndBits );
     DeleteObject( hXorBits );
+
+#ifdef __WIN32OS2__
+    if(hObj) {
+        HICON hIcon;
+        if(ObjAllocateHandle(&hIcon, (DWORD)hObj, USEROBJ_CURSORICON) == FALSE) {
+            GlobalFree(hObj);
+            dprintf(("ERROR: CURSORICON_Load ObjAllocateHandle failed!!"));
+            return 0;
+        }
+        return hIcon;
+    }
+#endif
     return hObj;
 }
@@ -1117 +1179 @@
     }
 
+#ifdef __WIN32OS2__
+    HICON hIcon = ObjGetHandleData(handle, USEROBJ_CURSORICON);
+    if(hIcon == -1) {
+        dprintf(("ERROR: Invalid cursor/icon!"));
+        return 0;
+    }
+#endif
+
     /* Try shared cursor/icon first */
     if ( !(flags & CID_NONSHARED) )
     {
+#ifdef __WIN32OS2__
+        INT count = CURSORICON_DelSharedIcon( hIcon );
+#else
         INT count = CURSORICON_DelSharedIcon( handle );
+#endif
 
         if ( count != -1 )
@@ -1130 +1204 @@
 
 #ifdef __WIN32OS2__
-    CURSORICONINFO *iconinfo = (CURSORICONINFO *)GlobalLock((HGLOBAL)handle);
+    CURSORICONINFO *iconinfo = (CURSORICONINFO *)GlobalLock((HGLOBAL)hIcon);
     if (!iconinfo) {
         dprintf(("ERROR: Invalid cursor!"));
@@ -1139 +1213 @@
         OSLibWinDestroyPointer(iconinfo->hColorBmp);
     }
-    GlobalUnlock(handle);
-#endif
-
+    GlobalUnlock(hIcon);
+    retv = GlobalFree( hIcon );
+    ObjFreeHandle(handle);
+
+    return (flags & CID_RESOURCE)? retv : TRUE;
+#else
     retv = GlobalFree( handle );
     return (flags & CID_RESOURCE)? retv : TRUE;
+#endif
 }
 
@@ -1157 +1235 @@
     HGLOBAL hNew;
 
+    handle = ObjGetHandleData(handle, USEROBJ_CURSORICON);
+    if(handle == -1) {
+        dprintf(("ERROR: Invalid cursor/icon!"));
+        return 0;
+    }
+
     if (!(ptrOld = (char *)GlobalLock( handle ))) return 0;
 
     size = GlobalSize( handle );
     hNew = GlobalAlloc( GMEM_MOVEABLE, size );
+#ifdef __WIN32OS2__
+    if(hNew == NULL) {
+        dprintf(("ERROR: CURSORICON_Copy GlobalAlloc failed!!"));
+        return NULL;
+    }
+#endif
     ptrNew = (char *)GlobalLock( hNew );
     memcpy( ptrNew, ptrOld, size );
     GlobalUnlock( handle );
     GlobalUnlock( hNew );
+
+#ifdef __WIN32OS2__
+    HICON hIcon;
+    if(ObjAllocateHandle(&hIcon, (DWORD)hNew, USEROBJ_CURSORICON) == FALSE) {
+        GlobalFree(hNew);
+        dprintf(("ERROR: CURSORICON_Copy ObjAllocateHandle failed!!"));
+        return 0;
+    }
+    return hIcon;
+#else
     return hNew;
+#endif
 }
 
@@ -1196 +1297 @@
     HGLOBAL hNew=0;
 
+#ifdef __WIN32OS2__
+    HICON hIcon = ObjGetHandleData(Handle, USEROBJ_CURSORICON);
+    if(hIcon == -1) {
+        dprintf(("ERROR: Invalid cursor/icon!"));
+        return 0;
+    }
+
+#else
     if(Handle == 0)
     {
         return 0;
     }
+#endif
     /* Best Fit or Monochrome */
     if( (nFlags & LR_COPYFROMRESOURCE
@@ -1205 +1315 @@
         || nFlags & LR_MONOCHROME)
     {
+#ifdef __WIN32OS2__
+        ICONCACHE* pIconCache = CURSORICON_FindCache(hIcon);
+#else
         ICONCACHE* pIconCache = CURSORICON_FindCache(Handle);
+#endif
 
         /* Not Found in Cache, then do a straight copy
@@ -1236 +1350 @@
             BOOL bIsIcon = (nType == IMAGE_ICON);
 
+#ifdef __WIN32OS2__
+            iconinfo = (CURSORICONINFO *)GlobalLock( hIcon );
+#else
             iconinfo = (CURSORICONINFO *)GlobalLock( Handle );
+#endif
             if(iconinfo == NULL) {
                 dprintf(("ERROR: CURSORICON_ExtCopy invalid icon!"));