Code review feedback - use utf16 mini pal functions

Author: Mike McLaughlin

src/coreclr/debug/createdump/CMakeLists.txt

@@ -86,6 +86,7 @@ else()
         crashinfounix.cpp
         threadinfounix.cpp
         dumpwriterelf.cpp
+        ${CLR_SRC_NATIVE_DIR}/minipal/utf8.c
         ${CREATEDUMP_SOURCES}
     )
 endif(CLR_CMAKE_HOST_OSX)

src/coreclr/debug/createdump/crashinfo.cpp

@@ -977,15 +977,16 @@ std::string
 ConvertString(const WCHAR* str)
 {
     if (str == nullptr)
-        return{};
+        return { };
 
-    int len = WideCharToMultiByte(CP_UTF8, 0, str, -1, nullptr, 0, nullptr, nullptr);
+    size_t cch = u16_strlen(str) + 1;
+    int len = minipal_get_length_utf16_to_utf8((CHAR16_T*)str, cch, 0);
     if (len == 0)
-        return{};
+        return { };
 
     ArrayHolder<char> buffer = new char[len + 1];
-    WideCharToMultiByte(CP_UTF8, 0, str, -1, buffer, len + 1, nullptr, nullptr);
-    return std::string{ buffer };
+    minipal_convert_utf16_to_utf8((CHAR16_T*)str, cch, buffer, len + 1, 0);
+    return std::string { buffer };
 }
 
 //

src/coreclr/debug/createdump/createdump.h

@@ -53,6 +53,8 @@ typedef int T_CONTEXT;
 #include <arrayholder.h>
 #include <releaseholder.h>
 #ifdef HOST_UNIX
+#include <minipal/utf8.h>
+#include <dn-u16.h>
 #include <dumpcommon.h>
 #include <clrconfignocache.h>
 #include <unistd.h>

src/coreclr/debug/createdump/createdumppal.cpp

@@ -33,22 +33,11 @@ typedef BOOL (*PFN_PAL_GetUnwindInfoSize)(
     PULONG64 ehFrameStart,
     PULONG64 ehFrameSize);
 
-typedef int (*PFN_WideCharToMultiByte)(
-    IN UINT codePage,
-    IN DWORD dwFlags,
-    IN LPCWSTR lpWideCharStr,
-    IN int cchWideChar,
-    OUT LPSTR lpMultiByteStr,
-    IN int cbMultiByte,
-    IN LPCSTR lpDefaultChar,
-    OUT LPBOOL lpUsedDefaultChar);
-
 bool g_initialized = false;
 PFN_PAL_InitializeDLL g_PAL_InitializeDLL = nullptr;
 PFN_PAL_TerminateEx g_PAL_TerminateEx = nullptr;
 PFN_PAL_VirtualUnwindOutOfProc g_PAL_VirtualUnwindOutOfProc = nullptr;
 PFN_PAL_GetUnwindInfoSize g_PAL_GetUnwindInfoSize = nullptr;
-PFN_WideCharToMultiByte g_WideCharToMultiByte = nullptr;
 
 bool
 InitializePAL()
@@ -94,7 +83,6 @@ InitializePAL()
     g_PAL_TerminateEx = (PFN_PAL_TerminateEx)dlsym(dacModule, PAL_FUNCTION_PREFIX "PAL_TerminateEx");
     g_PAL_VirtualUnwindOutOfProc = (PFN_PAL_VirtualUnwindOutOfProc)dlsym(dacModule, PAL_FUNCTION_PREFIX "PAL_VirtualUnwindOutOfProc");
     g_PAL_GetUnwindInfoSize = (PFN_PAL_GetUnwindInfoSize)dlsym(dacModule, PAL_FUNCTION_PREFIX "PAL_GetUnwindInfoSize");
-    g_WideCharToMultiByte = (PFN_WideCharToMultiByte)dlsym(dacModule, PAL_FUNCTION_PREFIX "WideCharToMultiByte");
     return true;
 }
 
@@ -214,25 +202,6 @@ PAL_GetUnwindInfoSize(
     return g_PAL_GetUnwindInfoSize(baseAddress, ehFrameHdrAddr, readMemoryCallback, ehFrameStart, ehFrameSize);
 }
 
-int
-PALAPI
-WideCharToMultiByte(
-    IN UINT codePage,
-    IN DWORD dwFlags,
-    IN LPCWSTR lpWideCharStr,
-    IN int cchWideChar,
-    OUT LPSTR lpMultiByteStr,
-    IN int cbMultiByte,
-    IN LPCSTR lpDefaultChar,
-    OUT LPBOOL lpUsedDefaultChar)
-{
-    if (!InitializePAL() || g_WideCharToMultiByte == nullptr)
-    {
-        return 0;
-    }
-    return g_WideCharToMultiByte(codePage, dwFlags, lpWideCharStr, cchWideChar, lpMultiByteStr, cbMultiByte, lpDefaultChar, lpUsedDefaultChar);
-}
-
 //
 // Used in pal\inc\rt\safecrt.h's _invalid_parameter handler
 //
@@ -248,6 +217,14 @@ RaiseException(
     throw;
 }
 
+size_t u16_strlen(const WCHAR* str)
+{
+    size_t nChar = 0;
+    while (*str++)
+        nChar++;
+    return nChar;
+}
+
 //
 // Used by _ASSERTE
 //

src/coreclr/debug/createdump/datatarget.cpp

@@ -102,12 +102,12 @@ DumpDataTarget::GetImageBase(
     *baseAddress = 0;
 
     char tempModuleName[MAX_PATH];
-    int length = WideCharToMultiByte(CP_ACP, 0, moduleName, -1, tempModuleName, sizeof(tempModuleName), NULL, NULL);
+    size_t cch = u16_strlen(moduleName) + 1;
+    int length = minipal_convert_utf16_to_utf8((CHAR16_T*)moduleName, cch, tempModuleName, sizeof(tempModuleName), 0);
     if (length > 0)
     {
         *baseAddress = m_crashInfo.GetBaseAddressFromName(tempModuleName);
     }
-
     return *baseAddress != 0 ? S_OK : E_FAIL;
 }