Use GetModuleHandle() in stead of LoadLibrary() when the handle is needed for an already loaded dll.

Fix filesystem-1.52 (only works correctly on UNIX)

4 files changed, 92 insertions, 103 deletions

diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 28e5268..d34de8f 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -498,7 +498,7 @@ test filesystem-1.51.1 {file normalisation .. beyond root (Bug 1379287)} {
         set res "ok"
     }
 } {ok}
-test filesystem-1.52 {bug f9f390d0fa: file join where strep is not canonical} -body {
+test filesystem-1.52 {bug f9f390d0fa: file join where strep is not canonical} -constraints unix -body {
     set x //foo
     file normalize $x
     file join $x bar
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index e5e5202..560b448 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -619,93 +619,85 @@ TclWinSetInterfaces(
 	tclWinProcs = &unicodeProcs;
 	tclWinTCharEncoding = Tcl_GetEncoding(NULL, "unicode");
 	if (tclWinProcs->getFileAttributesExProc == NULL) {
-	    HINSTANCE hInstance = LoadLibraryA("kernel32");
-	    if (hInstance != NULL) {
-		tclWinProcs->getFileAttributesExProc =
-			(BOOL (WINAPI *)(CONST TCHAR *, GET_FILEEX_INFO_LEVELS,
-			LPVOID)) GetProcAddress(hInstance,
-			"GetFileAttributesExW");
-		tclWinProcs->createHardLinkProc =
-			(BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR*,
-			LPSECURITY_ATTRIBUTES)) GetProcAddress(hInstance,
-			"CreateHardLinkW");
-		tclWinProcs->findFirstFileExProc =
-			(HANDLE (WINAPI *)(CONST TCHAR*, UINT, LPVOID, UINT,
-			LPVOID, DWORD)) GetProcAddress(hInstance,
-			"FindFirstFileExW");
-		tclWinProcs->getVolumeNameForVMPProc =
-			(BOOL (WINAPI *)(CONST TCHAR*, TCHAR*,
-			DWORD)) GetProcAddress(hInstance,
-			"GetVolumeNameForVolumeMountPointW");
-		tclWinProcs->getLongPathNameProc =
-			(DWORD (WINAPI *)(CONST TCHAR*, TCHAR*,
-			DWORD)) GetProcAddress(hInstance, "GetLongPathNameW");
-		FreeLibrary(hInstance);
-	    }
-	    hInstance = LoadLibraryA("advapi32");
-	    if (hInstance != NULL) {
-		tclWinProcs->getFileSecurityProc = (BOOL (WINAPI *)(
-			LPCTSTR lpFileName,
-			SECURITY_INFORMATION RequestedInformation,
-			PSECURITY_DESCRIPTOR pSecurityDescriptor,
-			DWORD nLength, LPDWORD lpnLengthNeeded))
-			GetProcAddress(hInstance, "GetFileSecurityW");
-		tclWinProcs->impersonateSelfProc = (BOOL (WINAPI *) (
-			SECURITY_IMPERSONATION_LEVEL ImpersonationLevel))
-			GetProcAddress(hInstance, "ImpersonateSelf");
-		tclWinProcs->openThreadTokenProc = (BOOL (WINAPI *) (
-			HANDLE ThreadHandle, DWORD DesiredAccess,
-			BOOL OpenAsSelf, PHANDLE TokenHandle))
-			GetProcAddress(hInstance, "OpenThreadToken");
-		tclWinProcs->revertToSelfProc = (BOOL (WINAPI *) (void))
-			GetProcAddress(hInstance, "RevertToSelf");
-		tclWinProcs->mapGenericMaskProc = (VOID (WINAPI *) (
-			PDWORD AccessMask, PGENERIC_MAPPING GenericMapping))
-			GetProcAddress(hInstance, "MapGenericMask");
-		tclWinProcs->accessCheckProc = (BOOL (WINAPI *)(
-			PSECURITY_DESCRIPTOR pSecurityDescriptor,
-			HANDLE ClientToken, DWORD DesiredAccess,
-			PGENERIC_MAPPING GenericMapping,
-			PPRIVILEGE_SET PrivilegeSet,
-			LPDWORD PrivilegeSetLength, LPDWORD GrantedAccess,
-			LPBOOL AccessStatus)) GetProcAddress(hInstance,
-			"AccessCheck");
-		FreeLibrary(hInstance);
-	    }
+	    HMODULE handle = GetModuleHandle(TEXT("KERNEL32"));
+	    tclWinProcs->getFileAttributesExProc =
+		    (BOOL (WINAPI *)(CONST TCHAR *, GET_FILEEX_INFO_LEVELS,
+		    LPVOID)) GetProcAddress(handle,
+		    "GetFileAttributesExW");
+	    tclWinProcs->createHardLinkProc =
+		    (BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR*,
+		    LPSECURITY_ATTRIBUTES)) GetProcAddress(handle,
+		    "CreateHardLinkW");
+	    tclWinProcs->findFirstFileExProc =
+		    (HANDLE (WINAPI *)(CONST TCHAR*, UINT, LPVOID, UINT,
+		    LPVOID, DWORD)) GetProcAddress(handle,
+		    "FindFirstFileExW");
+	    tclWinProcs->getVolumeNameForVMPProc =
+		    (BOOL (WINAPI *)(CONST TCHAR*, TCHAR*,
+		    DWORD)) GetProcAddress(handle,
+		    "GetVolumeNameForVolumeMountPointW");
+	    tclWinProcs->getLongPathNameProc =
+		    (DWORD (WINAPI *)(CONST TCHAR*, TCHAR*,
+		    DWORD)) GetProcAddress(handle, "GetLongPathNameW");
+
+	    handle = GetModuleHandle(TEXT("ADVAPI32"));
+	    tclWinProcs->getFileSecurityProc = (BOOL (WINAPI *)(
+		    LPCTSTR lpFileName,
+		    SECURITY_INFORMATION RequestedInformation,
+		    PSECURITY_DESCRIPTOR pSecurityDescriptor,
+		    DWORD nLength, LPDWORD lpnLengthNeeded))
+		    GetProcAddress(handle, "GetFileSecurityW");
+	    tclWinProcs->impersonateSelfProc = (BOOL (WINAPI *) (
+		    SECURITY_IMPERSONATION_LEVEL ImpersonationLevel))
+		    GetProcAddress(handle, "ImpersonateSelf");
+	    tclWinProcs->openThreadTokenProc = (BOOL (WINAPI *) (
+		    HANDLE ThreadHandle, DWORD DesiredAccess,
+		    BOOL OpenAsSelf, PHANDLE TokenHandle))
+		    GetProcAddress(handle, "OpenThreadToken");
+	    tclWinProcs->revertToSelfProc = (BOOL (WINAPI *) (void))
+		    GetProcAddress(handle, "RevertToSelf");
+	    tclWinProcs->mapGenericMaskProc = (VOID (WINAPI *) (
+		    PDWORD AccessMask, PGENERIC_MAPPING GenericMapping))
+		    GetProcAddress(handle, "MapGenericMask");
+	    tclWinProcs->accessCheckProc = (BOOL (WINAPI *)(
+		    PSECURITY_DESCRIPTOR pSecurityDescriptor,
+		    HANDLE ClientToken, DWORD DesiredAccess,
+		    PGENERIC_MAPPING GenericMapping,
+		    PPRIVILEGE_SET PrivilegeSet,
+		    LPDWORD PrivilegeSetLength, LPDWORD GrantedAccess,
+		    LPBOOL AccessStatus)) GetProcAddress(handle,
+		    "AccessCheck");
 	}
     } else {
 	tclWinProcs = &asciiProcs;
 	tclWinTCharEncoding = NULL;
 	if (tclWinProcs->getFileAttributesExProc == NULL) {
-	    HINSTANCE hInstance = LoadLibraryA("kernel32");
-	    if (hInstance != NULL) {
-		tclWinProcs->getFileAttributesExProc =
-			(BOOL (WINAPI *)(CONST TCHAR *, GET_FILEEX_INFO_LEVELS,
-			LPVOID)) GetProcAddress(hInstance,
-			"GetFileAttributesExA");
-		tclWinProcs->createHardLinkProc =
-			(BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR*,
-			LPSECURITY_ATTRIBUTES)) GetProcAddress(hInstance,
-			"CreateHardLinkA");
-		tclWinProcs->findFirstFileExProc = NULL;
-		tclWinProcs->getLongPathNameProc = NULL;
-		/*
-		 * The 'findFirstFileExProc' function exists on some of
-		 * 95/98/ME, but it seems not to work as anticipated.
-		 * Therefore we don't set this function pointer. The relevant
-		 * code will fall back on a slower approach using the normal
-		 * findFirstFileProc.
-		 *
-		 * (HANDLE (WINAPI *)(CONST TCHAR*, UINT,
-		 * LPVOID, UINT, LPVOID, DWORD)) GetProcAddress(hInstance,
-		 * "FindFirstFileExA");
-		 */
-		tclWinProcs->getVolumeNameForVMPProc =
-			(BOOL (WINAPI *)(CONST TCHAR*, TCHAR*,
-			DWORD)) GetProcAddress(hInstance,
-			"GetVolumeNameForVolumeMountPointA");
-		FreeLibrary(hInstance);
-	    }
+	    HMODULE handle = GetModuleHandle(TEXT("KERNEL32"));
+	    tclWinProcs->getFileAttributesExProc =
+		    (BOOL (WINAPI *)(CONST TCHAR *, GET_FILEEX_INFO_LEVELS,
+		    LPVOID)) GetProcAddress(handle,
+		    "GetFileAttributesExA");
+	    tclWinProcs->createHardLinkProc =
+		    (BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR*,
+		    LPSECURITY_ATTRIBUTES)) GetProcAddress(handle,
+		    "CreateHardLinkA");
+	    tclWinProcs->findFirstFileExProc = NULL;
+	    tclWinProcs->getLongPathNameProc = NULL;
+	    /*
+	     * The 'findFirstFileExProc' function exists on some of
+	     * 95/98/ME, but it seems not to work as anticipated.
+	     * Therefore we don't set this function pointer. The relevant
+	     * code will fall back on a slower approach using the normal
+	     * findFirstFileProc.
+	     *
+	     * (HANDLE (WINAPI *)(CONST TCHAR*, UINT,
+	     * LPVOID, UINT, LPVOID, DWORD)) GetProcAddress(handle,
+	     * "FindFirstFileExA");
+	     */
+	    tclWinProcs->getVolumeNameForVMPProc =
+		    (BOOL (WINAPI *)(CONST TCHAR*, TCHAR*,
+		    DWORD)) GetProcAddress(handle,
+		    "GetVolumeNameForVolumeMountPointA");
 	}
     }
 }
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 4e860b2..1ba7a31 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -569,16 +569,13 @@ TclpSetVariables(
 	    TclGetProcessGlobalValue(&defaultLibraryDir), TCL_GLOBAL_ONLY);
 
     if (!osInfoInitialized) {
-	HANDLE handle = LoadLibraryW(L"NTDLL");
+	HMODULE handle = GetModuleHandle(TEXT("NTDLL"));
 	int(__stdcall *getversion)(void *) =
 		(int(__stdcall *)(void *)) GetProcAddress(handle, "RtlGetVersion");
 	osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
 	if (!getversion || getversion(&osInfo)) {
 	    GetVersionExW(&osInfo);
 	}
-	if (handle) {
-		FreeLibrary(handle);
-	}
 	osInfoInitialized = 1;
     }
     GetSystemInfo(&sys.info);
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index e493fbf..73f4e45 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -466,37 +466,37 @@ TestplatformChmod(
 	TCL_DECLARE_MUTEX(initializeMutex)
 	Tcl_MutexLock(&initializeMutex);
 	if (!initialized) {
-	    HINSTANCE hInstance = LoadLibrary("Advapi32");
+	    HMODULE handle = GetModuleHandle(TEXT("ADVAPI"));
 
-	    if (hInstance != NULL) {
+	    if (handle != NULL) {
 		setNamedSecurityInfoProc = (setNamedSecurityInfoADef)
-			GetProcAddress(hInstance, "SetNamedSecurityInfoA");
+			GetProcAddress(handle, "SetNamedSecurityInfoA");
 		getFileSecurityProc = (getFileSecurityADef)
-			GetProcAddress(hInstance, "GetFileSecurityA");
+			GetProcAddress(handle, "GetFileSecurityA");
 		getAceProc = (getAceDef)
-			GetProcAddress(hInstance, "GetAce");
+			GetProcAddress(handle, "GetAce");
 		addAceProc = (addAceDef)
-			GetProcAddress(hInstance, "AddAce");
+			GetProcAddress(handle, "AddAce");
 		equalSidProc = (equalSidDef)
-			GetProcAddress(hInstance, "EqualSid");
+			GetProcAddress(handle, "EqualSid");
 		addAccessDeniedAceProc = (addAccessDeniedAceDef)
-			GetProcAddress(hInstance, "AddAccessDeniedAce");
+			GetProcAddress(handle, "AddAccessDeniedAce");
 		initializeAclProc = (initializeAclDef)
-			GetProcAddress(hInstance, "InitializeAcl");
+			GetProcAddress(handle, "InitializeAcl");
 		getLengthSidProc = (getLengthSidDef)
-			GetProcAddress(hInstance, "GetLengthSid");
+			GetProcAddress(handle, "GetLengthSid");
 		getAclInformationProc = (getAclInformationDef)
-			GetProcAddress(hInstance, "GetAclInformation");
+			GetProcAddress(handle, "GetAclInformation");
 		getSecurityDescriptorDaclProc = (getSecurityDescriptorDaclDef)
-			GetProcAddress(hInstance, "GetSecurityDescriptorDacl");
+			GetProcAddress(handle, "GetSecurityDescriptorDacl");
 		lookupAccountNameProc = (lookupAccountNameADef)
-			GetProcAddress(hInstance, "LookupAccountNameA");
+			GetProcAddress(handle, "LookupAccountNameA");
 		getSidLengthRequiredProc = (getSidLengthRequiredDef)
-			GetProcAddress(hInstance, "GetSidLengthRequired");
+			GetProcAddress(handle, "GetSidLengthRequired");
 		initializeSidProc = (initializeSidDef)
-			GetProcAddress(hInstance, "InitializeSid");
+			GetProcAddress(handle, "InitializeSid");
 		getSidSubAuthorityProc = (getSidSubAuthorityDef)
-			GetProcAddress(hInstance, "GetSidSubAuthority");
+			GetProcAddress(handle, "GetSidSubAuthority");
 
 		if (setNamedSecurityInfoProc && getAceProc && addAceProc
 			&& equalSidProc && addAccessDeniedAceProc