Changeset 601 for trunk/src/user32/new/loadres.cpp

Timestamp:

Aug 20, 1999, 10:09:51 PM (26 years ago)

Author:

sandervl

Message:

Icon + Cursor resource changes

File:

• trunk/src/user32/new/loadres.cpp (modified) (12 diffs)

trunk/src/user32/new/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.6 1999-08-20 15:03:41 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.7 1999-08-20 20:09:50 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #include <winres.h>
 #include <heapstring.h>
+#include <oslibres.h>
 
 //******************************************************************************
@@ -72 +73 @@
 HICON WIN32API LoadIconA(HINSTANCE hinst, LPCSTR lpszIcon)
 {
- HICON rc;
-
-    rc = (HICON)FindResourceA(hinst, lpszIcon, RT_ICONA);
-    dprintf(("LoadIconA (%X) returned %d\n", hinst, rc));
-    return(rc);
+ Win32Resource *winres;
+ HICON          hIcon;
+
+    hIcon = OSLibWinQuerySysIcon((ULONG)lpszIcon);
+    if(hIcon == 0) {//not a system icon
+        winres = (Win32Resource *)FindResourceA(hinst, lpszIcon, RT_ICONA);
+        if(winres == 0) {
+                winres = (Win32Resource *)FindResourceA(hinst, lpszIcon, RT_GROUP_ICONA);
+        }
+        if(winres) {
+                hIcon = OSLibWinCreateIcon(winres->lockOS2Resource());
+                delete winres;
+        }
+    }
+    dprintf(("LoadIconA (%X) returned %x\n", hinst, hIcon));
+
+    return(hIcon);
 }
 //******************************************************************************
@@ -82 +95 @@
 HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
 {
- HICON rc;
-
-    rc = (HICON)FindResourceW(hinst, lpszIcon, RT_ICONW);
-    dprintf(("LoadIconW (%X) returned %d\n", hinst, rc));
-    return(rc);
+ Win32Resource *winres;
+ HICON          hIcon;
+
+    hIcon = OSLibWinQuerySysIcon((ULONG)lpszIcon);
+    if(hIcon == 0) {//not a system icon
+        winres = (Win32Resource *)FindResourceW(hinst, lpszIcon, RT_ICONW);
+        if(winres == 0) {
+                winres = (Win32Resource *)FindResourceW(hinst, lpszIcon, RT_GROUP_ICONW);
+        }
+        if(winres) {
+                hIcon = OSLibWinCreateIcon(winres->lockOS2Resource());
+                delete winres;
+        }
+    }
+    dprintf(("LoadIconW (%X) returned %x\n", hinst, hIcon));
+
+    return(hIcon);
 }
 //******************************************************************************
@@ -92 +117 @@
 HCURSOR WIN32API LoadCursorA(HINSTANCE hinst, LPCSTR lpszCursor)
 {
- HCURSOR rc;
-
-    if((int)lpszCursor >> 16 != 0) {//convert string name identifier to numeric id
-         dprintf(("LoadCursor %s\n", lpszCursor));
-         lpszCursor = (LPCSTR)ConvertNameId(hinst, (char *)lpszCursor);
-    }
-    else dprintf(("LoadCursor %d\n", (int)lpszCursor));
-
-    rc = O32_LoadCursor(hinst, lpszCursor);
-
-    dprintf(("LoadCursor from %X returned %d\n", hinst, rc));
-    return(rc);
+ Win32Resource *winres;
+ HCURSOR        hCursor;
+
+    hCursor = OSLibWinQuerySysPointer((ULONG)lpszCursor);
+    if(hCursor == 0) {//not a system pointer
+        winres = (Win32Resource *)FindResourceA(hinst, lpszCursor, RT_CURSORA);
+        if(winres == 0) {
+                winres = (Win32Resource *)FindResourceA(hinst, lpszCursor, RT_GROUP_CURSORA);
+        }
+        if(winres) {
+                hCursor = OSLibWinCreatePointer(winres->lockOS2Resource());
+                delete winres;
+        }
+    }
+    dprintf(("LoadCursorA (%X) returned %x\n", hinst, hCursor));
+
+    return(hCursor);
+}
+//******************************************************************************
+//******************************************************************************
+HCURSOR WIN32API LoadCursorW(HINSTANCE hinst, LPCWSTR lpszCursor)
+{
+ Win32Resource *winres;
+ HCURSOR        hCursor;
+
+    hCursor = OSLibWinQuerySysPointer((ULONG)lpszCursor);
+    if(hCursor == 0) {//not a system pointer
+        winres = (Win32Resource *)FindResourceW(hinst, lpszCursor, RT_CURSORW);
+        if(winres == 0) {
+                winres = (Win32Resource *)FindResourceW(hinst, lpszCursor, RT_GROUP_CURSORW);
+        }
+        if(winres) {
+                hCursor = OSLibWinCreatePointer(winres->lockOS2Resource());
+                delete winres;
+        }
+    }
+    dprintf(("LoadCursorW (%X) returned %x\n", hinst, hCursor));
+
+    return(hCursor);
 }
 //******************************************************************************
