Adding support extract icon from modern app (#91)

shibayan · Jul 7, 2021 · b851ff8 · b851ff8
1 parent c17027c
commit b851ff8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/WinQuickLook/Internal/AssocHandlerHelper.cs b/WinQuickLook/Internal/AssocHandlerHelper.cs
@@ -68,6 +68,16 @@ public static IList<AssocAppEntry> GetAssocAppList(string fileName)
 
                     NativeMethods.DestroyIcon(icons[0]);
                 }
+                else if (location.StartsWith("@"))
+                {
+                    var iconPathBuffer = new StringBuilder(1024);
+
+                    NativeMethods.SHLoadIndirectString(location, iconPathBuffer, iconPathBuffer.Capacity, IntPtr.Zero);
+
+                    var iconPath = iconPathBuffer.ToString();
+
+                    icon = File.Exists(iconPath) ? new BitmapImage(new Uri(iconPath)) : null;
+                }
                 else
                 {
                     icon = null;

diff --git a/WinQuickLook/Interop/NativeMethods.cs b/WinQuickLook/Interop/NativeMethods.cs
@@ -55,14 +55,17 @@ public static extern void SHCreateItemFromParsingName([In, MarshalAs(UnmanagedTy
         [DllImport("shlwapi.dll")]
         public static extern void StrRetToBSTR([In, Out] ref STRRET pstr, [In] IntPtr pidl, [Out, MarshalAs(UnmanagedType.BStr)] out string pbstr);
 
+        [DllImport("shlwapi.dll")]
+        public static extern int SHLoadIndirectString([In, MarshalAs(UnmanagedType.LPWStr)] string pszSource, [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszOutBuf, int cchOuutBuf, IntPtr ppvReserved);
+
         [DllImport("user32.dll")]
         public static extern uint GetWindowThreadProcessId(IntPtr hwnd, IntPtr lpdwProcessId);
 
         [DllImport("user32.dll")]
         public static extern uint GetGUIThreadInfo(uint dwthreadid, ref GUITHREADINFO lpguithreadinfo);
 
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        public static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+        public static extern int GetClassName(IntPtr hWnd, [Out, MarshalAs(UnmanagedType.LPTStr)] StringBuilder lpClassName, int nMaxCount);
 
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
@@ -74,10 +77,7 @@ public static extern void SHCreateItemFromParsingName([In, MarshalAs(UnmanagedTy
         public static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref WINCOMPATTRDATA data);
 
         [DllImport("shlwapi.dll", CharSet = CharSet.Auto)]
-        public static extern uint AssocQueryString(ASSOCF flags, ASSOCSTR str, string pszAssoc, string pszExtra, [Out] StringBuilder pszOut, [In, Out] ref int pcchOut);
-
-        [DllImport("dwmapi.dll")]
-        public static extern int DwmGetColorizationColor([Out] out uint pcrColorization, [Out] out bool pfOpaqueBlend);
+        public static extern uint AssocQueryString(ASSOCF flags, ASSOCSTR str, string pszAssoc, string pszExtra, [Out, MarshalAs(UnmanagedType.LPTStr)] StringBuilder pszOut, [In, Out] ref int pcchOut);
 
         [DllImport("dwmapi.dll")]
         public static extern int DwmIsCompositionEnabled(out bool pfEnabled);