From: Guido van Rossum <guido@python.org>
Date: Sat, 27 Jun 1998 21:53:17 +0000 (+0000)
Subject: Windows-specific hack to make sure that when LoadLibrary() is called,
X-Git-Tag: v1.5.2a1~404
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5e1b008a97f7c3c0ecf94543f1c3306d6c0e7e8;p=python

Windows-specific hack to make sure that when LoadLibrary() is called,
the filename contains at least a rudimentary pathname.
(The bad part is that we need to call getcwd() because only a prefix
of ".\\" is not enough -- we prefix the drive letter.)
---

diff --git a/Python/importdl.c b/Python/importdl.c
index fe025c0838..5d78bab885 100644
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -104,6 +104,7 @@ typedef int (* APIENTRY dl_funcptr)();
 #ifdef MS_WINDOWS /* i.e. MS_WIN32 or MS_WIN16 */
 #define DYNAMIC_LINK
 #include <windows.h>
+#include <direct.h>
 typedef FARPROC dl_funcptr;
 #define _DL_FUNCPTR_DEFINED
 #ifdef _DEBUG
@@ -419,6 +420,19 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
 #ifdef MS_WIN32
 	{
 		HINSTANCE hDLL;
+		char pathbuf[260];
+		if (strchr(pathname, SEP) == NULL &&
+		    strchr(pathname, ALTSEP) == NULL)
+		{
+			/* Prefix bare filename with ".\" */
+			char *p = pathbuf;
+			*p = '\0';
+			_getcwd(pathbuf, sizeof pathbuf);
+			if (*p != '\0' && p[1] == ':')
+				p += 2;
+			sprintf(p, ".\\%-.255s", pathname);
+			pathname = pathbuf;
+		}
 		hDLL = LoadLibrary(pathname);
 		if (hDLL==NULL){
 			char errBuf[256];
@@ -471,6 +485,14 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
 #ifdef MS_WIN16
 	{
 		HINSTANCE hDLL;
+		char pathbuf[16];
+		if (strchr(pathname, SEP) == NULL &&
+		    strchr(pathname, ALTSEP) == NULL)
+		{
+			/* Prefix bare filename with ".\" */
+			sprintf(pathbuf, ".\\%-.13s", pathname);
+			pathname = pathbuf;
+		}
 		hDLL = LoadLibrary(pathname);
 		if (hDLL < HINSTANCE_ERROR){
 			char errBuf[256];