Add PhExtractIcon

Author: dmex

ProcessHacker/hidnproc.c

@@ -665,12 +665,10 @@ static PPH_PROCESS_ITEM PhpCreateProcessItemForHiddenProcess(
     if (processItem->FileName)
     {
         // Small icon, large icon.
-        ExtractIconEx(
+        PhExtractIcon(
             processItem->FileName->Buffer,
-            0,
             &processItem->LargeIcon,
-            &processItem->SmallIcon,
-            1
+            &processItem->SmallIcon
             );
 
         // Version info.

ProcessHacker/procprv.c

@@ -956,14 +956,11 @@ VOID PhpProcessQueryStage1(
 
     if (processItem->FileName)
     {
-        // Small icon, large icon.
-        if (ExtractIconEx(
+        if (!PhExtractIcon(
             processItem->FileName->Buffer,
-            0,
             &Data->LargeIcon,
-            &Data->SmallIcon,
-            1
-            ) == 0)
+            &Data->SmallIcon
+            ))
         {
             Data->LargeIcon = NULL;
             Data->SmallIcon = NULL;

phlib/guisup.c

@@ -689,16 +689,14 @@ VOID PhGetStockApplicationIcon(
             if (systemDirectory = PhGetSystemDirectory())
             {
                 PH_STRINGREF dllBaseName;
-                ULONG index;
 
                 PhInitializeStringRef(&dllBaseName, L"\\user32.dll");
-                index = 0;
-
                 dllFileName = PhConcatStringRef2(&systemDirectory->sr, &dllBaseName);
-                PhDereferenceObject(systemDirectory);
 
-                ExtractIconEx(dllFileName->Buffer, index, &largeIcon, &smallIcon, 1);
+                PhExtractIcon(dllFileName->Buffer, &largeIcon, &smallIcon);
+
                 PhDereferenceObject(dllFileName);
+                PhDereferenceObject(systemDirectory);
             }
         }
 
@@ -735,12 +733,10 @@ HICON PhGetFileShellIcon(
 
         if (FileName)
         {
-            ExtractIconEx(
+            PhExtractIcon(
                 FileName,
-                0,
                 LargeIcon ? &icon : NULL,
-                !LargeIcon ? &icon : NULL,
-                1
+                !LargeIcon ? &icon : NULL
                 );
         }
 
@@ -752,7 +748,7 @@ HICON PhGetFileShellIcon(
                 );
 
             if (icon)
-                icon = DuplicateIcon(NULL, icon);
+                icon = CopyIcon(icon);
         }
 
         return icon;

phlib/include/phutil.h

@@ -1126,6 +1126,15 @@ PhLoadIndirectString(
     _In_ PWSTR SourceString
     );
 
+PHLIBAPI
+BOOLEAN
+NTAPI
+PhExtractIcon(
+    _In_ PWSTR FileName,
+    _In_ HICON *IconLarge,
+    _In_ HICON *IconSmall
+    );
+
 #ifdef __cplusplus
 }
 #endif

phlib/util.c

@@ -5287,6 +5287,12 @@ PPH_STRING PhLoadString(
     return string;
 }
 
+// rev from SHLoadIndirectString
+/**
+ * Extracts a specified text resource when given that resource in the form of an indirect string (a string that begins with the '@' symbol).
+ *
+ * \param SourceString The indirect string from which the resource will be retrieved.
+ */
 PPH_STRING PhLoadIndirectString(
     _In_ PWSTR SourceString
     )
@@ -5337,3 +5343,21 @@ PPH_STRING PhLoadIndirectString(
 
     return indirectString;
 }
+
+// rev from ExtractIconExW
+BOOLEAN PhExtractIcon(
+    _In_ PWSTR FileName, 
+    _In_ HICON *IconLarge,
+    _In_ HICON *IconSmall
+    )
+{
+    static UINT (WINAPI *PrivateExtractIconExW)(PCWSTR, INT, HICON*, HICON*, UINT) = NULL;
+
+    if (!PrivateExtractIconExW) 
+        PrivateExtractIconExW = PhGetModuleProcAddress(L"user32.dll", "PrivateExtractIconExW");
+
+    if (!PrivateExtractIconExW)
+        return FALSE;
+
+    return PrivateExtractIconExW(FileName, 0, IconLarge, IconSmall, 1) > 0;
+}

tools/peview/peprp.c

@@ -338,13 +338,11 @@ INT_PTR CALLBACK PvpPeGeneralDlgProc(
             {
                 PhInitializeImageVersionInfo(&PvImageVersionInfo, PvFileName->Buffer);
 
-                if (ExtractIconEx(
+                if (!PhExtractIcon(
                     PvFileName->Buffer,
-                    0,
                     &PvImageLargeIcon,
-                    NULL,
-                    1
-                    ) == 0)
+                    NULL
+                    ))
                 {
                     PvImageLargeIcon = PhGetFileShellIcon(PvFileName->Buffer, NULL, TRUE);
                 }