@@ -64,6 +64,8 @@ public static void DomainReloadAndGC()
             // objects is gone.
             Assembly pythonRunner2 = BuildAssembly("test2");
             RunAssemblyAndUnload(pythonRunner2, "test2");
+
+            PythonEngine.Shutdown();
         }
 
         //
 
@@ -27,15 +27,14 @@ public static void PlatformCache()
         {
             Runtime.Runtime.Initialize();
 
-            Assert.That(Runtime.Runtime.Machine, Is.Not.EqualTo(MachineType.Other));
-            Assert.That(!string.IsNullOrEmpty(Runtime.Runtime.MachineName));
+            Assert.That(NativeCodePageHelper.Machine, Is.Not.EqualTo(MachineType.Other));
+            Assert.That(!string.IsNullOrEmpty(NativeCodePageHelper.MachineName));
 
-            Assert.That(Runtime.Runtime.OperatingSystem, Is.Not.EqualTo(OperatingSystemType.Other));
-            Assert.That(!string.IsNullOrEmpty(Runtime.Runtime.OperatingSystemName));
+            Assert.That(NativeCodePageHelper.OperatingSystem, Is.Not.EqualTo(OperatingSystemType.Other));
+            Assert.That(!string.IsNullOrEmpty(NativeCodePageHelper.OperatingSystemName));
 
-            // Don't shut down the runtime: if the python engine was initialized
-            // but not shut down by another test, we'd end up in a bad state.
-	}
+            Runtime.Runtime.Shutdown();
+        }
 
         [Test]
         public static void Py_IsInitializedValue()
 
@@ -1,5 +1,6 @@
 using NUnit.Framework;
 using Python.Runtime;
+using Python.Runtime.Platform;
 using System.Runtime.InteropServices;
 
 namespace Python.EmbeddingTest
@@ -15,22 +16,21 @@ public static void Init()
         [TearDown]
         public static void Fini()
         {
-            // Don't shut down the runtime: if the python engine was initialized
-            // but not shut down by another test, we'd end up in a bad state.
+            Runtime.Runtime.Shutdown();
         }
 
         [Test]
         public static void TestNativeCode()
         {
-            Assert.That(() => { var _ = TypeManager.NativeCode.Active; }, Throws.Nothing);
-            Assert.That(TypeManager.NativeCode.Active.Code.Length, Is.GreaterThan(0));
+            Assert.That(() => { var _ = NativeCodePageHelper.NativeCode.Active; }, Throws.Nothing);
+            Assert.That(NativeCodePageHelper.NativeCode.Active.Code.Length, Is.GreaterThan(0));
         }
 
         [Test]
         public static void TestMemoryMapping()
         {
-            Assert.That(() => { var _ = TypeManager.CreateMemoryMapper(); }, Throws.Nothing);
-            var mapper = TypeManager.CreateMemoryMapper();
+            Assert.That(() => { var _ = NativeCodePageHelper.CreateMemoryMapper(); }, Throws.Nothing);
+            var mapper = NativeCodePageHelper.CreateMemoryMapper();
 
             // Allocate a read-write page.
             int len = 12;
 
@@ -40,6 +40,7 @@ public void SetUp()
             IntPtr str = Runtime.Runtime.PyString_FromString(testPath);
             IntPtr path = Runtime.Runtime.PySys_GetObject("path");
             Runtime.Runtime.PyList_Append(path, str);
+            Runtime.Runtime.XDecref(str);
         }
 
         [TearDown]
 
@@ -26,6 +26,7 @@ public static void LoadDefaultArgs()
             using (new PythonEngine())
             using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
+                Runtime.Runtime.XIncref(argv.Handle);
                 Assert.AreNotEqual(0, argv.Length());
             }
         }
@@ -37,6 +38,7 @@ public static void LoadSpecificArgs()
             using (new PythonEngine(args))
             using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
