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

Timestamp:

Mar 8, 2002, 12:01:03 PM (23 years ago)

Author:

sandervl

Message:

PH: Wine resync + OS2 integration

File:

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

trunk/src/shell32/shelllink.c

@@ -118 +118 @@
 #include "poppack.h"
 
+typedef struct
+{
+        HRSRC *pResInfo;
+        int   nIndex;
+} ENUMRESSTRUCT;
 
 static ICOM_VTABLE(IShellLinkA)         slvt;
@@ -162 +167 @@
 #define _ICOM_THIS_From_IPersistStream(class, name) class* This = (class*)(((char*)name)-_IPersistStream_Offset);
 #define _IPersistStream_From_ICOM_THIS(class, name) class* StreamThis = (class*)(((char*)name)+_IPersistStream_Offset);
+
+
+/* strdup on the process heap */
+inline static LPSTR heap_strdup( LPCSTR str )
+{
+    INT len = strlen(str) + 1;
+    LPSTR p = HeapAlloc( GetProcessHeap(), 0, len );
+    if (p) memcpy( p, str, len );
+    return p;
+}
+
 
 /**************************************************************************
@@ -364 +380 @@
 static BOOL CALLBACK EnumResNameProc(HANDLE hModule, const char *lpszType, char *lpszName, LONG lParam)
 {
-    *(HRSRC *) lParam = FindResourceA(hModule, lpszName, RT_GROUP_ICONA);
-    return FALSE;
-}
+        ENUMRESSTRUCT *sEnumRes = (ENUMRESSTRUCT *) lParam;
+    
+        if (!sEnumRes->nIndex--)
+        {
+                *sEnumRes->pResInfo = FindResourceA(hModule, lpszName, RT_GROUP_ICONA);
+                return FALSE;
+        }
+        else
+                return TRUE;
+}
+
 
 static int ExtractFromEXEDLL(const char *szFileName, int nIndex, const char *szXPMFileName)
@@ -448 +472 @@
 #else
     for (i = 0; i < pIconDir->idCount; i++)
-        if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) > nMax)
+        if ((pIconDir->idEntries[i].wBitCount >= nMaxBits) && (pIconDir->idEntries[i].wBitCount <= 8))
         {
-            lpName = MAKEINTRESOURCEA(pIconDir->idEntries[i].nID);
-            nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
+          if (pIconDir->idEntries[i].wBitCount > nMaxBits)
+          {
+              nMaxBits = pIconDir->idEntries[i].wBitCount;
+              nMax = 0;
+          }
+          if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) > nMax)
+          {
+              lpName = MAKEINTRESOURCEA(pIconDir->idEntries[i].nID);
+              nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
+          }
         }
 
@@ -480 +512 @@
 
 done:
+
     FreeResource(hResData);
     FreeLibrary(hModule);
@@ -565 +598 @@
 
     if (!wine_get_unix_file_name( dos, buffer, sizeof(buffer) )) return NULL;
-    return HEAP_strdupA( GetProcessHeap(), 0, buffer );
+    return heap_strdup( buffer );
 }
 
@@ -594 +627 @@
 static char *extract_icon( const char *path, int index)
 {
-    char *filename = HEAP_strdupA( GetProcessHeap(), 0, tmpnam(NULL) );
+    char *filename = heap_strdup( tmpnam(NULL) );
     if (ExtractFromEXEDLL( path, index, filename )) return filename;
     if (ExtractFromICO( path, filename )) return filename;
@@ -602 +635 @@
 }
 #endif
+
 
 static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember)
@@ -709 +743 @@
     }
     if (!*buffer) return NOERROR;
-    shell_link_app = HEAP_strdupA( GetProcessHeap(), 0, buffer );
+    shell_link_app = heap_strdup( buffer );
 
     if (!WideCharToMultiByte( CP_ACP, 0, pszFileName, -1, buffer, sizeof(buffer), NULL, NULL))
         return ERROR_UNKNOWN;
     GetFullPathNameA( buffer, sizeof(buff2), buff2, NULL );
-    filename = HEAP_strdupA( GetProcessHeap(), 0, buff2 );
+    filename = heap_strdup( buff2 );
 
     if (SHGetSpecialFolderPathA( 0, buffer, CSIDL_STARTUP, FALSE ))
@@ -962 +996 @@
 
                     SHGetPathFromIDListA(&lpLinkHeader->Pidl, sTemp);
-                    This->sPath = HEAP_strdupA ( GetProcessHeap(), 0, sTemp);
+                    This->sPath = heap_strdup( sTemp );
                   }
                   This->wHotKey = lpLinkHeader->wHotKey;
@@ -1126 +1160 @@
             HeapFree(GetProcessHeap(), 0, This->sArgs);
 
-
           if (This->sWorkDir)
             HeapFree(GetProcessHeap(), 0, This->sWorkDir);
@@ -1199 +1232 @@
         if (This->sDescription)
             HeapFree(GetProcessHeap(), 0, This->sDescription);
-        if (!(This->sDescription = HEAP_strdupA(GetProcessHeap(), 0, pszName)))
+        if (!(This->sDescription = heap_strdup(pszName)))
             return E_OUTOFMEMORY;
 
@@ -1222 +1255 @@
         if (This->sWorkDir)
             HeapFree(GetProcessHeap(), 0, This->sWorkDir);
-        if (!(This->sWorkDir = HEAP_strdupA(GetProcessHeap(), 0, pszDir)))
+        if (!(This->sWorkDir = heap_strdup(pszDir)))
             return E_OUTOFMEMORY;
 
@@ -1245 +1278 @@
         if (This->sArgs)
             HeapFree(GetProcessHeap(), 0, This->sArgs);
-        if (!(This->sArgs = HEAP_strdupA(GetProcessHeap(), 0, pszArgs)))
+        if (!(This->sArgs = heap_strdup(pszArgs)))
             return E_OUTOFMEMORY;
 
@@ -1304 +1337 @@
         if (This->sIcoPath)
             HeapFree(GetProcessHeap(), 0, This->sIcoPath);
-        if (!(This->sIcoPath = HEAP_strdupA(GetProcessHeap(), 0, pszIconPath)))
+        if (!(This->sIcoPath = heap_strdup(pszIconPath)))
             return E_OUTOFMEMORY;       
         This->iIcoNdx = iIcon;
@@ -1332 +1365 @@
         if (This->sPath)
             HeapFree(GetProcessHeap(), 0, This->sPath);
-        if (!(This->sPath = HEAP_strdupA(GetProcessHeap(), 0, pszFile)))
+        if (!(This->sPath = heap_strdup(pszFile)))
             return E_OUTOFMEMORY;