Give HWND an IntPtr field type

Fixes #312
microsoft · Jun 16, 2022 · 4d6386c · 4d6386c
1 parent a79abbd
commit 4d6386c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Microsoft.Windows.CsWin32/Generator.cs b/src/Microsoft.Windows.CsWin32/Generator.cs
@@ -3763,7 +3763,7 @@ private ClassDeclarationSyntax DeclareCocreatableClass(TypeDefinition typeDef)
     private StructDeclarationSyntax DeclareTypeDefStruct(TypeDefinition typeDef, TypeDefinitionHandle typeDefHandle)
     {
         IdentifierNameSyntax name = IdentifierName(this.Reader.GetString(typeDef.Name));
-        bool isHandle = name.Identifier.ValueText == "HGDIOBJ";
+        bool isHandle = name.Identifier.ValueText is "HGDIOBJ" or "HWND";
         foreach (CustomAttributeHandle attHandle in typeDef.GetCustomAttributes())
         {
             CustomAttribute att = this.Reader.GetCustomAttribute(attHandle);

diff --git a/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs b/test/Microsoft.Windows.CsWin32.Tests/GeneratorTests.cs
@@ -576,6 +576,21 @@ public void HandleStructsHaveIsNullProperty(string handleName)
         this.AssertGeneratedMember(handleName, "IsNull", "internal bool IsNull => Value == default;");
     }
 
+    [Theory]
+    [InlineData("HANDLE")]
+    [InlineData("HGDIOBJ")]
+    [InlineData("HWND")]
+    public void HandleTypeDefsUseIntPtrAsFieldType(string handleType)
+    {
+        this.generator = this.CreateGenerator();
+        Assert.True(this.generator.TryGenerate(handleType, CancellationToken.None));
+        this.CollectGeneratedCode(this.generator);
+        this.AssertNoDiagnostics();
+        StructDeclarationSyntax hwnd = Assert.IsType<StructDeclarationSyntax>(this.FindGeneratedType(handleType).Single());
+        FieldDeclarationSyntax field = hwnd.Members.OfType<FieldDeclarationSyntax>().Single();
+        Assert.Equal(nameof(IntPtr), Assert.IsType<IdentifierNameSyntax>(field.Declaration.Type).Identifier.ValueText);
+    }
+
     [Fact]
     public void NamespaceHandleGetsNoSafeHandle()
     {