+                Runtime.Runtime.XIncref(argv.Handle);
                 Assert.AreEqual(args[0], argv[0].ToString());
                 Assert.AreEqual(args[1], argv[1].ToString());
             }
 
@@ -143,6 +143,7 @@
     <Compile Include="Util.cs" />
     <Compile Include="platform\Types.cs" />
     <Compile Include="platform\LibraryLoader.cs" />
+    <Compile Include="platform\NativeCodePage.cs" />
     <Compile Include="slots\mp_length.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
 
@@ -99,6 +99,10 @@ internal static IntPtr ToPython(IPythonDerivedType obj)
             // collected while Python still has a reference to it.
             if (Runtime.Refcount(self.pyHandle) == 1)
             {
+
+#if PYTHON_WITH_PYDEBUG
+                Runtime._Py_NewReference(self.pyHandle);
+#endif
                 GCHandle gc = GCHandle.Alloc(self, GCHandleType.Normal);
                 Marshal.WriteIntPtr(self.pyHandle, ObjectOffset.magic(self.tpHandle), (IntPtr)gc);
                 self.gcHandle.Free();
 
@@ -69,6 +69,37 @@ public ModulePropertyAttribute()
         }
     }
 
+    internal static partial class TypeOffset
+    {
+        static class Helper
+        {
+            public static int magic;
+            public static readonly Dictionary<string, int> NameMapping = new Dictionary<string, int>();
+        }
+
+        static TypeOffset()
+        {
+            Type type = typeof(TypeOffset);
+            FieldInfo[] fields = type.GetFields();
+            int size = IntPtr.Size;
+            for (int i = 0; i < fields.Length; i++)
+            {
+                int offset = i * size;
+                FieldInfo fi = fields[i];
+                fi.SetValue(null, offset);
+                Helper.NameMapping[fi.Name] = offset;
+            }
+            // XXX: Use the members after PyHeapTypeObject as magic slot
+            Helper.magic = members;
+        }
+
+        public static int magic() => Helper.magic;
+
+        public static int GetSlotOffset(string name)
+        {
+            return Helper.NameMapping[name];
+        }
+    }
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
     internal class ObjectOffset
@@ -556,4 +587,5 @@ struct PyMethodDef
         public int ml_flags;
         public IntPtr ml_doc;
     }
+
 }
@@ -1,5 +1,6 @@
+
 // Auto-generated by geninterop.py.
-// DO NOT MODIFIY BY HAND.
+// DO NOT MODIFY BY HAND.
 
 
 #if PYTHON27
