From a9ae76826efb7e0e57c35c48b9063745eb2ac5b3 Mon Sep 17 00:00:00 2001 From: Jon Griffiths Date: Tue, 22 Jul 2003 00:57:25 +0000 Subject: [PATCH] Add a handle for urlmon.dll, fix MSVC warning. --- dlls/shlwapi/shlwapi_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 8dea829651..2e890e52be 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -35,9 +35,10 @@ HMODULE SHLWAPI_hcomdlg32 = 0; HMODULE SHLWAPI_hcomctl32 = 0; HMODULE SHLWAPI_hmpr = 0; HMODULE SHLWAPI_hmlang = 0; +HMODULE SHLWAPI_hurlmon = 0; HMODULE SHLWAPI_hversion = 0; -DWORD SHLWAPI_ThreadRef_index = -1; +DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; /************************************************************************* * SHLWAPI {SHLWAPI} @@ -76,8 +77,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) if (SHLWAPI_hcomctl32) FreeLibrary(SHLWAPI_hcomctl32); if (SHLWAPI_hmpr) FreeLibrary(SHLWAPI_hmpr); if (SHLWAPI_hmlang) FreeLibrary(SHLWAPI_hmlang); + if (SHLWAPI_hurlmon) FreeLibrary(SHLWAPI_hurlmon); if (SHLWAPI_hversion) FreeLibrary(SHLWAPI_hversion); - if (SHLWAPI_ThreadRef_index >= 0) TlsFree(SHLWAPI_ThreadRef_index); + if (SHLWAPI_ThreadRef_index != TLS_OUT_OF_INDEXES) TlsFree(SHLWAPI_ThreadRef_index); break; } return TRUE;