Solve more issues on python.

Author: viferga

source/loaders/py_loader/include/py_loader/py_loader_symbol_fallback.h

@@ -48,6 +48,7 @@ PY_LOADER_NO_EXPORT int PyCFunction_Check(const PyObject *ob);
 PY_LOADER_NO_EXPORT int PyModule_Check(const PyObject *ob);
 #endif
 
+PY_LOADER_NO_EXPORT PyTypeObject *PyTypeTypePtr(void);
 PY_LOADER_NO_EXPORT PyObject *Py_NonePtr(void);
 PY_LOADER_NO_EXPORT PyObject *Py_ReturnNone(void);
 PY_LOADER_NO_EXPORT PyObject *Py_ReturnFalse(void);

source/loaders/py_loader/source/py_loader_impl.c

@@ -3941,8 +3941,8 @@ int py_loader_impl_discover_module(loader_impl impl, PyObject *module, context c
 	while (PyDict_Next(module_dict, &position, &module_dict_key, &module_dict_val))
 	{
 		// Class is also PyCallable, so test for class first
-		if (PyObject_TypeCheck(module_dict_val, &PyType_Type))
-		// PyObject_IsSubclass(module_dict_val, (PyObject *)&PyType_Type) == 0
+		if (PyObject_TypeCheck(module_dict_val, PyTypeTypePtr()))
+		// PyObject_IsSubclass(module_dict_val, (PyObject *)PyTypeTypePtr()) == 0
 		{
 			const char *cls_name = PyUnicode_AsUTF8(module_dict_key);
 

source/loaders/py_loader/source/py_loader_symbol_fallback.c

@@ -31,6 +31,7 @@ static PyTypeObject *PyCapsule_TypePtr = NULL;
 static PyTypeObject *PyFunction_TypePtr = NULL;
 static PyTypeObject *PyCFunction_TypePtr = NULL;
 static PyTypeObject *PyModule_TypePtr = NULL;
+static PyTypeObject *PyType_TypePtr = NULL;
 static PyObject *Py_NoneStructPtr = NULL;
 static PyObject *Py_FalseStructPtr = NULL;
 static PyObject *Py_TrueStructPtr = NULL;
@@ -92,7 +93,15 @@ int py_loader_symbol_fallback_initialize(dynlink py_library)
 		return 1;
 	}
 
-	dynlink_symbol_uncast_type(address, PyTypeObject *, PyModule_TypePtr);
+	dynlink_symbol_uncast_type(address, PyTypeObject *, PyCFunction_TypePtr);
+
+	/* PyType_Type */
+	if (dynlink_symbol(py_library, "PyType_Type", &address) != 0)
+	{
+		return 1;
+	}
+
+	dynlink_symbol_uncast_type(address, PyTypeObject *, PyType_TypePtr);
 
 	/* Py_None */
 	if (dynlink_symbol(py_library, "_Py_NoneStruct", &address) != 0)
@@ -157,6 +166,15 @@ int PyModule_Check(const PyObject *ob)
 }
 #endif
 
+PyTypeObject *PyTypeTypePtr(void)
+{
+#if defined(_WIN32) && defined(_MSC_VER)
+	return PyType_TypePtr;
+#else
+	return &PyType_Type;
+#endif
+}
+
 PyObject *Py_NonePtr(void)
 {
 #if defined(_WIN32) && defined(_MSC_VER)