Cleanup some string operating functions (dotnet#96099)

* IsStringLongerThan -> strnlen * StringCchCopy -> u16_strcpy_s * Delete strsafe.h * Remove FString usage in SString * Remove fstring usage from corhlprpriv.h * Remove fstring * Only add link for utf8 on osx --------- Co-authored-by: Adeel Mujahid <[email protected]> Co-authored-by: Aaron Robinson <[email protected]>
tmds · Jan 4, 2024 · bc81c55 · bc81c55
1 parent 6059d9f
commit bc81c55
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 757 deletions.
diff --git a/src/coreclr/debug/daccess/inspect.cpp b/src/coreclr/debug/daccess/inspect.cpp
@@ -1049,8 +1049,8 @@ ClrDataValue::GetString(
             {
                 *strLen = static_cast<ULONG32>(u16_strlen(msgStr) + 1);
             }
-            status = StringCchCopy(str, bufLen, msgStr) == S_OK ?
-                S_OK : S_FALSE;
+
+            status = u16_strcpy_s(str, bufLen, msgStr) != NULL ? S_OK : S_FALSE;
         }
         else
         {

diff --git a/src/coreclr/debug/daccess/stack.cpp b/src/coreclr/debug/daccess/stack.cpp
@@ -830,7 +830,7 @@ ClrDataFrame::GetArgumentByIndex(
                     *nameLen = 5;
                 }
 
-                StringCchCopy(name, bufLen, W("this"));
+                u16_strcpy_s(name, bufLen, W("this"));
             }
             else
             {

diff --git a/src/coreclr/debug/daccess/stdafx.h b/src/coreclr/debug/daccess/stdafx.h
@@ -50,11 +50,6 @@
 #include "dacimpl.h"
 
 
-#define STRSAFE_NO_DEPRECATE
-#include <strsafe.h>
-#undef _ftcscat
-#undef _ftcscpy
-
 // from ntstatus.h
 #define STATUS_STOWED_EXCEPTION          ((NTSTATUS)0xC000027BL)
 

diff --git a/src/coreclr/debug/daccess/task.cpp b/src/coreclr/debug/daccess/task.cpp
@@ -732,8 +732,7 @@ ClrDataAppDomain::GetName(
             }
             else
             {
-                status = StringCchCopy(name, bufLen, (PCWSTR)rawName) == S_OK ?
-                    S_OK : S_FALSE;
+                status = u16_strcpy_s(name, bufLen, (PCWSTR)rawName) != NULL ? S_OK : S_FALSE;
                 if (nameLen)
                 {
                     size_t cchName = u16_strlen((PCWSTR)rawName) + 1;
@@ -4768,7 +4767,7 @@ ClrDataExceptionState::GetString(
                                                  message->GetStringLength(),
                                                  true);
 
-            status = StringCchCopy(str, bufLen, msgStr) == S_OK ? S_OK : S_FALSE;
+            status = u16_strcpy_s(str, bufLen, msgStr) != NULL ? S_OK : S_FALSE;
             if (strLen != NULL)
             {
                 size_t cchName = u16_strlen(msgStr) + 1;

diff --git a/src/coreclr/ilasm/main.cpp b/src/coreclr/ilasm/main.cpp
@@ -11,7 +11,6 @@
 #include "clrversion.h"
 #include "shimload.h"
 
-#include "strsafe.h"
 #define ASSERTE_ALL_BUILDS(expr) _ASSERTE_ALL_BUILDS((expr))
 
 WCHAR* EqualOrColon(_In_ __nullterminated WCHAR* szArg)

diff --git a/src/coreclr/inc/clr/fs/path.h b/src/coreclr/inc/clr/fs/path.h
@@ -10,8 +10,6 @@
 
 #include "clrtypes.h"
 
-#include "strsafe.h"
-
 #include "clr/str.h"
 
 namespace clr

diff --git a/src/coreclr/inc/corhlprpriv.h b/src/coreclr/inc/corhlprpriv.h
@@ -11,7 +11,7 @@
 #define __CORHLPRPRIV_H__
 
 #include "corhlpr.h"
-#include "fstring.h"
+#include <minipal/utf8.h>
 
 #if defined(_MSC_VER) && defined(HOST_X86)
 #pragma optimize("y", on)		// If routines don't get inlined, don't pay the EBP frame penalty
@@ -225,71 +225,33 @@ class CQuickMemoryBase
         iSize = cbTotal;
     }
 
-
-    // Convert UTF8 string to UNICODE string, optimized for speed
-    HRESULT ConvertUtf8_UnicodeNoThrow(const char * utf8str)
-    {
-        bool allAscii;
-        DWORD length;
-
-        HRESULT hr = FString::Utf8_Unicode_Length(utf8str, & allAscii, & length);
-
-        if (SUCCEEDED(hr))
-        {
-            LPWSTR buffer = (LPWSTR) AllocNoThrow((length + 1) * sizeof(WCHAR));
-
-            if (buffer == NULL)
-            {
-                hr = E_OUTOFMEMORY;
-            }
-            else
-            {
-                hr = FString::Utf8_Unicode(utf8str, allAscii, buffer, length);
-            }
-        }
-
-        return hr;
-    }
-
     // Convert UTF8 string to UNICODE string, optimized for speed
     void ConvertUtf8_Unicode(const char * utf8str)
     {
-        bool allAscii;
-        DWORD length;
+        size_t sourceLen = strlen(utf8str);
+        size_t destLen = minipal_get_length_utf8_to_utf16(utf8str, sourceLen, 0);
 
-        HRESULT hr = FString::Utf8_Unicode_Length(utf8str, & allAscii, & length);
+        CHAR16_T* buffer = (CHAR16_T*) AllocThrows((destLen + 1) * sizeof(CHAR16_T));
+        buffer[destLen] = W('\0');
 
-        if (SUCCEEDED(hr))
+        if (!minipal_convert_utf8_to_utf16(utf8str, sourceLen, buffer, destLen, 0))
         {
-            LPWSTR buffer = (LPWSTR) AllocThrows((length + 1) * sizeof(WCHAR));
-
-            hr = FString::Utf8_Unicode(utf8str, allAscii, buffer, length);
-        }
-
-        if (FAILED(hr))
-        {
-            ThrowHR(hr);
+            ThrowHR(EMAKEHR(errno));
         }
     }
 
     // Convert UNICODE string to UTF8 string, optimized for speed
     void ConvertUnicode_Utf8(const WCHAR * pString)
     {
-        bool allAscii;
-        DWORD length;
-
-        HRESULT hr = FString::Unicode_Utf8_Length(pString, & allAscii, & length);
+        size_t sourceLen = u16_strlen(pString);
+        size_t destLen = minipal_get_length_utf16_to_utf8((const CHAR16_T*)pString, sourceLen, 0);
 
-        if (SUCCEEDED(hr))
-        {
-            LPSTR buffer = (LPSTR) AllocThrows((length + 1) * sizeof(char));
-
-            hr = FString::Unicode_Utf8(pString, allAscii, buffer, length);
-        }
+        LPSTR buffer = (LPSTR) AllocThrows((destLen + 1) * sizeof(char));
+        buffer[destLen] = '\0';
 
-        if (FAILED(hr))
+        if (!minipal_convert_utf16_to_utf8((const CHAR16_T*)pString, sourceLen, buffer, destLen, 0))
         {
-            ThrowHR(hr);
+            ThrowHR(EMAKEHR(errno));
         }
     }
 

diff --git a/src/coreclr/inc/fstring.h b/src/coreclr/inc/fstring.h
diff --git a/src/coreclr/inc/utilcode.h b/src/coreclr/inc/utilcode.h
@@ -2834,27 +2834,6 @@ template <class T> class CChainedHash
 };
 
 
-//*****************************************************************************
-//
-//********** String helper functions.
-//
-//*****************************************************************************
-
-//*****************************************************************************
-// Checks if string length exceeds the specified limit
-//*****************************************************************************
-inline BOOL IsStrLongerThan(_In_ _In_z_ char* pstr, unsigned N)
-{
-    LIMITED_METHOD_CONTRACT;
-    unsigned i = 0;
-    if(pstr)
-    {
-        for(i=0; (i < N)&&(pstr[i]); i++);
-    }
-    return (i >= N);
-}
-
-
 //*****************************************************************************
 // Class to parse a list of simple assembly names and then find a match
 //*****************************************************************************

diff --git a/src/coreclr/minipal/Unix/CMakeLists.txt b/src/coreclr/minipal/Unix/CMakeLists.txt
@@ -7,6 +7,12 @@ if(NOT CLR_CROSS_COMPONENTS_BUILD)
     list(APPEND SOURCES
         ${CLR_SRC_NATIVE_DIR}/minipal/cpufeatures.c
     )
+
+    if(CLR_CMAKE_HOST_OSX)
+        list(APPEND SOURCES
+            ${CLR_SRC_NATIVE_DIR}/minipal/utf8.c
+        )
+    endif()
 endif()
 
 add_library(coreclrminipal