diff options
| author | hobbs <hobbs> | 2010-08-04 19:17:29 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2010-08-04 19:17:29 (GMT) |
| commit | 3eb4594f9d874632e81928b003b1bf818a57739b (patch) | |
| tree | 6dba9fc62dff9121c9d6361b37b163108fa11e50 /win/tclWinLoad.c | |
| parent | 005c9d765c9cd9d8ae063885428784b780d0914f (diff) | |
| download | tcl-3eb4594f9d874632e81928b003b1bf818a57739b.zip tcl-3eb4594f9d874632e81928b003b1bf818a57739b.tar.gz tcl-3eb4594f9d874632e81928b003b1bf818a57739b.tar.bz2 | |
* win/tclWin32Dll.c (asciiProcs, unicodeProcs):
* win/tclWinLoad.c (TclpDlopen): 'load' use LoadLibraryEx with
* win/tclWinInt.h (TclWinProcs): LOAD_WITH_ALTERED_SEARCH_PATH to
prefer dependent DLLs in same dir as loaded DLL.
Diffstat (limited to 'win/tclWinLoad.c')
| -rw-r--r-- | win/tclWinLoad.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c index 30bc750..9785648 100644 --- a/win/tclWinLoad.c +++ b/win/tclWinLoad.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinLoad.c,v 1.20 2007/04/20 06:11:00 kennykb Exp $ + * RCS: @(#) $Id: tclWinLoad.c,v 1.20.4.1 2010/08/04 19:17:29 hobbs Exp $ */ #include "tclWinInt.h" @@ -57,7 +57,8 @@ TclpDlopen( */ nativeName = Tcl_FSGetNativePath(pathPtr); - handle = (*tclWinProcs->loadLibraryProc)(nativeName); + handle = (*tclWinProcs->loadLibraryExProc)(nativeName, NULL, + LOAD_WITH_ALTERED_SEARCH_PATH); if (handle == NULL) { /* * Let the OS loader examine the binary search path for whatever @@ -69,7 +70,8 @@ TclpDlopen( char *fileName = Tcl_GetString(pathPtr); nativeName = Tcl_WinUtfToTChar(fileName, -1, &ds); - handle = (*tclWinProcs->loadLibraryProc)(nativeName); + handle = (*tclWinProcs->loadLibraryExProc)(nativeName, NULL, + LOAD_WITH_ALTERED_SEARCH_PATH); Tcl_DStringFree(&ds); } |