From b66841ea4bec70fd61376e03b18f77570d632a35 Mon Sep 17 00:00:00 2001 From: Roumen Petrov Date: Sat, 16 Feb 2013 19:33:23 +0200 Subject: [PATCH 3/5] MINGW: support stdcall without underscore --- Modules/_ctypes/_ctypes.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index a93290e..2103f9e 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3036,11 +3036,28 @@ static PPROC FindAddress(void *handle, char *name, PyObject *type) mangled_name = alloca(strlen(name) + 1 + 1 + 1 + 3); /* \0 _ @ %d */ if (!mangled_name) return NULL; + /* Issue: for stdcall decorated export functions MSVC compiler adds + * underscore, but GCC compiler create them without. This is + * visible by example for _ctypes_test.pyd module. + * As well functions from system libraries are without underscore. + * Solutions: + * - If a python module is build with gcc option --add-stdcall-alias + * the module will contain XXX as alias for function XXX@ as result + * first search in this method will succeed. + * - Distutil may use compiler to create def-file, to modify it as + * add underscore alias and with new def file to create module. + * - Or may be just to search for function without underscore. + */ for (i = 0; i < 32; ++i) { sprintf(mangled_name, "_%s@%d", name, i*4); address = (PPROC)GetProcAddress(handle, mangled_name); if (address) return address; + /* search for function without underscore as weel */ + sprintf(mangled_name, "%s@%d", name, i*4); + address = (PPROC)GetProcAddress(handle, mangled_name); + if (address) + return address; } return NULL; #endif -- 1.7.12.1