Zebediah Figura : dbghelp: Link directly to __unDName.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b70f9680c40d9726e39f75cf1b21e150c45e8975
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b70f9680c40d9726e39f75cf1...

Author: Zebediah Figura 
Date:   Wed Apr 21 20:25:00 2021 -0500

dbghelp: Link directly to __unDName.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/dbghelp/symbol.c | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 706d088aec0..2ca85a6d6e8 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -1782,25 +1782,8 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName
                                 UNDNAME_COMPLETE) != 0;
 }

-static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); }
-static void   CDECL und_free (void* ptr)  { HeapFree(GetProcessHeap(), 0, ptr); }
-
-static char *und_name(char *buffer, const char *mangled, int buflen, unsigned short 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};
-
-    if (!p_undname)
-    {
-        if (!hMsvcrt) hMsvcrt = LoadLibraryW(szMsvcrt);
-        if (hMsvcrt) p_undname = (void*)GetProcAddress(hMsvcrt, "__unDName");
-        if (!p_undname) return NULL;
-    }
-
-    return p_undname(buffer, mangled, buflen, und_alloc, und_free, flags);
-}
+extern char * CDECL __unDName(char *buffer, const char *mangled, int len,
+        void * (CDECL *pfn_alloc)(size_t), void (CDECL *pfn_free)(void *), unsigned short flags);

/***********************************************************************
  *		UnDecorateSymbolName (DBGHELP.@)
@@ -1813,7 +1796,7 @@ DWORD WINAPI UnDecorateSymbolName(const char *decorated_name, char *undecorated_

if (!undecorated_name || !undecorated_length)
         return 0;
-    if (!und_name(undecorated_name, decorated_name, undecorated_length, flags))
+    if (!__unDName(undecorated_name, decorated_name, undecorated_length, malloc, free, flags))
         return 0;
     return strlen(undecorated_name);
 }
@@ -1837,12 +1820,12 @@ DWORD WINAPI UnDecorateSymbolNameW(const WCHAR *decorated_name, WCHAR *undecorat
     if ((buf = HeapAlloc(GetProcessHeap(), 0, len)))
     {
         WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, buf, len, NULL, NULL);
-        if ((ptr = und_name(NULL, buf, 0, flags)))
+        if ((ptr = __unDName(NULL, buf, 0, malloc, free, flags)))
         {
             MultiByteToWideChar(CP_ACP, 0, ptr, -1, undecorated_name, undecorated_length);
             undecorated_name[undecorated_length - 1] = 0;
             ret = lstrlenW(undecorated_name);
-            und_free(ptr);
+            free(ptr);
         }
         HeapFree(GetProcessHeap(), 0, buf);
     }