[Python-checkins] cpython: Removed a Windows 9x trick used before LoadLibraryExW.

Fri Jun 10 00:56:02 CEST 2011

http://hg.python.org/cpython/rev/f8aacfd3b070
changeset: 70749:f8aacfd3b070
parent: 70747:2e49722c7263
user: Brian Curtin <brian at python.org>
date: Thu Jun 09 17:55:54 2011 -0500
summary:
 Removed a Windows 9x trick used before LoadLibraryExW.
Windows 9x has long been unsupported and the result of GetFullPathName
was not even being used in the first place.
files:
 Python/dynload_win.c | 25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Python/dynload_win.c b/Python/dynload_win.c
--- a/Python/dynload_win.c
+++ b/Python/dynload_win.c
@@ -185,28 +185,19 @@
 
 {
 HINSTANCE hDLL = NULL;
- wchar_t pathbuf[260];
 unsigned int old_mode;
 ULONG_PTR cookie = 0;
- /* We use LoadLibraryEx so Windows looks for dependent DLLs
- in directory of pathname first. However, Windows95
- can sometimes not work correctly unless the absolute
- path is used. If GetFullPathName() fails, the LoadLibrary
- will certainly fail too, so use its error code */
-
+ 
 /* Don't display a message box when Python can't load a DLL */
 old_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
 
- if (GetFullPathNameW(PyUnicode_AS_UNICODE(pathname),
- sizeof(pathbuf) / sizeof(pathbuf[0]),
- pathbuf,
- NULL)) {
- ULONG_PTR cookie = _Py_ActivateActCtx();
- /* XXX This call doesn't exist in Windows CE */
- hDLL = LoadLibraryExW(PyUnicode_AS_UNICODE(pathname), NULL,
- LOAD_WITH_ALTERED_SEARCH_PATH);
- _Py_DeactivateActCtx(cookie);
- }
+ cookie = _Py_ActivateActCtx();
+ /* We use LoadLibraryEx so Windows looks for dependent DLLs
+ in directory of pathname first. */
+ /* XXX This call doesn't exist in Windows CE */
+ hDLL = LoadLibraryExW(PyUnicode_AS_UNICODE(pathname), NULL,
+ LOAD_WITH_ALTERED_SEARCH_PATH);
+ _Py_DeactivateActCtx(cookie);
 
 /* restore old error mode settings */
 SetErrorMode(old_mode);
-- 
Repository URL: http://hg.python.org/cpython
