diff options
| author | hobbs <hobbs> | 2010-08-04 19:35:22 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2010-08-04 19:35:22 (GMT) |
| commit | 28ba9b68895dac52cf46906480875eb1d4e2cd75 (patch) | |
| tree | aaadf08044448808ae487b9e9d5eb5e8961a88e6 /win/tclWinLoad.c | |
| parent | 2ac203fc20c03c871fcacad69347193fb37ead91 (diff) | |
| download | tcl-28ba9b68895dac52cf46906480875eb1d4e2cd75.zip tcl-28ba9b68895dac52cf46906480875eb1d4e2cd75.tar.gz tcl-28ba9b68895dac52cf46906480875eb1d4e2cd75.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 b5924e6..6fd44d1 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.30 2010/05/11 14:47:12 nijtmans Exp $ + * RCS: @(#) $Id: tclWinLoad.c,v 1.31 2010/08/04 19:35:22 hobbs Exp $ */ #include "tclWinInt.h" @@ -77,7 +77,8 @@ TclpDlopen( */ nativeName = Tcl_FSGetNativePath(pathPtr); - hInstance = tclWinProcs->loadLibraryProc(nativeName); + hInstance = tclWinProcs->loadLibraryExProc(nativeName, NULL, + LOAD_WITH_ALTERED_SEARCH_PATH); if (hInstance == NULL) { /* * Let the OS loader examine the binary search path for whatever @@ -89,7 +90,8 @@ TclpDlopen( const char *fileName = Tcl_GetString(pathPtr); nativeName = tclWinProcs->utf2tchar(fileName, -1, &ds); - hInstance = tclWinProcs->loadLibraryProc(nativeName); + hInstance = tclWinProcs->loadLibraryExProc(nativeName, NULL, + LOAD_WITH_ALTERED_SEARCH_PATH); Tcl_DStringFree(&ds); } |