Changeset 9851 for trunk/src/shell32/shelllink.c

Timestamp:

Feb 24, 2003, 6:03:00 PM (23 years ago)

Author:

sandervl

Message:

Convert win32 icon file to os2 format when creating a shell link

File:

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

trunk/src/shell32/shelllink.c

@@ -263 +263 @@
 
 #ifdef __WIN32OS2__
+static BOOL SaveIconFileAsOS2ICO(char *szFileName, char *szXPMFileName)
+{
+    FILE *fXPMFile = NULL, *fICOFile = NULL;
+    void *lpOS2Icon = NULL, *lpWinIcon = NULL;
+    DWORD ressize, filesize;
+    BOOL  ret = FALSE;
+
+    if (!(fICOFile = fopen(szFileName, "r")))
+        goto failure;
+    fseek(fICOFile, 0, SEEK_END);
+    filesize = ftell(fICOFile);
+    fseek(fICOFile, 0, SEEK_SET);
+
+    lpWinIcon = malloc(filesize);
+    if(lpWinIcon == NULL) goto failure;
+    if (fread(lpWinIcon, filesize, 1, fICOFile) != 1) 
+        goto failure;
+
+    if (!(fXPMFile = fopen(szXPMFileName, "wb")))
+        goto failure;
+
+    lpOS2Icon = ConvertIconGroupIndirect(lpWinIcon, filesize, &ressize);
+    if(lpOS2Icon) {
+        fwrite(lpOS2Icon, 1, ressize, fXPMFile);
+    }
+    ret = TRUE;
+
+failure:
+    if(fICOFile) fclose(fICOFile);
+    if(fXPMFile) fclose(fXPMFile);
+    if(lpWinIcon) free(lpWinIcon);
+    if(lpOS2Icon) free(lpOS2Icon);
+    return ret;
+}
+
 static BOOL SaveIconResAsOS2ICO(GRPICONDIR *pIconDir, HINSTANCE hInstance, 
                                 const char *szXPMFileName)
@@ -533 +568 @@
 static int ExtractFromICO(const char *szFileName, const char *szXPMFileName)
 {
+#ifdef __WIN32OS2__
+    if(!SaveIconFileAsOS2ICO(szFileName, szXPMFileName))
+    {
+        TRACE("Failed saving icon as XPM, error %ld\n", GetLastError());
+        return 0;
+    }
+    return 1;
+#else
     FILE *fICOFile;
     ICONDIR iconDir;
@@ -540 +583 @@
     void *pIcon;
     int i;
-#ifdef __WIN32OS2__
-    int size;
-#endif
 
     if (!(fICOFile = fopen(szFileName, "r")))
         goto error1;
-
-#ifdef __WIN32OS2__
-     //TODO:
-    dprintf(("TODO: Icon file conversion not yet supported!!"));
-    goto error2;
-#else
 
     if (fread(&iconDir, sizeof (ICONDIR), 1, fICOFile) != 1)
@@ -579 +613 @@
         goto error4;
 
-#endif
     free(pIcon);
     free(pIconDirEntry);
@@ -594 +627 @@
  error1:
     return 0;
+#endif
 }
 
@@ -655 +689 @@
     HKEY hkey;
 #ifdef __WIN32OS2__
-    char *tmp;
+    char *tmp, szAppName[MAX_PATH];
 #endif
 
@@ -664 +698 @@
     if (!pszFileName || !This->sPath)
         return ERROR_UNKNOWN;
-
-    /* check for .exe extension */
-    if (!(p = strrchr( This->sPath, '.' ))) return NOERROR;
-    if (strchr( p, '\\' ) || strchr( p, '/' )) return NOERROR;
-    if (strcasecmp( p, ".exe" )) return NOERROR;
 
     /* check if ShellLinker configured */
@@ -723 +752 @@
                        icon_name, This->iIcoNdx)) goto done;
 
-    if(OSLibWinCreateObject(This->sPath, This->sArgs, This->sWorkDir, filename,
+    if(SearchPathA( NULL, This->sPath, ".exe", sizeof(szAppName), szAppName, NULL) == NULL) 
+    {
+        ret = E_INVALIDARG;
+        goto done;
+    }
+
+    if(OSLibWinCreateObject(szAppName, This->sArgs, This->sWorkDir, filename,
                             This->sDescription, icon_name,
                             This->iIcoNdx, bDesktop) == FALSE) 
@@ -739 +774 @@
 
 #else
+
+    /* check for .exe extension */
+    if (!(p = strrchr( This->sPath, '.' ))) return NOERROR;
+    if (strchr( p, '\\' ) || strchr( p, '/' )) return NOERROR;
+    if (strcasecmp( p, ".exe" )) return NOERROR;
+
     buffer[0] = 0;
     if (!RegOpenKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine",