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

Timestamp:

Mar 27, 2000, 5:09:22 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/shell32/iconcache.cpp

@@ -1 @@
-/* $Id: iconcache.cpp,v 1.4 2000-03-26 16:34:41 cbratschi Exp $ */
+/* $Id: iconcache.cpp,v 1.5 2000-03-27 15:09:20 cbratschi Exp $ */
 
 /*
@@ -135 +135 @@
      size = ne_header.rname_tab_offset - ne_header.resource_tab_offset;
 
-//@@@PH no NE support
-#if 1
      if( size > sizeof(NE_TYPEINFO) )
      { pTypeInfo = (BYTE*)HeapAlloc( GetProcessHeap(), 0, size);
@@ -147 +145 @@
        }
      }
-#endif
 
      *retptr = pTypeInfo;
@@ -157 +154 @@
  *       SHELL_LoadResource
  */
-//@@@PH no NE support
-#if 1
 static BYTE * SHELL_LoadResource( HFILE hFile, NE_NAMEINFO* pNInfo, WORD sizeShift, ULONG *uSize)
 {  BYTE*  ptr;
@@ -173 +168 @@
    return 0;
 }
-#endif
 
 /*************************************************************************
@@ -256 +250 @@
  */
 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;
-}
-#else
 {  HGLOBAL  hRet = 0;
    LPBYTE      pData;
@@ -268 +255 @@
    DWORD    sig;
    HFILE    hFile = OpenFile( lpszExeFileName, &ofs, OF_READ );
-   UINT16      iconDirCount = 0,iconCount = 0;
+   UINT      iconDirCount = 0,iconCount = 0;
    LPBYTE      peimage;
    HANDLE      fmapping;
@@ -280 +267 @@
    sig = SHELL_GetResourceTable(hFile,&pData);
 
-//@@@PH no NE support
-#if 1
-/* ico file */
+   /* ico file */
    if( sig==IMAGE_OS2_SIGNATURE || sig==1 ) /* .ICO file */
    { BYTE      *pCIDir = 0;
@@ -318 +303 @@
        }
        else if( nIconIndex < iconDirCount )
-       { UINT16   i, icon;
+       { UINT   i, icon;
          if( n > iconDirCount - nIconIndex )
            n = iconDirCount - nIconIndex;
@@ -357 +342 @@
        HeapFree( GetProcessHeap(), 0, pData);
    }
-/* end ico file */
-#endif
-
-/* exe/dll */
+   /* end ico file */
+
+   /* exe/dll */
    if( sig == IMAGE_NT_SIGNATURE)
    { LPBYTE    idata,igdata;
@@ -514 +498 @@
    return hRet;
 }
-#endif
 
 /********************** THE ICON CACHE ********************************/
@@ -948 +931 @@
 
 /**********************************************************************
- *          GetResDirEntryW
- *
- *      Helper function - goes down one level of PE resource tree
+ *          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)
+                                           LPCWSTR name,DWORD root,
+                                           BOOL allowdefault)
 {
     int entrynum;
@@ -962 +945 @@
 
     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 +
+        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;
+        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 +
+        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;
+                        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;
     }
 }