Add ICustomMarshaler StrArrayMarshaler

vmuriart · vmuriart · commit d01f25fffd94 · 2017-02-27T18:58:05.000-07:00
diff --git a/src/runtime/CustomMarshaler.cs b/src/runtime/CustomMarshaler.cs
@@ -77,4 +77,58 @@ public static ICustomMarshaler GetInstance(string cookie)
             return Instance;
         }
     }
+
+
+    /// <summary>
+    /// Custom Marshaler to deal with Managed String Arrays to Native
+    /// conversion differences on UCS2/UCS4.
+    /// </summary>
+    public class StrArrayMarshaler : MarshalerBase
+    {
+        private static readonly MarshalerBase Instance = new StrArrayMarshaler();
+
+        public override IntPtr MarshalManagedToNative(object managedObj)
+        {
+            var argv = managedObj as string[];
+
+            if (argv == null)
+            {
+                return IntPtr.Zero;
+            }
+
+            var totalStrLength = 0;
+            foreach (string arg in argv)
+            {
+                totalStrLength += arg.Length + 1;
+            }
+            int memSize = argv.Length * IntPtr.Size + totalStrLength * Runtime.UCS;
+
+            IntPtr mem = Marshal.AllocHGlobal(memSize);
+            try
+            {
+                // Preparing array of pointers to strings
+                IntPtr curStrPtr = mem + argv.Length * IntPtr.Size;
+                for (var i = 0; i < argv.Length; i++)
+                {
+                    Encoding encoding = Runtime.UCS == 2 ? Encoding.Unicode : Encoding.UTF32;
+                    byte[] bStr = encoding.GetBytes(argv[i] + "\0");
+                    Marshal.Copy(bStr, 0, curStrPtr, bStr.Length);
+                    Marshal.WriteIntPtr(mem + i * IntPtr.Size, curStrPtr);
+                    curStrPtr += bStr.Length;
+                }
+            }
+            catch (Exception)
+            {
+                Marshal.FreeHGlobal(mem);
+                throw;
+            }
+
+            return mem;
+        }
+
+        public static ICustomMarshaler GetInstance(string cookie)
+        {
+            return Instance;
+        }
+    }
 }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -667,41 +667,8 @@ internal unsafe static extern IntPtr
         public unsafe static extern int
             Py_Main(
                 int argc,
-                IntPtr lplpargv
+                [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrArrayMarshaler))] string[] argv
             );
-
-        public static int Py_Main(int argc, string[] argv)
-        {
-            // Totally ignoring argc.
-            argc = argv.Length;
-
-            var allStringsLength = 0;
-            foreach (string x in argv)
-            {
-                allStringsLength += x.Length + 1;
-            }
-            int requiredSize = IntPtr.Size * argc + allStringsLength * UCS;
-            IntPtr mem = Marshal.AllocHGlobal(requiredSize);
-            try
-            {
-                // Preparing array of pointers to UTF32 strings.
-                IntPtr curStrPtr = mem + argc * IntPtr.Size;
-                for (var i = 0; i < argv.Length; i++)
-                {
-                    // Unicode or UTF8 work
-                    Encoding enc = UCS == 2 ? Encoding.Unicode : Encoding.UTF32;
-                    byte[] zstr = enc.GetBytes(argv[i] + "\0");
-                    Marshal.Copy(zstr, 0, curStrPtr, zstr.Length);
-                    Marshal.WriteIntPtr(mem + IntPtr.Size * i, curStrPtr);
-                    curStrPtr += zstr.Length;
-                }
-                return Py_Main(argc, mem);
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(mem);
-            }
-        }
 #elif PYTHON2
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             ExactSpelling = true, CharSet = CharSet.Ansi)]
@@ -2078,41 +2045,9 @@ internal unsafe static extern IntPtr
         internal unsafe static extern void
             PySys_SetArgvEx(
                 int argc,
-                IntPtr lplpargv,
+                [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrArrayMarshaler))] string[] argv,
                 int updatepath
             );
-
-        internal static void PySys_SetArgvEx(int argc, string[] argv, int updatepath)
-        {
-            // Totally ignoring argc.
-            argc = argv.Length;
-
-            var allStringsLength = 0;
-            foreach (string x in argv)
-            {
-                allStringsLength += x.Length + 1;
-            }
-            int requiredSize = IntPtr.Size * argc + allStringsLength * UCS;
-            IntPtr mem = Marshal.AllocHGlobal(requiredSize);
-            try
-            {
-                // Preparing array of pointers to UTF32 strings.
-                IntPtr curStrPtr = mem + argc * IntPtr.Size;
-                for (var i = 0; i < argv.Length; i++)
-                {
-                    Encoding enc = UCS == 2 ? Encoding.Unicode : Encoding.UTF32;
-                    byte[] zstr = enc.GetBytes(argv[i] + "\0");
-                    Marshal.Copy(zstr, 0, curStrPtr, zstr.Length);
-                    Marshal.WriteIntPtr(mem + IntPtr.Size * i, curStrPtr);
-                    curStrPtr += zstr.Length;
-                }
-                PySys_SetArgvEx(argc, mem, updatepath);
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(mem);
-            }
-        }
 #elif PYTHON2
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             ExactSpelling = true, CharSet = CharSet.Ansi)]
