Marshal pointer to primitive typedefs in C++/CLI (#1355)

Co-authored-by: Build Agent <[email protected]>

Author: IIFE

src/Generator/Generators/CLI/CLISources.cs

@@ -1173,10 +1173,23 @@ private ParamMarshal GenerateFunctionParamMarshal(Parameter param, int paramInde
             var argName = Generator.GeneratedIdentifier("arg") + paramIndex.ToString(CultureInfo.InvariantCulture);
 
             var isRef = param.IsOut || param.IsInOut;
+
+            var paramType = param.Type;
+
+            // Get actual type if the param type is a typedef but not a function type because function types have to be typedef.
+            // We need to get the actual type this early before we visit any marshalling code to ensure we hit the marshalling
+            // logic for the actual type and not the typedef.
+            // This fixes issues where typedefs to primitive pointers are involved.
+            FunctionType functionType;
+            var paramTypeAsTypedef = paramType as TypedefType;
+            if (paramTypeAsTypedef != null && !paramTypeAsTypedef.Declaration.Type.IsPointerTo(out functionType))
+            {
+                paramType = param.Type.Desugar();
+            }
+
             // Since both pointers and references to types are wrapped as CLI
             // tracking references when using in/out, we normalize them here to be able
-            // to use the same code for marshaling.
-            var paramType = param.Type;
+            // to use the same code for marshaling.            
             if (paramType is PointerType && isRef)
             {
                 if (!paramType.IsReference())

tests/Common/Common.Tests.cs

@@ -1095,4 +1095,12 @@ public void TestTakeTypedefedMappedType()
         const string @string = "string";
         Assert.That(Common.TakeTypedefedMappedType(@string), Is.EqualTo(@string));
     }
+
+    [Test]
+    public void TestPointerToPrimitiveTypedefPointerTestMethod()
+    {
+        int a = 50;
+        Common.PointerToPrimitiveTypedefPointerTestMethod(ref a, 100);
+        Assert.AreEqual(100, a);
+    }
 }

tests/Common/Common.cpp

@@ -1215,3 +1215,8 @@ void DLL_API PointerToTypedefPointerTestMethod(LPPointerToTypedefPointerTest* lp
 {
     (*(*lp)).val = valToSet;
 }
+
+void DLL_API PointerToPrimitiveTypedefPointerTestMethod(LPINT lp, int valToSet)
+{
+    *lp = valToSet;
+}

tests/Common/Common.h

@@ -1616,3 +1616,7 @@ struct DLL_API PointerToTypedefPointerTest
 typedef PointerToTypedefPointerTest *LPPointerToTypedefPointerTest;
 
 void DLL_API PointerToTypedefPointerTestMethod(LPPointerToTypedefPointerTest* lp, int valToSet);
+
+typedef int *LPINT;
+
+void DLL_API PointerToPrimitiveTypedefPointerTestMethod(LPINT lp, int valToSet);