Changeset 9851 for trunk/src

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

Location:

trunk/src

Files:

• shell32/shelllink.c (modified) (9 diffs)
• user32/USER32.DEF (modified) (2 diffs)
• user32/icon.cpp (modified) (2 diffs)
• user32/oslibres.cpp (modified) (5 diffs)
• user32/user32dbg.def (modified) (2 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",

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.76 2003-02-16 15:31:08 sandervl Exp $
+; $Id: USER32.DEF,v 1.77 2003-02-24 17:02:42 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -718 +718 @@
     _OSLibWinCreateObject@32                                     @2031 NONAME
     _ConvertIconGroup@12                                         @2032 NONAME
+    _ConvertIconGroupIndirect@12                                 @2037 NONAME
 
     _WinSetVisibleRgnNotifyProc@12                               @2033 NONAME

trunk/src/user32/icon.cpp

@@ -1 @@
-/* $Id: icon.cpp,v 1.14 2002-01-07 11:17:52 sandervl Exp $ */
+/* $Id: icon.cpp,v 1.15 2003-02-24 17:02:43 sandervl Exp $ */
 
 /*
@@ -371 +371 @@
 //******************************************************************************
 //******************************************************************************
+void *WIN32API ConvertIconGroupIndirect(void *lpIconData, DWORD iconsize,
+                                        DWORD *ressize)
+{
+ ICONDIR *ihdr = (ICONDIR *)lpIconData;
+ ICONDIRENTRY *rdir = (ICONDIRENTRY *)(ihdr + 1);
+ int i, groupsize = 0, os2iconsize;
+ BITMAPARRAYFILEHEADER2 *bafh, *orgbafh;
+ WINBITMAPINFOHEADER    *iconhdr;
+ void                   *os2icon;
+ int                     nricons = 0;
+ void                   *winicon;
+
+  dprintf(("Icon Group type :%d", ihdr->idType));
+  dprintf(("Icon Group count:%d", ihdr->idCount));
+  for(i=0;i<ihdr->idCount;i++) {
+        dprintf2(("Icon    : %x", rdir->dwImageOffset));
+        dprintf2(("Width   : %d", (int)rdir->bWidth));
+        dprintf2(("Height  : %d", (int)rdir->bHeight));
+        dprintf2(("Colors  : %d", (int)rdir->bColorCount));
+        dprintf2(("Bits    : %d", rdir->wBitCount));
+        dprintf2(("ResBytes: %d", rdir->dwBytesInRes));
+
+        winicon = (char *)lpIconData + rdir->dwImageOffset;
+        groupsize += QueryConvertedIconSize((WINBITMAPINFOHEADER *)winicon,
+                                            rdir->dwBytesInRes);
+        //add centered icon if size is 32x32
+        if(rdir->bWidth == 32 && rdir->bHeight == 32 && rdir->wBitCount >= 4) 
+        {
+            groupsize += QueryConvertedIconSize((WINBITMAPINFOHEADER *)winicon,
+                                                rdir->dwBytesInRes, TRUE);
+            //extra pixels
+            groupsize += (40*8 + 8*32)*rdir->wBitCount/8;
+            nricons++;
+        }
+        nricons++;
+        rdir++;
+  }
+  groupsize = groupsize+nricons*(sizeof(BITMAPARRAYFILEHEADER2) - sizeof(BITMAPFILEHEADER2));
+  bafh    = (BITMAPARRAYFILEHEADER2 *)malloc(groupsize);
+  memset(bafh, 0, groupsize);
+  orgbafh = bafh;
+
+  rdir = (ICONDIRENTRY *)(ihdr + 1);
+  for(i=0;i<ihdr->idCount;i++) {
+        bafh->usType    = BFT_BITMAPARRAY;
+        bafh->cbSize    = sizeof(BITMAPARRAYFILEHEADER2);
+        bafh->cxDisplay = 0;
+        bafh->cyDisplay = 0;
+
+        winicon = (char *)lpIconData + rdir->dwImageOffset;
+        iconhdr = (WINBITMAPINFOHEADER *)winicon;
+
+        os2icon = ConvertIcon(iconhdr, rdir->dwBytesInRes, &os2iconsize, (ULONG)bafh - (ULONG)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
+        if(os2icon == NULL) {
+                dprintf(("Can't convert icon!"));
+                rdir++;
+                continue;
+        }
+
+        if(rdir->bWidth == 32 && rdir->bHeight == 32 && rdir->wBitCount >= 4) 
+        {
+                //add 40x40 icon by centering 32x32 icon in 40x40 grid
+                //(resize is really ugly)
+                bafh->offNext = (ULONG)&bafh->bfh2 - (ULONG)orgbafh + os2iconsize;
+                memcpy((char *)&bafh->bfh2, os2icon, os2iconsize);
+                free(os2icon);
+
+                bafh = (BITMAPARRAYFILEHEADER2 *)((ULONG)&bafh->bfh2 + os2iconsize);
+
+                os2icon = ConvertIcon(iconhdr, rdir->dwBytesInRes, &os2iconsize, (ULONG)bafh - (ULONG)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2), TRUE);
+                if(os2icon == NULL) {
+                        dprintf(("Can't convert icon!"));
+                        rdir++;
+                        continue;
+                }
+        }
+
+        if(i != ihdr->idCount -1) {
+                bafh->offNext = (ULONG)&bafh->bfh2 - (ULONG)orgbafh + os2iconsize;
+        }
+        else    bafh->offNext = 0;
+
+        memcpy((char *)&bafh->bfh2, os2icon, os2iconsize);
+        free(os2icon);
+
+        bafh = (BITMAPARRAYFILEHEADER2 *)((ULONG)&bafh->bfh2 + os2iconsize);
+
+        rdir++;
+  }
+  *ressize = groupsize;
+  return (void *)orgbafh;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.34 2003-01-05 16:34:58 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.35 2003-02-24 17:02:43 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -749 +749 @@
    char    szWorkDir[256];
    char    szPEGUILoaderPath[256];
+   BOOL    fWin32App;
 
    if(pszName) {
@@ -784 +785 @@
                                   ((pszWorkDir) ? strlen(pszWorkDir) : 0));
 
-   sprintf(pszSetupString, "PROGTYPE=PM;OBJECTID=<%s>;EXENAME=%s;SET BEGINLIBPATH=%s;STARTUPDIR=%s;ICONFILE=%s;PARAMETERS=\"%s\"", pszName, szPEGUILoaderPath, szSystemDir, szWorkDir, pszIcoPath, pszPath);
+   fWin32App = ODIN_IsWin32App(pszPath);
+   if(!fWin32App) 
+   {//don't use the PE loader; use the program path directly
+        sprintf(pszSetupString, "PROGTYPE=PM;OBJECTID=<%s%s>;EXENAME=%s;SET BEGINLIBPATH=%s;STARTUPDIR=%s;ICONFILE=%s;PARAMETERS=", (fDesktop) ? "DESKTOP_" : "", pszName, pszPath, szSystemDir, szWorkDir, pszIcoPath);
+   }
+   else sprintf(pszSetupString, "PROGTYPE=PM;OBJECTID=<%s%s>;EXENAME=%s;SET BEGINLIBPATH=%s;STARTUPDIR=%s;ICONFILE=%s;PARAMETERS=\"%s\"", (fDesktop) ? "DESKTOP_" : "", pszName, szPEGUILoaderPath, szSystemDir, szWorkDir, pszIcoPath, pszPath);
+
    if(pszArgs && *pszArgs) {
        strcat(pszSetupString, " ");
@@ -794 +801 @@
        dprintf(("Name = %s", pszName));
        dprintf(("Setup string = %s", pszSetupString));
+
+       //Use a different name for desktop objects
        hObject = WinCreateObject("WPProgram", pszName, pszSetupString,
                                  "<WP_DESKTOP>", CO_REPLACEIFEXISTS);
@@ -805 +814 @@
        hObject = WinCreateObject("WPFolder", pszFolder, szWorkDir,
                                  "<ODINFOLDER>", CO_UPDATEIFEXISTS);
-       hObject = WinCreateObject("WPProgram", pszName, pszSetupString,
-                                 temp, CO_REPLACEIFEXISTS);
+       if(hObject) {
+           hObject = WinCreateObject("WPProgram", pszName, pszSetupString,
+                                     temp, CO_REPLACEIFEXISTS);
+       }
+       else {
+           hObject = 1; //force silent failure
+       }
    }
 

trunk/src/user32/user32dbg.def

@@ -1 @@
-; $Id: user32dbg.def,v 1.9 2003-02-16 15:31:11 sandervl Exp $
+; $Id: user32dbg.def,v 1.10 2003-02-24 17:02:43 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -717 +717 @@
     _OSLibWinCreateObject@32                                     @2031 NONAME
     _ConvertIconGroup@12                                         @2032 NONAME
+    _ConvertIconGroupIndirect@12                                 @2037 NONAME
 
     _WinSetVisibleRgnNotifyProc@12                               @2033 NONAME