Add ref/out keywords on arguments for shadow methods in GeneratedComI…

…nterface (dotnet#109382)
LuckyXu-HF · Oct 31, 2024 · 0c67caf · 0c67caf
1 parent fe3dcc5
commit 0c67caf
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComMethodContext.cs b/src/libraries/System.Runtime.InteropServices/gen/ComInterfaceGenerator/ComMethodContext.cs
@@ -141,8 +141,13 @@ private MethodDeclarationSyntax GenerateShadow()
                                     CastExpression(OriginalDeclaringInterface.Info.Type.Syntax, IdentifierName("this"))),
                                 IdentifierName(MethodInfo.MethodName)),
                             ArgumentList(
-                                SeparatedList(GenerationContext.SignatureContext.ManagedParameters.Select(p => Argument(IdentifierName(p.InstanceIdentifier))))))))
+                                SeparatedList(GenerationContext.SignatureContext.ManagedParameters.Select(GenerateArgument))))))
                 .WithSemicolonToken(Token(SyntaxKind.SemicolonToken));
+
+            static ArgumentSyntax GenerateArgument(TypePositionInfo info)
+                => info.IsByRef
+                ? Argument(IdentifierName(info.InstanceIdentifier)).WithRefKindKeyword(MarshallerHelpers.GetManagedArgumentRefKindKeyword(info))
+                : Argument(IdentifierName(info.InstanceIdentifier));
         }
 
         /// <summary>

diff --git a/...e.InteropServices/gen/Microsoft.Interop.SourceGeneration/Marshalling/MarshallerHelpers.cs b/...e.InteropServices/gen/Microsoft.Interop.SourceGeneration/Marshalling/MarshallerHelpers.cs
@@ -458,7 +458,7 @@ public static SyntaxToken GetManagedArgumentRefKindKeyword(TypePositionInfo type
                 RefKind.In => Token(SyntaxKind.InKeyword),
                 RefKind.Ref => Token(SyntaxKind.RefKeyword),
                 RefKind.Out => Token(SyntaxKind.OutKeyword),
-                RefKind.RefReadOnlyParameter => Token(SyntaxKind.RefKeyword),
+                RefKind.RefReadOnlyParameter => Token(SyntaxKind.InKeyword),
                 _ => throw new NotImplementedException($"Support for some RefKind: {typeInfo.RefKind}")
             };
         }

diff --git a/...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CodeSnippets.cs b/...ies/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/CodeSnippets.cs
@@ -671,6 +671,36 @@ interface IOtherInterface
             }
             """;
 
+        public string ForwarderWithPreserveSigAndRefKind(string refKind) => $$"""
+            using System;
+            using System.Runtime.CompilerServices;
+            using System.Runtime.InteropServices;
+            using System.Runtime.InteropServices.Marshalling;
+
+            #nullable enable
+
+            [assembly:DisableRuntimeMarshalling]
+
+            {{GeneratedComInterface()}}
+            partial interface IValue
+            {
+            }
+
+            {{GeneratedComInterface()}}
+            partial interface INativeAPIBase
+            {
+                [PreserveSig]
+                int FindValue(int key, {{refKind}} IValue? value);
+            }
+
+            {{GeneratedComInterface()}}
+            unsafe partial interface INativeDerived : INativeAPIBase
+            {
+                [PreserveSig]
+                int GetName(out char* name);
+            }
+            """;
+
         public class ManagedToUnmanaged : IVirtualMethodIndexSignatureProvider
         {
             public MarshalDirection Direction => MarshalDirection.ManagedToUnmanaged;

diff --git a/...braries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/Compiles.cs b/...braries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/Compiles.cs
@@ -341,6 +341,10 @@ public static IEnumerable<object[]> ComInterfaceSnippetsToCompile()
             yield return new object[] { ID(), codeSnippets.DerivedComInterfaceTypeTwoLevelShadows};
             yield return new object[] { ID(), codeSnippets.DerivedWithParametersDeclaredInOtherNamespace };
             yield return new object[] { ID(), codeSnippets.ComInterfaceParameters };
+            yield return new object[] { ID(), codeSnippets.ForwarderWithPreserveSigAndRefKind("ref") };
+            yield return new object[] { ID(), codeSnippets.ForwarderWithPreserveSigAndRefKind("ref readonly") };
+            yield return new object[] { ID(), codeSnippets.ForwarderWithPreserveSigAndRefKind("in") };
+            yield return new object[] { ID(), codeSnippets.ForwarderWithPreserveSigAndRefKind("out") };
         }
 
         public static IEnumerable<object[]> ManagedToUnmanagedComInterfaceSnippetsToCompile()