From: Guido van Rossum <guido@python.org>
Date: Thu, 8 Oct 1998 01:44:41 +0000 (+0000)
Subject: On Win32, use
X-Git-Tag: v1.5.2a2~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f8b30f8ce795c62b81ad5a922c8c3f232e7784a;p=thirdparty%2FPython%2Fcpython.git

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 c7a4812def5c..8238556910a0 100644
--- 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;