Add API to get Windows stock icons. (#8878)

Fixes: #8802
dotnet · Mar 21, 2023 · 05914bc · 05914bc
1 parent c06af78
commit 05914bc
Show file tree

Hide file tree

Showing 7 changed files with 634 additions and 21 deletions.
diff --git a/src/System.Drawing.Common/src/Interop/Windows/Shell32/Interop.SHGetStockIconInfo.cs b/src/System.Drawing.Common/src/Interop/Windows/Shell32/Interop.SHGetStockIconInfo.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Shell32
+    {
+#if NET8_0_OR_GREATER
+        internal const uint SHGSI_ICON = 0x000000100;
+
+        [LibraryImport(Libraries.Shell32)]
+        internal static partial HRESULT SHGetStockIconInfo(
+            uint siid,
+            uint uFlags,
+            ref SHSTOCKICONINFO psii);
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal unsafe struct SHSTOCKICONINFO
+        {
+            public uint cbSize;
+            public nint hIcon;
+            public int iSysImageIndex;
+            public int iIcon;
+            public fixed char szPath[260];
+        }
+#endif
+    }
+}
diff --git a/src/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCurrent);$(NetPrevious);$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <TargetFramework />
@@ -210,6 +210,8 @@ Since .NET 7, non-Windows platforms are not supported, even with the runtime con
     <Compile Include="System\Drawing\Printing\PrintPreviewGraphics.cs" />
     <Compile Include="System\Drawing\Printing\TriState.cs" />
     <Compile Include="System\Drawing\ScreenDC.cs" />
+    <Compile Include="System\Drawing\StockIconId.cs" />
+    <Compile Include="System\Drawing\StockIconOptions.cs" />
     <Compile Include="System\Drawing\SystemIcons.cs" />
     <Compile Include="System\Drawing\ToolboxBitmapAttribute.cs" />
 
@@ -275,6 +277,7 @@ Since .NET 7, non-Windows platforms are not supported, even with the runtime con
     <Compile Include="Interop\Windows\Ole32\Interop.STATFLAG.cs" />
     <Compile Include="Interop\Windows\Ole32\Interop.STGM.cs" />
     <Compile Include="Interop\Windows\Shell32\Interop.ExtractAssociatedIcon.cs" />
+    <Compile Include="Interop\Windows\Shell32\Interop.SHGetStockIconInfo.cs" />
     <Compile Include="Interop\Windows\User32\Interop.CopyImage.cs" />
     <Compile Include="Interop\Windows\User32\Interop.CreateIconFromResourceEx.cs" />
     <Compile Include="Interop\Windows\User32\Interop.DestroyIcon.cs" />
@@ -293,24 +296,18 @@ Since .NET 7, non-Windows platforms are not supported, even with the runtime con
     <Compile Include="Interop\Windows\Winspool\Interop.EnumPrinters.cs" />
     <Compile Include="Interop\Windows\Interop.HRESULT.cs" />
 
-    <Compile Include="..\..\Common\src\LocalAppContextSwitches.Common.cs"
-              Link="System\LocalAppContextSwitches.Common.cs" />
-    <Compile Include="..\..\Common\src\ValueStringBuilder.cs"
-             Link="System\Text\ValueStringBuilder.cs" />
+    <Compile Include="..\..\Common\src\LocalAppContextSwitches.Common.cs" Link="System\LocalAppContextSwitches.Common.cs" />
+    <Compile Include="..\..\Common\src\ValueStringBuilder.cs" Link="System\Text\ValueStringBuilder.cs" />
 
 
-    <EmbeddedResource Include="Resources\System\Drawing\DefaultComponent.bmp"
-                      LogicalName="System.Drawing.DefaultComponent.bmp" />
+    <EmbeddedResource Include="Resources\System\Drawing\DefaultComponent.bmp" LogicalName="System.Drawing.DefaultComponent.bmp" />
     <EmbeddedResource Include="Resources\System\Drawing\Printing\PrintDocument.bmp" />
-    <EmbeddedResource Include="Resources\System\Drawing\ShieldIcon.ico"
-                      LogicalName="System.Drawing.ShieldIcon.ico" />
+    <EmbeddedResource Include="Resources\System\Drawing\ShieldIcon.ico" LogicalName="System.Drawing.ShieldIcon.ico" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
-    <Compile Include="..\..\Common\src\DisableRuntimeMarshalling.cs"
-             Link="Common\DisableRuntimeMarshalling.cs" />
-    <Compile Include="..\..\Common\src\HandleRefMarshaller.cs"
-             Link="Common\HandleRefMarshaller.cs" />
+    <Compile Include="..\..\Common\src\DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" />
+    <Compile Include="..\..\Common\src\HandleRefMarshaller.cs" Link="Common\HandleRefMarshaller.cs" />
     <Compile Include="System\Drawing\GdiplusNative.cs" />
   </ItemGroup>
 
@@ -328,10 +325,8 @@ Since .NET 7, non-Windows platforms are not supported, even with the runtime con
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-    <Compile Include="..\..\Common\src\RequiresUnreferencedCodeAttribute.cs"
-             Link="Common\RequiresUnreferencedCodeAttribute.cs" />
-    <Compile Include="..\..\Common\src\UnconditionalSuppressMessageAttribute.cs"
-             Link="Common\UnconditionalSuppressMessageAttribute.cs" />
+    <Compile Include="..\..\Common\src\RequiresUnreferencedCodeAttribute.cs" Link="Common\RequiresUnreferencedCodeAttribute.cs" />
+    <Compile Include="..\..\Common\src\UnconditionalSuppressMessageAttribute.cs" Link="Common\UnconditionalSuppressMessageAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">

diff --git a/src/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs b/src/System.Drawing.Common/src/System/Drawing/GdiplusNative.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Drawing.Drawing2D;