summaryrefslogtreecommitdiffstats
path: root/win/tclWin32Dll.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2010-08-04 19:35:22 (GMT)
committerhobbs <hobbs>2010-08-04 19:35:22 (GMT)
commit28ba9b68895dac52cf46906480875eb1d4e2cd75 (patch)
treeaaadf08044448808ae487b9e9d5eb5e8961a88e6 /win/tclWin32Dll.c
parent2ac203fc20c03c871fcacad69347193fb37ead91 (diff)
downloadtcl-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/tclWin32Dll.c')
-rw-r--r--win/tclWin32Dll.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 3b2b0a0..45c9b83 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.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: tclWin32Dll.c,v 1.63 2010/03/11 13:35:23 nijtmans Exp $
+ * RCS: @(#) $Id: tclWin32Dll.c,v 1.64 2010/08/04 19:35:22 hobbs Exp $
*/
#include "tclWinInt.h"
@@ -142,7 +142,7 @@ static TclWinProcs asciiProcs = {
(DWORD (WINAPI *)(DWORD, TCHAR *)) GetTempPathA,
(BOOL (WINAPI *)(const TCHAR *, TCHAR *, DWORD, LPDWORD, LPDWORD, LPDWORD,
TCHAR *, DWORD)) GetVolumeInformationA,
- (HINSTANCE (WINAPI *)(const TCHAR *)) LoadLibraryA,
+ (HINSTANCE (WINAPI *)(const TCHAR *, HANDLE, DWORD)) LoadLibraryExA,
(TCHAR (WINAPI *)(TCHAR *, const TCHAR *)) lstrcpyA,
(BOOL (WINAPI *)(const TCHAR *, const TCHAR *)) MoveFileA,
(BOOL (WINAPI *)(const TCHAR *)) RemoveDirectoryA,
@@ -201,7 +201,7 @@ static TclWinProcs unicodeProcs = {
(DWORD (WINAPI *)(DWORD, TCHAR *)) GetTempPathW,
(BOOL (WINAPI *)(const TCHAR *, TCHAR *, DWORD, LPDWORD, LPDWORD, LPDWORD,
TCHAR *, DWORD)) GetVolumeInformationW,
- (HINSTANCE (WINAPI *)(const TCHAR *)) LoadLibraryW,
+ (HINSTANCE (WINAPI *)(const TCHAR *, HANDLE, DWORD)) LoadLibraryExW,
(TCHAR (WINAPI *)(TCHAR *, const TCHAR *)) lstrcpyW,
(BOOL (WINAPI *)(const TCHAR *, const TCHAR *)) MoveFileW,
(BOOL (WINAPI *)(const TCHAR *)) RemoveDirectoryW,