Changeset 6486 for trunk/src

Timestamp:

Aug 8, 2001, 12:06:14 PM (24 years ago)

Author:

sandervl

Message:

update for single icon link

File:

• trunk/src/shell32/shelllink.c (modified) (3 diffs)

trunk/src/shell32/shelllink.c

@@ -251 +251 @@
 
 #ifdef __WIN32OS2__
-static BOOL SaveIconResAsOS2ICO(GRPICONDIR *pIconDir, HINSTANCE hInstance, const char *szXPMFileName)
+static BOOL SaveIconResAsOS2ICO(GRPICONDIR *pIconDir, HINSTANCE hInstance, 
+                                const char *szXPMFileName)
 {
     FILE *fXPMFile;
@@ -391 +392 @@
     {
         hResInfo = FindResourceA(hModule, MAKEINTRESOURCEA(nIndex), RT_GROUP_ICONA);
+#ifdef __WIN32OS2__
+        if(!hResInfo) {
+            hResInfo = FindResourceA(hModule, MAKEINTRESOURCEA(nIndex), RT_ICONA);        
+            if(hResInfo) {
+                GRPICONDIR icondir = {0};
+
+                icondir.idReserved = 0;
+                icondir.idType     = 1;
+                icondir.idCount    = 1;
+                icondir.idEntries[0].nID = nIndex;
+
+                if(!SaveIconResAsOS2ICO(&icondir, hModule, szXPMFileName))
+                {
+                    TRACE("Failed saving icon as XPM, error %ld\n", GetLastError());
+                    goto error3;
+                }
+                goto done;
+            }
+        }
+#endif
         TRACE("FindResourceA (%s) called, return 0x%x, error %ld\n", szFileName, hResInfo, GetLastError());
     }
@@ -455 +476 @@
     }
 #endif
+
+done:
     FreeResource(hResData);
     FreeLibrary(hModule);