@@ -12,25 +13,10 @@
 
 namespace Python.Runtime
 {
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    internal class TypeOffset
-    {
-        static TypeOffset()
-        {
-            Type type = typeof(TypeOffset);
-            FieldInfo[] fi = type.GetFields();
-            int size = IntPtr.Size;
-            for (int i = 0; i < fi.Length; i++)
-            {
-                fi[i].SetValue(null, i * size);
-            }
-        }
-
-        public static int magic()
-        {
-            return ob_size;
-        }
 
+    [StructLayout(LayoutKind.Sequential)]
+    internal static partial class TypeOffset
+    {
         // Auto-generated from PyHeapTypeObject in Python.h
         public static int ob_refcnt = 0;
         public static int ob_type = 0;
@@ -145,6 +131,94 @@ public static int magic()
         /* here are optional user slots, followed by the members. */
         public static int members = 0;
     }
-}
 
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct PyNumberMethods
+    {
+        public IntPtr nb_add;
+        public IntPtr nb_subtract;
+        public IntPtr nb_multiply;
+        public IntPtr nb_divide;
+        public IntPtr nb_remainder;
+        public IntPtr nb_divmod;
+        public IntPtr nb_power;
+        public IntPtr nb_negative;
+        public IntPtr nb_positive;
+        public IntPtr nb_absolute;
+        public IntPtr nb_nonzero;
+        public IntPtr nb_invert;
+        public IntPtr nb_lshift;
+        public IntPtr nb_rshift;
+        public IntPtr nb_and;
+        public IntPtr nb_xor;
+        public IntPtr nb_or;
+        public IntPtr nb_coerce;
+        public IntPtr nb_int;
+        public IntPtr nb_long;
+        public IntPtr nb_float;
+        public IntPtr nb_oct;
+        public IntPtr nb_hex;
+        public IntPtr nb_inplace_add;
+        public IntPtr nb_inplace_subtract;
+        public IntPtr nb_inplace_multiply;
+        public IntPtr nb_inplace_divide;
+        public IntPtr nb_inplace_remainder;
+        public IntPtr nb_inplace_power;
+        public IntPtr nb_inplace_lshift;
+        public IntPtr nb_inplace_rshift;
+        public IntPtr nb_inplace_and;
+        public IntPtr nb_inplace_xor;
+        public IntPtr nb_inplace_or;
+        public IntPtr nb_floor_divide;
+        public IntPtr nb_true_divide;
+        public IntPtr nb_inplace_floor_divide;
+        public IntPtr nb_inplace_true_divide;
+        public IntPtr nb_index;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct PySequenceMethods
+    {
+        public IntPtr sq_length;
+        public IntPtr sq_concat;
+        public IntPtr sq_repeat;
+        public IntPtr sq_item;
+        public IntPtr sq_slice;
+        public IntPtr sq_ass_item;
+        public IntPtr sq_ass_slice;
+        public IntPtr sq_contains;
+        public IntPtr sq_inplace_concat;
+        public IntPtr sq_inplace_repeat;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct PyMappingMethods
+    {
+        public IntPtr mp_length;
+        public IntPtr mp_subscript;
+        public IntPtr mp_ass_subscript;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct PyBufferProcs
+    {
+        public IntPtr bf_getreadbuffer;
+        public IntPtr bf_getwritebuffer;
+        public IntPtr bf_getsegcount;
+        public IntPtr bf_getcharbuffer;
+        public IntPtr bf_getbuffer;
+        public IntPtr bf_releasebuffer;
+    }
+
+    internal static partial class SlotTypes
+    {
+        public static readonly Type[] Types = {
+            typeof(PyNumberMethods),
+            typeof(PySequenceMethods),
+            typeof(PyMappingMethods),
+            typeof(PyBufferProcs),
+        };
+    }
+
+}
 #endif
Original file line number	Diff line number	Diff line change
@@ -64,6 +64,8 @@ public static void DomainReloadAndGC()
64	64	// objects is gone.
65	65	Assembly pythonRunner2 = BuildAssembly("test2");
66	66	RunAssemblyAndUnload(pythonRunner2, "test2");
	67	+
	68	+ PythonEngine.Shutdown();
67	69	}
68	70
69	71	//
Original file line number	Diff line number	Diff line change
@@ -40,6 +40,7 @@ public void SetUp()
40	40	IntPtr str = Runtime.Runtime.PyString_FromString(testPath);
41	41	IntPtr path = Runtime.Runtime.PySys_GetObject("path");
42	42	Runtime.Runtime.PyList_Append(path, str);
	43	+ Runtime.Runtime.XDecref(str);
43	44	}
44	45
45	46	[TearDown]
Original file line number	Diff line number	Diff line change
@@ -26,6 +26,7 @@ public static void LoadDefaultArgs()
26	26	using (new PythonEngine())
27	27	using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
28	28	{
	29	+ Runtime.Runtime.XIncref(argv.Handle);
29	30	Assert.AreNotEqual(0, argv.Length());
30	31	}
31	32	}
@@ -37,6 +38,7 @@ public static void LoadSpecificArgs()
37	38	using (new PythonEngine(args))
38	39	using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
39	40	{
	41	+ Runtime.Runtime.XIncref(argv.Handle);
40	42	Assert.AreEqual(args[0], argv[0].ToString());
41	43	Assert.AreEqual(args[1], argv[1].ToString());
42	44	}