Merge pull request #974 from microsoft/fix969

Fix user requests for special types
microsoft · Jun 23, 2023 · 0bccff3 · 0bccff3
2 parents 1d9b174 + a453f71
commit 0bccff3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Microsoft.Windows.CsWin32/Generator.cs b/src/Microsoft.Windows.CsWin32/Generator.cs
@@ -547,7 +547,7 @@ public bool TryGenerateType(string possiblyQualifiedName, out IReadOnlyList<stri
             return false;
         }
 
-        if (SpecialTypeDefNames.Contains(typeName))
+        if (this.InputAssemblyName.Equals("Windows.Win32", StringComparison.OrdinalIgnoreCase) && SpecialTypeDefNames.Contains(typeName))
         {
             string? fullyQualifiedName = null;
             this.volatileCode.GenerationTransaction(() => this.RequestSpecialTypeDefStruct(typeName, out fullyQualifiedName));

diff --git a/test/Microsoft.Windows.CsWin32.Tests/StructTests.cs b/test/Microsoft.Windows.CsWin32.Tests/StructTests.cs
@@ -174,6 +174,19 @@ public void FieldWithAssociatedEnum()
         Assert.Equal("SHDID_ID", Assert.IsType<IdentifierNameSyntax>(property.Type).Identifier.ValueText);
     }
 
+    [Theory]
+    [InlineData("PCSTR")]
+    public void SpecialStruct_ByRequest(string structName)
+    {
+        this.generator = this.CreateGenerator();
+        Assert.True(this.generator.TryGenerate(structName, out IReadOnlyList<string> preciseApi, CancellationToken.None));
+        Assert.Single(preciseApi);
+        this.CollectGeneratedCode(this.generator);
+        this.AssertNoDiagnostics();
+
+        var type = (StructDeclarationSyntax)Assert.Single(this.FindGeneratedType(structName));
+    }
+
     [Theory]
     [CombinatorialData]
     public void InterestingStructs(