On Win32, use

LoadLibraryEx(pathname, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)
to search dependent DLLs in the directory of the pathname.

diff --git a/Python/importdl.c b/Python/importdl.c
index c7a4812def5c62f85684966968f186c90a5c9d4f..8238556910a06ccdd6fb537d0c88520f94ee517c 100644 (file)
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -493,7 +493,10 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
                        sprintf(p, ".\\%-.255s", pathname);
                        pathname = pathbuf;
                }
-               hDLL = LoadLibrary(pathname);
+               /* Look for dependent DLLs in directory of pathname first */
+               /* XXX This call doesn't exist in Windows CE */
+               hDLL = LoadLibraryEx(pathname, NULL,
+                                    LOAD_WITH_ALTERED_SEARCH_PATH);
                if (hDLL==NULL){
                        char errBuf[256];
                        unsigned int errorCode;