@@ -111 +163 @@
  HBITMAP rc;
 
-  if((int)lpszBitmap >> 16 != 0) 
-  {  //convert string name identifier to numeric id
-    dprintf(("lpszBitmap [%s]\n",
-             lpszBitmap));
+  if(HIWORD(lpszBitmap) != 0) 
+  {     //convert string name identifier to numeric id
+        dprintf(("lpszBitmap [%s]\n", lpszBitmap));
     
-    lpszBitmap = (LPCSTR)ConvertNameId(hinst, 
-                                       (char *)lpszBitmap);
+        lpszBitmap = (LPCSTR)ConvertNameId(hinst, (char *)lpszBitmap);
   }
-  else 
-    dprintf(("lpszBitmap %08xh\n",
-             (int)lpszBitmap));
+  else  dprintf(("lpszBitmap %08xh\n", (int)lpszBitmap));
 
   rc = O32_LoadBitmap(hinst, lpszBitmap);
 
-  dprintf(("LoadBitmapA returned %08xh\n",
-           rc));
+  dprintf(("LoadBitmapA returned %08xh\n", rc));
   
   return(rc);
@@ -137 +184 @@
  HBITMAP rc;
 
-    if((int)lpszBitmap >> 16 != 0) {//convert string name identifier to numeric id
+    if(HIWORD(lpszBitmap) != 0) {//convert string name identifier to numeric id
          astring = UnicodeToAsciiString((LPWSTR)lpszBitmap);
          dprintf(("lpszBitmap %s\n", astring));
@@ -153 +200 @@
 }
 //******************************************************************************
-//******************************************************************************
-HCURSOR WIN32API LoadCursorW(HINSTANCE hinst, LPCWSTR lpszCursor)
-{
- char   *astring = NULL;
- HCURSOR rc;
-
-    if((int)lpszCursor >> 16 != 0) {//convert string name identifier to numeric id
-         astring = UnicodeToAsciiString((LPWSTR)lpszCursor);
-         dprintf(("lpszCursor %s\n", astring));
-         lpszCursor = (LPWSTR)ConvertNameId(hinst, (char *)astring);
-    }
-    else dprintf(("lpszCursor %d\n", (int)lpszCursor));
-
-    rc = O32_LoadCursor(hinst, (char *)lpszCursor);
-    if(astring)
-        FreeAsciiString(astring);
-
-    dprintf(("LoadCursorW returned %d\n", rc));
-    return(rc);
-}
-//******************************************************************************
 //TODO: Far from complete, but works for loading resources from exe
 //fuLoad flag ignored
@@ -182 +208 @@
  HANDLE hRet = 0;
 
-  dprintf(("OS2LoadImageA NOT COMPLETE (%d,%d)\n", cxDesired, cyDesired));
+  dprintf(("LoadImageA NOT COMPLETE (%d,%d)\n", cxDesired, cyDesired));
 
   switch(uType) {
@@ -194 +220 @@
                 hRet = (HANDLE)LoadIconA(hinst, lpszName);
                 break;
+        default:
+                dprintf(("LoadImageA: unsupported type %d!!", uType));
+                return 0;
   }
-  dprintf(("OS2LoadImageA returned %d\n", (int)hRet));
+  dprintf(("LoadImageA returned %d\n", (int)hRet));
 
   return(hRet);
@@ -206 +235 @@
  HANDLE hRet = 0;
 
-  dprintf(("OS2LoadImageW NOT COMPLETE (%d,%d)\n", cxDesired, cyDesired));
+  dprintf(("LoadImageW NOT COMPLETE (%d,%d)\n", cxDesired, cyDesired));
 
   switch(uType) {
@@ -218 +247 @@
                 hRet = (HANDLE)LoadIconW(hinst, lpszName);
                 break;
+        default:
+                dprintf(("LoadImageW: unsupported type %d!!", uType));
+                return 0;
   }
-  dprintf(("OS2LoadImageW returned %d\n", (int)hRet));
+  dprintf(("LoadImageW returned %d\n", (int)hRet));
 
   return(hRet);