Changeset 3243 for trunk/src/shell32/iconcache.cpp

Timestamp:

Mar 26, 2000, 6:34:57 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000324

File:

• trunk/src/shell32/iconcache.cpp (modified) (18 diffs)

trunk/src/shell32/iconcache.cpp

@@ -1 @@
-/* $Id: iconcache.cpp,v 1.3 1999-10-22 13:35:21 phaller Exp $ */
+/* $Id: iconcache.cpp,v 1.4 2000-03-26 16:34:41 cbratschi Exp $ */
 
 /*
@@ -9 +9 @@
  * shell icon cache (SIC)
  *
+ * Corel WINE 20000324 level
  */
 
@@ -27 +28 @@
 #include "winuser.h"
 #include "wingdi.h"
-//#include "wine/winuser16.h"
-//#include "wine/winbase16.h"
 //#include "neexe.h"
 #include "cursoricon.h"
@@ -137 +136 @@
 
 //@@@PH no NE support
-#if 0
+#if 1
      if( size > sizeof(NE_TYPEINFO) )
      { pTypeInfo = (BYTE*)HeapAlloc( GetProcessHeap(), 0, size);
@@ -159 +158 @@
  */
 //@@@PH no NE support
-#if 0
+#if 1
 static BYTE * SHELL_LoadResource( HFILE hFile, NE_NAMEINFO* pNInfo, WORD sizeShift, ULONG *uSize)
 {  BYTE*  ptr;
@@ -166 +165 @@
 
    *uSize = (DWORD)pNInfo->length << sizeShift;
-   if( (ptr = (BYTE*)HeapAlloc(GetProcessHeap(),0, *uSize) ))
+   ptr = (BYTE*)HeapAlloc(GetProcessHeap(),0, *uSize);
+   if(ptr)
    { _llseek( hFile, (DWORD)pNInfo->offset << sizeShift, SEEK_SET);
      _lread( hFile, (char*)ptr, pNInfo->length << sizeShift);
@@ -184 +184 @@
 
    *uSize = lpiIDE->dwBytesInRes;
-   if( (ptr = (BYTE*)HeapAlloc(GetProcessHeap(),0, *uSize)) )
+   ptr = (BYTE*)HeapAlloc(GetProcessHeap(),0, *uSize);
+   if(ptr)
    { _llseek( hFile, lpiIDE->dwImageOffset, SEEK_SET);
      _lread( hFile, (char*)ptr, lpiIDE->dwBytesInRes);
@@ -222 +223 @@
    { CURSORICONDIR * lpID;                     /* icon resource in resource format */
      *uSize = lpcid.idCount * sizeof(CURSORICONDIRENTRY) + HEADER_SIZE;
-     if( (lpID = (CURSORICONDIR*)HeapAlloc(GetProcessHeap(),0, *uSize) ))
+     lpID = (CURSORICONDIR*)HeapAlloc(GetProcessHeap(),0, *uSize);
+     if(lpID)
      {
        /* copy the header */
@@ -253 +255 @@
  *
  */
-#define ICO_INVALID_FILE                 1
-#define ICO_NO_ICONS                        0
-
 HGLOBAL WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON * RetPtr, UINT nIconIndex, UINT n, UINT cxDesired, UINT cyDesired )
+// @@@PH turned off
+#if 0
 {
   dprintf (("SHELL32: ICO_ExtractIconEx not implemented.\n"));
   return 0;
 }
-
-// @@@PH turned off
-#if 0
-{  HGLOBAL  hRet = ICO_NO_ICONS;
+#else
+{  HGLOBAL  hRet = 0;
    LPBYTE      pData;
    OFSTRUCT ofs;
@@ -277 +276 @@
 
    if( hFile == HFILE_ERROR || !n )
-     return ICO_INVALID_FILE;
+     return hRet;
 
    sig = SHELL_GetResourceTable(hFile,&pData);
 
 //@@@PH no NE support
-#if 0
+#if 1
 /* ico file */
    if( sig==IMAGE_OS2_SIGNATURE || sig==1 ) /* .ICO file */
@@ -374 +373 @@
      if ( !(fmapping = CreateFileMappingA(hFile,NULL,PAGE_READONLY|SEC_COMMIT,0,0,NULL)))
      { WARN("failed to create filemap.\n"); /* FIXME, INVALID_HANDLE_VALUE? */
-       hRet = ICO_INVALID_FILE;
        goto end_2;                          /* failure */
      }
@@ -380 +378 @@
      if ( !(peimage = (BYTE*)MapViewOfFile(fmapping,FILE_MAP_READ,0,0,0)))
      { WARN("failed to mmap filemap.\n");
-       hRet = ICO_INVALID_FILE;
        goto end_2;                          /* failure */
      }
@@ -401 +398 @@
      if (!rootresdir)
      { WARN("haven't found section for resource directory.\n");
-       goto end_4;                          /* failure */
+       goto end_3;                          /* failure */
      }
   /* search the group icon dir*/
      if (!(icongroupresdir = GetResDirEntryW(rootresdir,RT_GROUP_ICONW, (DWORD)rootresdir,FALSE)))
      { WARN("No Icongroupresourcedirectory!\n");
-       goto end_4;                          /* failure */
+       goto end_3;                          /* failure */
      }
      iconDirCount = icongroupresdir->NumberOfNamedEntries+icongroupresdir->NumberOfIdEntries;
@@ -416 +413 @@
      }
 
+      /* if nIconIndex is negative we have to extract the icon whose resource
+         id is equal to the absolute value of nIconIndex */
+      if( nIconIndex < 0 )
+      {
+          int n = 0;
+          int iId = abs(nIconIndex);
+          PIMAGE_RESOURCE_DIRECTORY_ENTRY xprdeTmp = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(icongroupresdir+1);
+          nIconIndex = iconDirCount + 1; /* Initialise to get an error at
+                                            the condition nIconIndex >= iconDirCount
+                                            below if nothing is found */
+          while(i<iconDirCount && xprdeTmp)
+          {
+              if(xprdeTmp->u1.Id ==  iId)
+              {
+                  nIconIndex = n;
+                  break;
+              }
+              n++;
+              xprdeTmp++;
+          }
+      }
+
      if (nIconIndex >= iconDirCount)
      { WARN("nIconIndex %d is larger than iconDirCount %d\n",nIconIndex,iconDirCount);
-       goto end_4;                          /* failure */
+       goto end_3;                          /* failure */
      }
 
@@ -452 +471 @@
        if (!igdata)
        { WARN("no matching real address for icongroup!\n");
-         goto end_4;                     /* failure */
+         goto end_3;                     /* failure */
        }
        RetPtr[i] = (HICON)pLookupIconIdFromDirectoryEx(igdata, TRUE, cxDesired, cyDesired, LR_DEFAULTCOLOR);
@@ -459 +478 @@
      if (!(iconresdir=GetResDirEntryW(rootresdir,RT_ICONW,(DWORD)rootresdir,FALSE)))
      { WARN("No Iconresourcedirectory!\n");
-       goto end_4;                          /* failure */
+       goto end_3;                          /* failure */
      }
 
@@ -487 +506 @@
      goto end_3;                         /* sucess */
    }
-   hRet = ICO_INVALID_FILE;
    goto end_1;    /* unknown filetype */
 
 /* cleaning up (try & catch would be nicer:-) ) */
-end_4:   hRet = 0;                       /* failure */
 end_3:   UnmapViewOfFile(peimage);       /* success */
 end_2:   CloseHandle(fmapping);
@@ -915 +932 @@
    return ret;
 }
+
+/*
+ * PE (Portable Execute) File Resources
+ *
+ * Copyright 1995 Thomas Sandford
+ * Copyright 1996 Martin von Loewis
+ *
+ * Based on the Win16 resource handling code in loader/resource.c
+ * Copyright 1993 Robert J. Amstadt
+ * Copyright 1995 Alexandre Julliard
+ * Copyright 1997 Marcus Meissner
+ */
+
+//CB: from loader/pe_resource.c
+
+/**********************************************************************
+ *          GetResDirEntryW
+ *
+ *      Helper function - goes down one level of PE resource tree
+ *
+ */
+PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY resdirptr,
+                                           LPCWSTR name,DWORD root,
+                                           BOOL allowdefault)
+{
+    int entrynum;
+    PIMAGE_RESOURCE_DIRECTORY_ENTRY entryTable;
+    int namelen;
+
+    if (HIWORD(name)) {
+        if (name[0]=='#') {
+                char    buf[10];
+
+                lstrcpynWtoA(buf,name+1,10);
+                return GetResDirEntryW(resdirptr,(LPCWSTR)atoi(buf),root,allowdefault);
+        }
+        entryTable = (PIMAGE_RESOURCE_DIRECTORY_ENTRY) (
+                        (BYTE *) resdirptr +
+                        sizeof(IMAGE_RESOURCE_DIRECTORY));
+        namelen = lstrlenW(name);
+        for (entrynum = 0; entrynum < resdirptr->NumberOfNamedEntries; entrynum++)
+        {
+                PIMAGE_RESOURCE_DIR_STRING_U str =
+                (PIMAGE_RESOURCE_DIR_STRING_U) (root +
+                        entryTable[entrynum].u1.s.NameOffset);
+                if(namelen != str->Length)
+                        continue;
+                if(lstrncmpiW(name,str->NameString,str->Length)==0)
+                        return (PIMAGE_RESOURCE_DIRECTORY) (
+                                root +
+                                entryTable[entrynum].u2.s.OffsetToDirectory);
+        }
+        return NULL;
+    } else {
+        entryTable = (PIMAGE_RESOURCE_DIRECTORY_ENTRY) (
+                        (BYTE *) resdirptr +
+                        sizeof(IMAGE_RESOURCE_DIRECTORY) +
+                        resdirptr->NumberOfNamedEntries * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
+        for (entrynum = 0; entrynum < resdirptr->NumberOfIdEntries; entrynum++)
+            if ((DWORD)entryTable[entrynum].u1.Name == (DWORD)name)
+                return (PIMAGE_RESOURCE_DIRECTORY) (
+                        root +
+                        entryTable[entrynum].u2.s.OffsetToDirectory);
+        /* just use first entry if no default can be found */
+        if (allowdefault && !name && resdirptr->NumberOfIdEntries)
+                return (PIMAGE_RESOURCE_DIRECTORY) (
+                        root +
+                        entryTable[0].u2.s.OffsetToDirectory);
+        return NULL;
+    }
+}
+