Use Int32 for the flags, write a complete empty struct at the end.

filmor · filmor · commit 392c08bc9ff9 · 2016-02-29T09:45:39.000+01:00
diff --git a/src/runtime/methodwrapper.cs b/src/runtime/methodwrapper.cs
@@ -31,35 +31,19 @@ public MethodWrapper(Type type, string name) {
 
             IntPtr fp = Interop.GetThunk(type.GetMethod(name));
 
-            // XXX - here we create a Python string object, then take the
-            // char * of the internal string to pass to our methoddef
-            // structure. Its a hack, and the name is leaked!
-#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
-            IntPtr ps = Runtime.PyBytes_FromString(name);
-            IntPtr sp = Runtime.PyBytes_AS_STRING(ps);
-#else
-            IntPtr ps = Runtime.PyString_FromString(name);
-            IntPtr sp = Runtime.PyString_AS_STRING(ps);
-#endif
-
             // Allocate and initialize a PyMethodDef structure to represent 
             // the managed method, then create a PyCFunction. 
 
             mdef = Runtime.PyMem_Malloc(4 * IntPtr.Size);
-            Marshal.WriteIntPtr(mdef, sp);
+            Marshal.WriteIntPtr(mdef, Marshal.StringToHGlobalAnsi(name));
             Marshal.WriteIntPtr(mdef, (1 * IntPtr.Size), fp);
-            Marshal.WriteIntPtr(mdef, (2 * IntPtr.Size), (IntPtr)0x0003); // METH_VARARGS | METH_KEYWORDS
+            Marshal.WriteInt32(mdef, (2 * IntPtr.Size), 0x0003); // METH_VARARGS | METH_KEYWORDS
             Marshal.WriteIntPtr(mdef, (3 * IntPtr.Size), IntPtr.Zero);
             ptr = Runtime.PyCFunction_NewEx(mdef, IntPtr.Zero, IntPtr.Zero);
         }
 
         public IntPtr Call(IntPtr args, IntPtr kw) {
             return Runtime.PyCFunction_Call(ptr, args, kw);
         }
-
-
     }
-
-
-}
-
+}
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -306,9 +306,14 @@ internal static IntPtr CreateMetaType(Type impl) {
             IntPtr mdef = Runtime.PyMem_Malloc(5 * IntPtr.Size);
             Marshal.WriteIntPtr(mdef, Marshal.StringToHGlobalAnsi("__instancecheck__"));
             Marshal.WriteIntPtr(mdef, (1 * IntPtr.Size), fp);
-            Marshal.WriteIntPtr(mdef, (2 * IntPtr.Size), (IntPtr)0x0001); // METH_VARARGS
+            Marshal.WriteInt32(mdef, (2 * IntPtr.Size), 0x0001);
             Marshal.WriteIntPtr(mdef, (3 * IntPtr.Size), IntPtr.Zero);
+
+            // Write empty sentinel struct
             Marshal.WriteIntPtr(mdef, (4 * IntPtr.Size), IntPtr.Zero);
+            Marshal.WriteIntPtr(mdef, (5 * IntPtr.Size), IntPtr.Zero);
+            Marshal.WriteIntPtr(mdef, (6 * IntPtr.Size), IntPtr.Zero);
+            Marshal.WriteIntPtr(mdef, (7 * IntPtr.Size), IntPtr.Zero);
 
             Marshal.WriteIntPtr(type, TypeOffset.tp_methods, mdef);
 
