Merge pull request #828 from microsoft/fix751

Touch-up CCW generation
microsoft · Dec 9, 2022 · d1c2fd7 · d1c2fd7
2 parents 7ff965b + 1d5df5a
commit d1c2fd7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Microsoft.Windows.CsWin32/Generator.Com.cs b/src/Microsoft.Windows.CsWin32/Generator.Com.cs
@@ -103,8 +103,8 @@ private TypeDeclarationSyntax DeclareInterfaceAsStruct(TypeDefinitionHandle type
         List<QualifiedMethodDefinitionHandle> ccwMethodsToSkip = new();
         IdentifierNameSyntax vtblParamName = IdentifierName("vtable");
         BlockSyntax populateVTableBody = Block();
-        IdentifierNameSyntax objectLocal = IdentifierName("@object");
-        IdentifierNameSyntax hrLocal = IdentifierName("hr");
+        IdentifierNameSyntax objectLocal = IdentifierName("__object");
+        IdentifierNameSyntax hrLocal = IdentifierName("__hr");
         StatementSyntax returnSOK = ReturnStatement(MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, HresultTypeSyntax, IdentifierName("S_OK")));
 
         // It is imperative that we generate methods for all base interfaces as well, ahead of any implemented by *this* interface.
@@ -456,9 +456,10 @@ void AddCcwThunk(params StatementSyntax[] thunkInvokeAndReturn)
 
         if (ccwThisParameter is not null)
         {
-            // internal static void PopulateVTable(Vtbl* vtable)
+            // PopulateVTable must be public in order to (implicitly) implement an interface that WinForms declares.
+            // public static void PopulateVTable(Vtbl* vtable)
             MethodDeclarationSyntax populateVtblMethodDecl = MethodDeclaration(PredefinedType(Token(SyntaxKind.VoidKeyword)), Identifier("PopulateVTable"))
-                .AddModifiers(Token(this.Visibility), Token(SyntaxKind.StaticKeyword))
+                .AddModifiers(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.StaticKeyword))
                 .AddParameterListParameters(Parameter(vtblParamName.Identifier).WithType(PointerType(vtblStructName).WithTrailingTrivia(Space)))
                 .WithBody(populateVTableBody);
             members.Add(populateVtblMethodDecl);

diff --git a/test/Microsoft.Windows.CsWin32.Tests/COMTests.cs b/test/Microsoft.Windows.CsWin32.Tests/COMTests.cs
@@ -230,6 +230,16 @@ public void WinRTInterfaceWithWinRTOutObjectUsesMarshaler()
         Assert.Single(this.FindGeneratedType(WinRTCustomMarshalerClass));
     }
 
+    [Fact]
+    public void MethodWithHRParameter()
+    {
+        this.compilation = this.starterCompilations["net6.0"];
+        this.generator = this.CreateGenerator(DefaultTestGeneratorOptions with { AllowMarshaling = false });
+        Assert.True(this.generator.TryGenerate("IFileOpenDialog", CancellationToken.None));
+        this.CollectGeneratedCode(this.generator);
+        this.AssertNoDiagnostics();
+    }
+
     [Fact]
     public void ComOutPtrTypedAsOutObject()
     {