Rework the handling for functions that need hidden structure parameters.

The main changes are:
 - The original return type is now kept as the type of the generated parameter
 - The return type of the function is set to void to represent what is actually happening.

This also fixes a bunch of bugs related due to using the wrong return type in some places.

src/AST/Function.cs

@@ -102,6 +102,20 @@ namespace CppSharp.AST
             }
         }
 
+        public QualifiedType OriginalReturnType
+        {
+            get
+            {
+                if (!HasHiddenStructParameter)
+                    return ReturnType;
+
+                var hiddenParam = Parameters.Single(param =>
+                    param.Kind == ParameterKind.HiddenStructureReturn);
+                return hiddenParam.QualifiedType;
+            }
+        }
+
+
         public string Mangled { get; set; }
         
         public override T Visit<T>(IDeclVisitor<T> visitor)

src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@@ -1432,7 +1432,7 @@ namespace CppSharp.Generators.CSharp
             if (method.IsConstructor || method.IsDestructor)
                 Write("{0}(", functionName);
             else
-                Write("{0} {1}(", method.ReturnType, functionName);
+                Write("{0} {1}(", method.OriginalReturnType, functionName);
 
             GenerateMethodParameters(method);
 
@@ -1557,14 +1557,13 @@ namespace CppSharp.Generators.CSharp
                 return;
             }
 
-            var retType = function.ReturnType;
+            var retType = function.OriginalReturnType;
             var needsReturn = !retType.Type.IsPrimitiveType(PrimitiveType.Void);
 
-            var method = function as Method;
-
             var isValueType = false;
             var needsInstance = false;
 
+            var method = function as Method;
             if (method != null)
             {
                 var @class = (Class) method.Namespace;
@@ -1585,10 +1584,14 @@ namespace CppSharp.Generators.CSharp
             Class retClass = null;
             if (function.HasHiddenStructParameter)
             {
-                function.ReturnType.Type.Desugar().IsTagDecl(out retClass);
+                var hiddenParam = function.Parameters[0];
+                if (hiddenParam.Kind != ParameterKind.HiddenStructureReturn)
+                    throw new NotSupportedException("Expected hidden structure parameter kind");
 
+                hiddenParam.Type.Desugar().IsTagDecl(out retClass);
                 WriteLine("var {0} = new {1}.Internal();", GeneratedIdentifier("udt"),
                     retClass.OriginalName);
+            }
 
                 retType.Type = new BuiltinType(PrimitiveType.Void);
                 needsReturn = false;
@@ -1620,7 +1623,7 @@ namespace CppSharp.Generators.CSharp
                 WriteLine("var {0} = ToInternal();", Helpers.GeneratedIdentifier("instance"));
             }
 
-            if (needsReturn)
+            if (needsReturn && !function.HasHiddenStructParameter)
                 Write("var ret = ");
 
             WriteLine("{0}({1});", functionName, string.Join(", ", names));
@@ -1649,6 +1652,15 @@ namespace CppSharp.Generators.CSharp
             }
 
             if (needsReturn)
+            {
+                if (function.HasHiddenStructParameter)
+                {
+                    WriteLine("var ret = new {0}({1});", retClass.Name,
+                        GeneratedIdentifier("udt"));
+
+                    WriteLine("return ret;");
+                }
+                else
                 {
                     var ctx = new CSharpMarshalContext(Driver)
                     {
@@ -1665,13 +1677,6 @@ namespace CppSharp.Generators.CSharp
 
                     WriteLine("return {0};", marshal.Context.Return);
                 }
-
-            if (function.HasHiddenStructParameter)
-            {
-                WriteLine("var ret = new {0}({1});", retClass.Name,
-                    GeneratedIdentifier("udt"));
-
-                WriteLine("return ret;");
             }
         }
 
@@ -1737,6 +1742,9 @@ namespace CppSharp.Generators.CSharp
             var paramIndex = 0;
             foreach (var param in @params)
             {
+                if (param.Kind == ParameterKind.HiddenStructureReturn)
+                    continue;
+
                 marshals.Add(GenerateFunctionParamMarshal(param, paramIndex, function));
                 paramIndex++;
             }

src/Generator/Passes/CheckAbiParameters.cs

@@ -19,13 +19,12 @@ namespace CppSharp.Passes
             var structParameter = new Parameter()
                 {
                     Kind = ParameterKind.HiddenStructureReturn,
-                    QualifiedType = new QualifiedType(
-                        new BuiltinType(PrimitiveType.IntPtr)),
+                    QualifiedType = method.ReturnType,
                     Name = "return",
-                    IgnoreFlags = IgnoreFlags.Generation
                 };
 
             method.Parameters.Insert(0, structParameter);
+            method.ReturnType = new QualifiedType(new BuiltinType(PrimitiveType.Void));
 
             return true;
         }