Alexandre Julliard : dbghelp: Remove a useless DllMain, msvcrt can' t be unloaded.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 836b682ed3bff439f1264bc9cee4ecce6ca88bb2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=836b682ed3bff439f1264bc9ce...

Author: Alexandre Julliard 
Date:   Sat Nov  9 11:22:56 2013 +0100

dbghelp: Remove a useless DllMain, msvcrt can't be unloaded.

---

dlls/dbghelp/dbghelp.c         |   19 -------------------
 dlls/dbghelp/dbghelp_private.h |    1 -
 dlls/dbghelp/symbol.c          |    1 +
 3 files changed, 1 insertions(+), 20 deletions(-)

diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c
index b61676d..f5d0b67 100644
--- a/dlls/dbghelp/dbghelp.c
+++ b/dlls/dbghelp/dbghelp.c
@@ -65,25 +65,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
  */

unsigned   dbghelp_options = SYMOPT_UNDNAME;
-HANDLE     hMsvcrt = NULL;
-
-/***********************************************************************
- *           DllMain (DEBUGHLP.@)
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    switch (fdwReason)
-    {
-    case DLL_PROCESS_ATTACH:    break;
-    case DLL_PROCESS_DETACH:
-        if (hMsvcrt) FreeLibrary(hMsvcrt);
-        break;
-    case DLL_THREAD_ATTACH:     break;
-    case DLL_THREAD_DETACH:     break;
-    default:                    break;
-    }
-    return TRUE;
-}

static struct process* process_first /* = NULL */;

diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index f18a0fe..9390fab 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -545,7 +545,6 @@ extern struct cpu*      dbghelp_current_cpu DECLSPEC_HIDDEN;

/* dbghelp.c */
 extern struct process* process_find_by_handle(HANDLE hProcess) DECLSPEC_HIDDEN;
-extern HANDLE hMsvcrt DECLSPEC_HIDDEN;
 extern BOOL         validate_addr64(DWORD64 addr) DECLSPEC_HIDDEN;
 extern BOOL         pcs_callback(const struct process* pcs, ULONG action, void* data) DECLSPEC_HIDDEN;
 extern void*        fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HIDDEN;
diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index ebc4644..e6401a9 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -1759,6 +1759,7 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName,
                                   DWORD UndecoratedLength, DWORD Flags)
 {
     /* undocumented from msvcrt */
+    static HANDLE hMsvcrt;
     static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short);
     static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0};