Changeset 8584 for trunk/src/shlwapi/shlwapi_main.c

Timestamp:

Jun 7, 2002, 10:02:20 AM (23 years ago)

Author:

sandervl

Message:

resynced with latest Wine

File:

• trunk/src/shlwapi/shlwapi_main.c (modified) (5 diffs)

trunk/src/shlwapi/shlwapi_main.c

@@ -4 +4 @@
  *  Copyright 1998 Marcus Meissner
  *  Copyright 1998 Juergen Schmied (jsch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -9 +23 @@
 #include "winerror.h"
 #include "winreg.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 #define NO_SHLWAPI_STREAM
-#ifndef __WIN32OS2__
 #include "shlwapi.h"
-#endif
 
-DEFAULT_DEBUG_CHANNEL(shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
-HINSTANCE shlwapi_hInstance = 0; 
+HINSTANCE shlwapi_hInstance = 0;
 HMODULE SHLWAPI_hshell32 = 0;
 HMODULE SHLWAPI_hwinmm = 0;
@@ -23 +35 @@
 HMODULE SHLWAPI_hmpr = 0;
 HMODULE SHLWAPI_hmlang = 0;
+HMODULE SHLWAPI_hversion = 0;
+
+DWORD SHLWAPI_ThreadRef_index = -1;
 
 /*************************************************************************
@@ -37 +52 @@
           case DLL_PROCESS_ATTACH:
             shlwapi_hInstance = hinstDLL;
+            SHLWAPI_ThreadRef_index = TlsAlloc();
             break;
           case DLL_PROCESS_DETACH:
@@ -44 +60 @@
             if (SHLWAPI_hmpr)      FreeLibrary(SHLWAPI_hmpr);
             if (SHLWAPI_hmlang)    FreeLibrary(SHLWAPI_hmlang);
+            if (SHLWAPI_hversion)  FreeLibrary(SHLWAPI_hversion);
+            if (SHLWAPI_ThreadRef_index >= 0) TlsFree(SHLWAPI_ThreadRef_index);
             break;
         }