Revert "Remove u16_strlen from the CoreCLR minipal"

This reverts commit 4f39154.
dotnet · jkoritzinsky · Oct 31, 2024 · Oct 16, 2024 · Oct 16, 2024 · Oct 16, 2024
commit 460b8e5f3671c00555bd7bd659c2f783bad279f1
diff --git a/src/coreclr/debug/daccess/daccess.cpp b/src/coreclr/debug/daccess/daccess.cpp
@@ -264,7 +264,7 @@ SplitFullName(_In_z_ PCWSTR fullName,
     else
     {
         *params = NULL;
-        memberEnd = fullName + (minipal_u16_strlen((const CHAR16_T*)fullName) - 1);
+        memberEnd = fullName + (u16_strlen(fullName) - 1);
     }
 
     if (syntax != SPLIT_TYPE)
@@ -5680,7 +5680,7 @@ static int FormatCLRStubName(
     // Compute the address as a string safely.
     WCHAR addrString[Max64BitHexString + 1];
     FormatInteger(addrString, ARRAY_SIZE(addrString), "%p", stubAddr);
-    size_t addStringLen = minipal_u16_strlen((const CHAR16_T*)addrString);
+    size_t addStringLen = u16_strlen(addrString);
 
     // Compute maximum length, include the null terminator.
     size_t formatName_MaxLen = ARRAY_SIZE(formatName_Prefix) // Include trailing null
@@ -5691,7 +5691,7 @@ static int FormatCLRStubName(
     size_t stubManagedNameLen = 0;
     if (stubNameMaybe != NULL)
     {
-        stubManagedNameLen = minipal_u16_strlen((const CHAR16_T*)stubNameMaybe);
+        stubManagedNameLen = u16_strlen(stubNameMaybe);
         formatName_MaxLen += ARRAY_SIZE(formatName_OpenBracket) - 1;
         formatName_MaxLen += ARRAY_SIZE(formatName_CloseBracket) - 1;
     }
@@ -6458,7 +6458,7 @@ ClrDataAccess::GetMetaDataFileInfoFromPEFile(PEAssembly *pPEAssembly,
     // It is possible that the module is in-memory. That is the wszFilePath here is empty.
     // We will try to use the module name instead in this case for hosting debugger
     // to find match.
-    if (minipal_u16_strlen((const CHAR16_T*)wszFilePath) == 0)
+    if (u16_strlen(wszFilePath) == 0)
     {
         mdImage->GetModuleFileNameHintForDAC().DacGetUnicode(cchFilePath, wszFilePath, &uniPathChars);
         if (uniPathChars > cchFilePath)
@@ -7259,9 +7259,9 @@ STDAPI OutOfProcessExceptionEventCallback(_In_ PDWORD pContext,
         return hr;
     }
 
-    if ((pwszEventName == NULL) || (*pchSize <= minipal_u16_strlen((const CHAR16_T*)gmb.wzEventTypeName)))
+    if ((pwszEventName == NULL) || (*pchSize <= u16_strlen(gmb.wzEventTypeName)))
     {
-        *pchSize = static_cast<DWORD>(minipal_u16_strlen((const CHAR16_T*)gmb.wzEventTypeName)) + 1;
+        *pchSize = static_cast<DWORD>(u16_strlen(gmb.wzEventTypeName)) + 1;
         return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
     }
 
@@ -7383,9 +7383,9 @@ STDAPI OutOfProcessExceptionEventSignatureCallback(_In_ PDWORD pContext,
     // Return pwszName as an emptry string to let WER use localized version of "Parameter n"
     *pwszName = W('\0');
 
-    if ((pwszValue == NULL) || (*pchValue <= minipal_u16_strlen((const CHAR16_T*)pwszBucketValues[dwIndex])))
+    if ((pwszValue == NULL) || (*pchValue <= u16_strlen(pwszBucketValues[dwIndex])))
     {
-        *pchValue = static_cast<DWORD>(minipal_u16_strlen((const CHAR16_T*)pwszBucketValues[dwIndex]))+ 1;
+        *pchValue = static_cast<DWORD>(u16_strlen(pwszBucketValues[dwIndex]))+ 1;
         return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
     }
 

diff --git a/src/coreclr/debug/daccess/enummem.cpp b/src/coreclr/debug/daccess/enummem.cpp
@@ -233,14 +233,14 @@ HRESULT ClrDataAccess::EnumMemCLRStatic(IN CLRDataEnumMemoryFlags flags)
             WCHAR* path = entryAssemblyPath;
             if (path != NULL)
             {
-                size_t pathLen = minipal_u16_strlen((const CHAR16_T*)path) + 1;
+                size_t pathLen = u16_strlen(path) + 1;
 
                 // Get the file name based on the last directory separator
                 const WCHAR* name = u16_strrchr(path, DIRECTORY_SEPARATOR_CHAR_W);
                 if (name != NULL)
                 {
                     name += 1;
-                    size_t len = minipal_u16_strlen((const CHAR16_T*)name) + 1;
+                    size_t len = u16_strlen(name) + 1;
                     wcscpy_s(path, len, name);
 
                     // Null out the rest of the buffer

diff --git a/src/coreclr/debug/daccess/inspect.cpp b/src/coreclr/debug/daccess/inspect.cpp
@@ -1045,7 +1045,7 @@ ClrDataValue::GetString(
 
             if (strLen)
             {
-                *strLen = static_cast<ULONG32>(minipal_u16_strlen((const CHAR16_T*)msgStr) + 1);
+                *strLen = static_cast<ULONG32>(u16_strlen(msgStr) + 1);
             }
             status = StringCchCopy(str, bufLen, msgStr) == S_OK ?
                 S_OK : S_FALSE;

diff --git a/src/coreclr/debug/daccess/request.cpp b/src/coreclr/debug/daccess/request.cpp
@@ -700,7 +700,7 @@ ClrDataAccess::GetRegisterName(int regNum, unsigned int count, _Inout_updates_z_
     const WCHAR callerPrefix[] = W("caller.");
     // Include null terminator in prefixLen/regLen because wcscpy_s will fail otherwise
     unsigned int prefixLen = (unsigned int)ARRAY_SIZE(callerPrefix);
-    unsigned int regLen = (unsigned int)minipal_u16_strlen((const CHAR16_T*)regs[regNum]) + 1;
+    unsigned int regLen = (unsigned int)u16_strlen(regs[regNum]) + 1;
     unsigned int needed = (callerFrame ? prefixLen - 1 : 0) + regLen;
     if (pNeeded)
         *pNeeded = needed;
@@ -2140,7 +2140,7 @@ ClrDataAccess::GetFrameName(CLRDATA_ADDRESS vtable, unsigned int count, _Inout_u
     else
     {
         // Turn from bytes to wide characters
-        unsigned int len = (unsigned int)minipal_u16_strlen((const CHAR16_T*)pszName);
+        unsigned int len = (unsigned int)u16_strlen(pszName);
 
         if (frameName)
         {
@@ -2614,7 +2614,7 @@ ClrDataAccess::GetAppDomainName(CLRDATA_ADDRESS addr, unsigned int count, _Inout
         if (pAppDomain->m_friendlyName.IsValid())
         {
             LPCWSTR friendlyName = (LPCWSTR)pAppDomain->m_friendlyName;
-            size_t friendlyNameLen = minipal_u16_strlen((const CHAR16_T*)friendlyName);
+            size_t friendlyNameLen = u16_strlen(friendlyName);
 
             if (pNeeded)
             {

diff --git a/src/coreclr/debug/daccess/task.cpp b/src/coreclr/debug/daccess/task.cpp
@@ -720,7 +720,7 @@ ClrDataAppDomain::GetName(
                 S_OK : S_FALSE;
             if (nameLen)
             {
-                size_t cchName = minipal_u16_strlen((const CHAR16_T*)rawName) + 1;
+                size_t cchName = u16_strlen(rawName) + 1;
                 if (FitsIn<ULONG32>(cchName))
                 {
                     *nameLen = (ULONG32) cchName;
@@ -4749,7 +4749,7 @@ ClrDataExceptionState::GetString(
             status = StringCchCopy(str, bufLen, msgStr) == S_OK ? S_OK : S_FALSE;
             if (strLen != NULL)
             {
-                size_t cchName = minipal_u16_strlen((const CHAR16_T*)msgStr) + 1;
+                size_t cchName = u16_strlen(msgStr) + 1;
                 if (FitsIn<ULONG32>(cchName))
                 {
                     *strLen = (ULONG32) cchName;

diff --git a/src/coreclr/debug/dbgutil/dbgutil.cpp b/src/coreclr/debug/dbgutil/dbgutil.cpp
@@ -16,7 +16,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <memory>
-#include <minipal/strings.h>
+#include <dn-u16.h>
 #include "corhlpr.h"
 
 #ifdef HOST_WINDOWS
@@ -329,7 +329,7 @@ HRESULT GetNextLevelResourceEntryRVAByName(ICorDebugDataTarget* pDataTarget,
     DWORD* pNextLevelRva)
 {
     HRESULT hr = S_OK;
-    DWORD nameLength = (DWORD)minipal_u16_strlen((const CHAR16_T*)pwzName);
+    DWORD nameLength = (DWORD)u16_strlen(pwzName);
     WCHAR entryName[50];
     assert(nameLength < 50);     // this implementation won't support matching a name longer
     // than 50 characters. We only look up the hard coded name

diff --git a/src/coreclr/debug/di/process.cpp b/src/coreclr/debug/di/process.cpp
@@ -9619,7 +9619,7 @@ void Ls_Rs_StringBuffer::CopyLSDataToRS(ICorDebugDataTarget * pTarget)
 
     // Now we know it's safe to call u16_strlen. The buffer is local, so we know the pages are there.
     // And we know there's a null capping the max length of the string.
-    SIZE_T dwActualLenWithNull = minipal_u16_strlen((const CHAR16_T*)pString) + 1;
+    SIZE_T dwActualLenWithNull = u16_strlen(pString) + 1;
     if (dwActualLenWithNull != dwExpectedLenWithNull)
     {
         ThrowHR(CORDBG_E_TARGET_INCONSISTENT);

diff --git a/src/coreclr/debug/di/publish.cpp b/src/coreclr/debug/di/publish.cpp
@@ -418,7 +418,7 @@ CorpubProcess::CorpubProcess(DWORD dwProcessId,
             if (ret > 0)
             {
                 // Recompute string length because we don't know if 'ret' is in bytes or char.
-                SIZE_T len = minipal_u16_strlen((const CHAR16_T*)szName) + 1;
+                SIZE_T len = u16_strlen(szName) + 1;
                 m_szProcessName = new (nothrow) WCHAR[len];
                 if (m_szProcessName != NULL)
                 {
@@ -602,7 +602,7 @@ HRESULT AllocateAndReadRemoteString(
     if (SUCCEEDED(hr))
     {
         // Ensure that the string we just read is actually null terminated.
-        // We can't call minipal_u16_strlen((const CHAR16_T*)) on it yet, since that may AV on a non-null terminated string.
+        // We can't call u16_strlen() on it yet, since that may AV on a non-null terminated string.
         WCHAR * pString = *ppNewLocalBuffer;
 
         if (pString[ceSize - 1] == W('\0'))
@@ -612,7 +612,7 @@ HRESULT AllocateAndReadRemoteString(
         }
         pString[ceSize - 1] = W('\0');
 
-        SIZE_T ceTestLen = minipal_u16_strlen((const CHAR16_T*)pString);
+        SIZE_T ceTestLen = u16_strlen(pString);
         if (ceTestLen == ceSize - 1)
         {
             // String was not previously null-terminated.

diff --git a/src/coreclr/debug/di/rsmda.cpp b/src/coreclr/debug/di/rsmda.cpp
@@ -105,7 +105,7 @@ HRESULT CordbMDA::QueryInterface(REFIID riid, void **ppInterface)
 HRESULT CopyOutString(LPCWSTR pInputString, ULONG32 cchName, ULONG32 * pcchName, _Out_writes_to_opt_(cchName, *pcchName) WCHAR szName[])
 {
     _ASSERTE(pInputString != NULL);
-    ULONG32 len = (ULONG32) minipal_u16_strlen((const CHAR16_T*)pInputString) + 1;
+    ULONG32 len = (ULONG32) u16_strlen(pInputString) + 1;
 
     if (cchName == 0)
     {

diff --git a/src/coreclr/debug/di/rsthread.cpp b/src/coreclr/debug/di/rsthread.cpp
@@ -10205,7 +10205,7 @@ HRESULT CordbEval::NewString(LPCWSTR string)
 {
     PUBLIC_API_ENTRY(this);
     FAIL_IF_NEUTERED(this);
-    return NewStringWithLength(string, (UINT)minipal_u16_strlen((const CHAR16_T*)string));
+    return NewStringWithLength(string, (UINT)u16_strlen(string));
 }
 
 //---------------------------------------------------------------------------------------

diff --git a/src/coreclr/debug/di/symbolinfo.cpp b/src/coreclr/debug/di/symbolinfo.cpp
@@ -258,7 +258,7 @@ STDMETHODIMP SymbolInfo::GetTypeDefProps (             // S_OK or error.
         *pdwTypeDefFlags=classInfo->flags;
 
 
-    SIZE_T cch=minipal_u16_strlen((const CHAR16_T*)classInfo->wszName.GetUnicode())+1;
+    SIZE_T cch=u16_strlen(classInfo->wszName)+1;
     if (cch > UINT32_MAX)
         return E_UNEXPECTED;
     *pchTypeDef=(ULONG)cch;
@@ -309,7 +309,7 @@ STDMETHODIMP SymbolInfo::GetMethodProps (
 
 
     *pClass=m_LastMethod.cls;
-    SIZE_T cch=minipal_u16_strlen((const CHAR16_T*)m_LastMethod.wszName.GetUnicode())+1;
+    SIZE_T cch=u16_strlen(m_LastMethod.wszName)+1;
     if(cch > UINT32_MAX)
         return E_UNEXPECTED;
     *pchMethod=(ULONG)cch;

diff --git a/src/coreclr/debug/inc/dbgappdomain.h b/src/coreclr/debug/inc/dbgappdomain.h
@@ -43,7 +43,7 @@ struct AppDomainInfo
         else
             m_szAppDomainName = W("<NoName>");
 
-        m_iNameLengthInBytes = (int) (minipal_u16_strlen((const CHAR16_T*)m_szAppDomainName) + 1) * sizeof(WCHAR);
+        m_iNameLengthInBytes = (int) (u16_strlen(m_szAppDomainName) + 1) * sizeof(WCHAR);
     }
 #endif
 };

diff --git a/src/coreclr/debug/inc/dbgipcevents.h b/src/coreclr/debug/inc/dbgipcevents.h
@@ -872,7 +872,7 @@ template <int nMaxLengthIncludingNull>
 class MSLAYOUT EmbeddedIPCString
 {
 public:
-    // Set, caller responsibility that minipal_u16_strlen((const CHAR16_T*)pData) < nMaxLengthIncludingNull
+    // Set, caller responsibility that u16_strlen(pData) < nMaxLengthIncludingNull
     void SetString(const WCHAR * pData)
     {
         // If the string doesn't fit into the buffer, that's an issue (and so this is a real

diff --git a/src/coreclr/debug/inc/ddmarshalutil.h b/src/coreclr/debug/inc/ddmarshalutil.h
@@ -90,7 +90,7 @@ class WriteBuffer : public BaseBuffer
         if (!fIsNull)
         {
             _ASSERTE(pString != NULL);
-            DWORD len = (DWORD) minipal_u16_strlen((const CHAR16_T*)pString);
+            DWORD len = (DWORD) u16_strlen(pString);
             DWORD cbCopy = (len + 1) * sizeof(WCHAR);
 
             EnsureSize(cbCopy);
@@ -179,7 +179,7 @@ class ReadBuffer : public BaseBuffer
         else
         {
             const WCHAR * pString = (WCHAR*) &m_pBuffer[m_idx];
-            DWORD len = (DWORD) minipal_u16_strlen((const CHAR16_T*)pString);
+            DWORD len = (DWORD) u16_strlen(pString);
             m_idx += (len + 1) * sizeof(WCHAR); // skip past null
             _ASSERTE(m_idx <= m_size);
             return pString;

diff --git a/src/coreclr/debug/shared/stringcopyholder.cpp b/src/coreclr/debug/shared/stringcopyholder.cpp
@@ -68,7 +68,7 @@ HRESULT StringCopyHolder::AssignCopy(const WCHAR * pStringSrc)
     }
     else
     {
-        SIZE_T cchLen = minipal_u16_strlen((const CHAR16_T*)pStringSrc) + 1;
+        SIZE_T cchLen = u16_strlen(pStringSrc) + 1;
         m_szData = new (nothrow) WCHAR[cchLen];
         if (m_szData == NULL)
         {

diff --git a/src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp b/src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp
@@ -466,7 +466,7 @@ HRESULT CeeFileGenWriter::setOutputFileName(_In_ LPWSTR fileName)
 {
     if (m_outputFileName)
         delete[] m_outputFileName;
-    size_t len = minipal_u16_strlen((const CHAR16_T*)fileName) + 1;
+    size_t len = u16_strlen(fileName) + 1;
     m_outputFileName = (LPWSTR)new (nothrow) WCHAR[len];
     TESTANDRETURN(m_outputFileName!=NULL, E_OUTOFMEMORY);
     wcscpy_s(m_outputFileName, len, fileName);
@@ -477,7 +477,7 @@ HRESULT CeeFileGenWriter::setResourceFileName(_In_ LPWSTR fileName)
 {
     if (m_resourceFileName)
         delete[] m_resourceFileName;
-    size_t len = minipal_u16_strlen((const CHAR16_T*)fileName) + 1;
+    size_t len = u16_strlen(fileName) + 1;
     m_resourceFileName = (LPWSTR)new (nothrow) WCHAR[len];
     TESTANDRETURN(m_resourceFileName!=NULL, E_OUTOFMEMORY);
     wcscpy_s(m_resourceFileName, len, fileName);

diff --git a/src/coreclr/ilasm/asmman.cpp b/src/coreclr/ilasm/asmman.cpp
@@ -28,10 +28,10 @@ BinStr* BinStrToUnicode(BinStr* pSource, bool Swap)
             {
                 memset(wz,0,L);
                 MultiByteToWideChar(g_uCodePage,0,pb,-1,wz,l);
-                tmp->remove(L-(DWORD)minipal_u16_strlen((const CHAR16_T*)wz)*sizeof(WCHAR));
+                tmp->remove(L-(DWORD)u16_strlen(wz)*sizeof(WCHAR));
 #if BIGENDIAN
                 if (Swap)
-                    SwapStringLength(wz, (DWORD)minipal_u16_strlen((const CHAR16_T*)wz));
+                    SwapStringLength(wz, (DWORD)u16_strlen(wz));
 #endif
                 delete pSource;
             }
@@ -996,8 +996,8 @@ HRESULT AsmMan::EmitManifest()
                         else
                         {
                             m_dwMResSizeTotal += m_dwMResSize[m_dwMResNum]+sizeof(DWORD);
-                            m_wzMResName[m_dwMResNum] = new WCHAR[minipal_u16_strlen((const CHAR16_T*)wzFileName)+1];
-                            wcscpy_s(m_wzMResName[m_dwMResNum],minipal_u16_strlen((const CHAR16_T*)wzFileName)+1,wzFileName);
+                            m_wzMResName[m_dwMResNum] = new WCHAR[u16_strlen(wzFileName)+1];
+                            wcscpy_s(m_wzMResName[m_dwMResNum],u16_strlen(wzFileName)+1,wzFileName);
                             m_fMResNew[m_dwMResNum] = TRUE;
                             m_dwMResNum++;
                         }

diff --git a/src/coreclr/ilasm/assem.cpp b/src/coreclr/ilasm/assem.cpp
@@ -1076,7 +1076,7 @@ BOOL Assembler::EmitClass(Class *pClass)
 
     MultiByteToWideChar(g_uCodePage,0,szFullName,-1,wzFullName,dwUniBuf);
 
-    L = minipal_u16_strlen((const CHAR16_T*)wzFullName);
+    L = u16_strlen(wzFullName);
     if((L==0)||(wzFullName[L-1]==L'.')) // Missing class name!
     {
         wcscat_s(wzFullName,dwUniBuf,W("$UNNAMED_TYPE$"));
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ struct AppDomainInfo @@
             else
                 m_szAppDomainName = W("<NoName>");
-            m_iNameLengthInBytes = (int) (minipal_u16_strlen((const CHAR16_T*)m_szAppDomainName) + 1) * sizeof(WCHAR);
+            m_iNameLengthInBytes = (int) (u16_strlen(m_szAppDomainName) + 1) * sizeof(WCHAR);
         }
     #endif
     };
@@ Expand Down @@