Fix the unmarshalling conditions

dotnet · Nov 16, 2021 · d66549a · d66549a
1 parent 5eb62da
commit d66549a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...en/Microsoft.Interop.SourceGeneration/Marshalling/ICustomNativeTypeMarshallingStrategy.cs b/...en/Microsoft.Interop.SourceGeneration/Marshalling/ICustomNativeTypeMarshallingStrategy.cs
@@ -235,7 +235,7 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo
         {
             var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);
 
-            if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))
+            if (info.IsManagedReturnPosition || (info.IsByRef && info.RefKind != RefKind.In))
             {
                 yield return GenerateValuePropertyAssignment(info, context, subContext);
             }
@@ -568,7 +568,7 @@ public IEnumerable<StatementSyntax> GenerateUnmarshalStatements(TypePositionInfo
         {
             var subContext = new CustomNativeTypeWithValuePropertyStubContext(context);
 
-            if (!info.IsByRef && info.ByValueContentsMarshalKind.HasFlag(ByValueContentsMarshalKind.Out))
+            if (info.IsManagedReturnPosition || (info.IsByRef && info.RefKind != RefKind.In))
             {
                 // <marshalerIdentifier>.Value = <nativeIdentifier>;
                 yield return GenerateValuePropertyAssignment(info, context, subContext);