diff options
32 files changed, 61 insertions, 1598 deletions
diff --git a/src/System.Private.CoreLib/src/Microsoft/Win32/Win32Native.cs b/src/System.Private.CoreLib/src/Microsoft/Win32/Win32Native.cs index e3bc76db6f..9207035d6e 100644 --- a/src/System.Private.CoreLib/src/Microsoft/Win32/Win32Native.cs +++ b/src/System.Private.CoreLib/src/Microsoft/Win32/Win32Native.cs @@ -185,9 +185,6 @@ namespace Microsoft.Win32 [DllImport(Interop.Libraries.Kernel32, SetLastError = true)] internal static extern unsafe bool VirtualFree(void* address, UIntPtr numBytes, int pageFreeMode); - [DllImport(Interop.Libraries.Kernel32, CharSet = CharSet.Unicode, ExactSpelling = true, EntryPoint = "lstrlenW")] - internal static extern int lstrlenW(IntPtr ptr); - [DllImport(Interop.Libraries.OleAut32, CharSet = CharSet.Unicode)] internal static extern IntPtr SysAllocStringLen(string src, int len); // BSTR diff --git a/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs b/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs index 9761044927..be85a89362 100644 --- a/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs +++ b/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs @@ -1729,13 +1729,13 @@ namespace System.Runtime.InteropServices FreeCoTaskMem(s); } - public static void ZeroFreeCoTaskMemUnicode(IntPtr s) + public static unsafe void ZeroFreeCoTaskMemUnicode(IntPtr s) { if (s == IntPtr.Zero) { return; } - RuntimeImports.RhZeroMemory(s, (UIntPtr)(Win32Native.lstrlenW(s) * 2)); + RuntimeImports.RhZeroMemory(s, (UIntPtr)(string.wcslen((char*)s) * 2)); FreeCoTaskMem(s); } @@ -1779,13 +1779,13 @@ namespace System.Runtime.InteropServices FreeHGlobal(s); } - public static void ZeroFreeGlobalAllocUnicode(IntPtr s) + public static unsafe void ZeroFreeGlobalAllocUnicode(IntPtr s) { if (s == IntPtr.Zero) { return; } - RuntimeImports.RhZeroMemory(s, (UIntPtr)(Win32Native.lstrlenW(s) * 2)); + RuntimeImports.RhZeroMemory(s, (UIntPtr)(string.wcslen((char*)s) * 2)); FreeHGlobal(s); } diff --git a/src/System.Private.CoreLib/src/System/StubHelpers.cs b/src/System.Private.CoreLib/src/System/StubHelpers.cs index 4980101ddc..e7b8096d28 100644 --- a/src/System.Private.CoreLib/src/System/StubHelpers.cs +++ b/src/System.Private.CoreLib/src/System/StubHelpers.cs @@ -1178,7 +1178,6 @@ namespace System.StubHelpers case BackPropAction.StringBuilderAnsi: { - sbyte* ptr = (sbyte*)pNativeHome.ToPointer(); int length; if (pNativeHome == IntPtr.Zero) { @@ -1189,14 +1188,23 @@ namespace System.StubHelpers length = string.strlen((byte*)pNativeHome); } - ((StringBuilder)pManagedHome).ReplaceBufferAnsiInternal(ptr, length); + ((StringBuilder)pManagedHome).ReplaceBufferAnsiInternal((sbyte*)pNativeHome, length); break; } case BackPropAction.StringBuilderUnicode: { - char* ptr = (char*)pNativeHome.ToPointer(); - ((StringBuilder)pManagedHome).ReplaceBufferInternal(ptr, Win32Native.lstrlenW(pNativeHome)); + int length; + if (pNativeHome == IntPtr.Zero) + { + length = 0; + } + else + { + length = string.wcslen((char*)pNativeHome); + } + + ((StringBuilder)pManagedHome).ReplaceBufferInternal((char*)pNativeHome, length); break; } diff --git a/src/binder/fusionassemblyname.cpp b/src/binder/fusionassemblyname.cpp index f370337051..eafc5a7fe2 100644 --- a/src/binder/fusionassemblyname.cpp +++ b/src/binder/fusionassemblyname.cpp @@ -1318,7 +1318,7 @@ CAssemblyName::Init(LPCTSTR pszAssemblyName, ASSEMBLYMETADATA *pamd) if (pszAssemblyName) { hr = SetProperty(ASM_NAME_NAME, (LPTSTR) pszAssemblyName, - (lstrlenW(pszAssemblyName)+1) * sizeof(TCHAR)); + (DWORD)((wcslen(pszAssemblyName)+1) * sizeof(TCHAR))); if (FAILED(hr)) goto exit; } diff --git a/src/dlls/mscoree/mscorwks_unixexports.src b/src/dlls/mscoree/mscorwks_unixexports.src index 3743d58925..eaee90e77b 100644 --- a/src/dlls/mscoree/mscorwks_unixexports.src +++ b/src/dlls/mscoree/mscorwks_unixexports.src @@ -45,8 +45,6 @@ GetSystemInfo LocalAlloc LocalReAlloc LocalFree -lstrlenA -lstrlenW MetaDataGetDispenser MultiByteToWideChar OpenEventW diff --git a/src/dlls/mscorpe/ceefilegenwriter.cpp b/src/dlls/mscorpe/ceefilegenwriter.cpp index 04bacd7a07..20dbec7daf 100644 --- a/src/dlls/mscorpe/ceefilegenwriter.cpp +++ b/src/dlls/mscorpe/ceefilegenwriter.cpp @@ -460,7 +460,7 @@ HRESULT CeeFileGenWriter::setOutputFileName(__in LPWSTR fileName) { if (m_outputFileName) delete[] m_outputFileName; - int len = lstrlenW(fileName) + 1; + size_t len = wcslen(fileName) + 1; m_outputFileName = (LPWSTR)new (nothrow) WCHAR[len]; TESTANDRETURN(m_outputFileName!=NULL, E_OUTOFMEMORY); wcscpy_s(m_outputFileName, len, fileName); @@ -471,7 +471,7 @@ HRESULT CeeFileGenWriter::setResourceFileName(__in LPWSTR fileName) { if (m_resourceFileName) delete[] m_resourceFileName; - int len = lstrlenW(fileName) + 1; + size_t len = wcslen(fileName) + 1; m_resourceFileName = (LPWSTR)new (nothrow) WCHAR[len]; TESTANDRETURN(m_resourceFileName!=NULL, E_OUTOFMEMORY); wcscpy_s(m_resourceFileName, len, fileName); @@ -482,7 +482,7 @@ HRESULT CeeFileGenWriter::setLibraryName(__in LPWSTR libraryName) { if (m_libraryName) delete[] m_libraryName; - int len = lstrlenW(libraryName) + 1; + size_t len = wcslen(libraryName) + 1; m_libraryName = (LPWSTR)new (nothrow) WCHAR[len]; TESTANDRETURN(m_libraryName != NULL, E_OUTOFMEMORY); wcscpy_s(m_libraryName, len, libraryName); diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h index bb5e05f359..1621dcc4ad 100644 --- a/src/pal/inc/pal.h +++ b/src/pal/inc/pal.h @@ -3132,24 +3132,6 @@ DebugBreak( VOID); PALIMPORT -int -PALAPI -lstrlenA( - IN LPCSTR lpString); - -PALIMPORT -int -PALAPI -lstrlenW( - IN LPCWSTR lpString); - -#ifdef UNICODE -#define lstrlen lstrlenW -#else -#define lstrlen lstrlenA -#endif - -PALIMPORT DWORD PALAPI GetEnvironmentVariableW( diff --git a/src/pal/inc/rt/cpp/ccombstr.h b/src/pal/inc/rt/cpp/ccombstr.h deleted file mode 100644 index 999be9e706..0000000000 --- a/src/pal/inc/rt/cpp/ccombstr.h +++ /dev/null @@ -1,263 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -// - -// -// =========================================================================== -// File: CComBSTR.h -// -// =========================================================================== - -/*++ - -Abstract: - - Stripped down and modified version of CComBSTR - ---*/ - -#ifndef __CCOMBSTR_H__ -#define __CCOMBSTR_H__ - -#ifdef __cplusplus - -#ifndef AtlThrow -#define AtlThrow(a) RaiseException(STATUS_NO_MEMORY,EXCEPTION_NONCONTINUABLE,0,nullptr); -#endif -#ifndef ATLASSERT -#define ATLASSERT(a) _ASSERTE(a) -#endif -#define MAX_SATELLITESTRING 1024 - -#include <safemath.h> - -class CComBSTR -{ -public: - BSTR m_str; - CComBSTR() - { - m_str = nullptr; - } - CComBSTR(int nSize) - { - if (nSize == 0) - m_str = nullptr; - else - { - m_str = ::SysAllocStringLen(nullptr, nSize); - if (m_str == nullptr) - AtlThrow(E_OUTOFMEMORY); - } - } - CComBSTR(int nSize, LPCOLESTR sz) - { - if (nSize == 0) - m_str = nullptr; - else - { - m_str = ::SysAllocStringLen(sz, nSize); - if (m_str == nullptr) - AtlThrow(E_OUTOFMEMORY); - } - } - CComBSTR(LPCOLESTR pSrc) - { - if (pSrc == nullptr) - m_str = nullptr; - else - { - m_str = ::SysAllocString(pSrc); - if (m_str == nullptr) - AtlThrow(E_OUTOFMEMORY); - } - } - - CComBSTR(const CComBSTR& src) - { - m_str = src.Copy(); - if (!!src && m_str == nullptr) - AtlThrow(E_OUTOFMEMORY); - - } - - CComBSTR& operator=(const CComBSTR& src) - { - if (m_str != src.m_str) - { - ::SysFreeString(m_str); - m_str = src.Copy(); - if (!!src && m_str == nullptr) - AtlThrow(E_OUTOFMEMORY); - } - return *this; - } - - CComBSTR& operator=(LPCOLESTR pSrc) - { - if (pSrc != m_str) - { - ::SysFreeString(m_str); - if (pSrc != nullptr) - { - m_str = ::SysAllocString(pSrc); - if (m_str == nullptr) - AtlThrow(E_OUTOFMEMORY); - } - else - m_str = nullptr; - } - return *this; - } - - ~CComBSTR() - { - ::SysFreeString(m_str); - } - unsigned int ByteLength() const - { - return (m_str == nullptr)? 0 : SysStringByteLen(m_str); - } - unsigned int Length() const - { - return (m_str == nullptr)? 0 : SysStringLen(m_str); - } - operator BSTR() const - { - return m_str; - } - BSTR* operator&() - { - return &m_str; - } - BSTR Copy() const - { - if (m_str == nullptr) - return nullptr; - return ::SysAllocStringLen(m_str, SysStringLen(m_str)); - } - HRESULT CopyTo(BSTR* pbstr) - { - ATLASSERT(pbstr != nullptr); - if (pbstr == nullptr) - return E_POINTER; - *pbstr = Copy(); - if ((*pbstr == nullptr) && (m_str != nullptr)) - return E_OUTOFMEMORY; - return S_OK; - } - // copy BSTR to VARIANT - HRESULT CopyTo(VARIANT *pvarDest) - { - ATLASSERT(pvarDest != nullptr); - HRESULT hRes = E_POINTER; - if (pvarDest != nullptr) - { - V_VT (pvarDest) = VT_BSTR; - V_BSTR (pvarDest) = Copy(); - if (V_BSTR (pvarDest) == nullptr && m_str != nullptr) - hRes = E_OUTOFMEMORY; - else - hRes = S_OK; - } - return hRes; - } - - void Attach(BSTR src) - { - if (m_str != src) - { - ::SysFreeString(m_str); - m_str = src; - } - } - BSTR Detach() - { - BSTR s = m_str; - m_str = nullptr; - return s; - } - void Empty() - { - ::SysFreeString(m_str); - m_str = nullptr; - } - HRESULT Append(LPCOLESTR lpsz) - { - return Append(lpsz, UINT(lstrlenW(lpsz))); - } - - HRESULT Append(LPCOLESTR lpsz, int nLen) - { - if (lpsz == nullptr || (m_str != nullptr && nLen == 0)) - return S_OK; - if (nLen < 0) - return E_INVALIDARG; - int n1 = Length(); - - // Check for overflow - size_t newSize; - if (!ClrSafeInt<size_t>::addition(n1, nLen, newSize)) - return E_INVALIDARG; - - BSTR b; - b = ::SysAllocStringLen(nullptr, newSize); - if (b == nullptr) - return E_OUTOFMEMORY; - memcpy(b, m_str, n1*sizeof(OLECHAR)); - memcpy(b+n1, lpsz, nLen*sizeof(OLECHAR)); - b[n1+nLen] = 0; - SysFreeString(m_str); - m_str = b; - return S_OK; - } - - HRESULT AssignBSTR(const BSTR bstrSrc) - { - HRESULT hr = S_OK; - if (m_str != bstrSrc) - { - ::SysFreeString(m_str); - if (bstrSrc != nullptr) - { - m_str = SysAllocStringLen(bstrSrc, SysStringLen(bstrSrc)); - if (m_str == nullptr) - hr = E_OUTOFMEMORY; - } - else - m_str = nullptr; - } - - return hr; - } - - bool LoadString(HSATELLITE hInst, UINT nID) - { - ::SysFreeString(m_str); - m_str = nullptr; - WCHAR SatelliteString[MAX_SATELLITESTRING]; - if (PAL_LoadSatelliteStringW(hInst, nID, SatelliteString, MAX_SATELLITESTRING)) - { - m_str = SysAllocString(SatelliteString); - } - return m_str != nullptr; - } - - bool LoadString(PVOID hInst, UINT nID) - { - return LoadString ((HSATELLITE)hInst, nID); - } - - CComBSTR& operator+=(LPCOLESTR pszSrc) - { - HRESULT hr; - hr = Append(pszSrc); - if (FAILED(hr)) - AtlThrow(hr); - return *this; - } - -}; -#endif // __cplusplus -#endif // __CCOMBSTR_H__ diff --git a/src/pal/inc/rt/cpp/cstring.h b/src/pal/inc/rt/cpp/cstring.h deleted file mode 100644 index 483a005ca6..0000000000 --- a/src/pal/inc/rt/cpp/cstring.h +++ /dev/null @@ -1,77 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -// - -// - -#ifndef __CSTRING_H__ -#define __CSTRING_H__ - -#ifdef __cplusplus - -#ifndef AtlThrow -#define AtlThrow(a) RaiseException(STATUS_NO_MEMORY,EXCEPTION_NONCONTINUABLE,0,nullptr); -#endif -#ifndef ATLASSERT -#define ATLASSERT(a) _ASSERTE(a) -#endif - -#include "ccombstr.h" - -class CStringW : public CComBSTR -{ -public: - CStringW() { - } - - CStringW(int nSize, LPCOLESTR sz) : - CComBSTR (nSize, sz) - { - } - - - CStringW(LPCOLESTR pSrc) : - CComBSTR(pSrc) - { - } - - CStringW(const CStringW& src) : - CComBSTR(src) - { - } - - CStringW (LPCSTR pSrc) : - CComBSTR() - { - // Intentionaly create us as empty string, later - // we will overwrite ourselves with the - // converted string. - int cchSize; - cchSize = MultiByteToWideChar(CP_ACP, 0, pSrc, -1, nullptr, 0); - if (cchSize == 0) - { - AtlThrow(E_OUTOFMEMORY); - } - - CComBSTR bstr(cchSize); - // No convert the string - // (Note that (BSTR)bstr will return a pointer to the - // allocated WCHAR buffer - done by the CComBSTR constructor) - if (MultiByteToWideChar(CP_ACP, 0, pSrc, -1, (WCHAR *)((BSTR)bstr), cchSize) == 0) - { - AtlThrow(E_OUTOFMEMORY); - } - - // And now assign this new bstr to us - // The following is a trick how to avoid copying the string - Attach(bstr.Detach()); - } - - ~CStringW() { - } -}; - -#endif // __cplusplus - -#endif // __CSTRING_H__ diff --git a/src/pal/inc/rt/palrt.h b/src/pal/inc/rt/palrt.h index 5d4004ea72..9ff6ea5164 100644 --- a/src/pal/inc/rt/palrt.h +++ b/src/pal/inc/rt/palrt.h @@ -1528,10 +1528,6 @@ typedef struct tagVS_FIXEDFILEINFO /******************** external includes *************************/ #include "ntimage.h" -#ifndef PAL_STDCPP_COMPAT -#include "cpp/ccombstr.h" -#include "cpp/cstring.h" -#endif // !PAL_STDCPP_COMPAT #endif // RC_INVOKED diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index 445949ba7b..8e69ee9ee9 100644 --- a/src/pal/src/CMakeLists.txt +++ b/src/pal/src/CMakeLists.txt @@ -180,7 +180,6 @@ endif(PAL_CMAKE_PLATFORM_ARCH_ARM) set(SOURCES cruntime/file.cpp cruntime/filecrt.cpp - cruntime/lstr.cpp cruntime/malloc.cpp cruntime/math.cpp cruntime/mbstring.cpp diff --git a/src/pal/src/cruntime/lstr.cpp b/src/pal/src/cruntime/lstr.cpp deleted file mode 100644 index 4502b025aa..0000000000 --- a/src/pal/src/cruntime/lstr.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*++ - - - -Module Name: - - lstr.c - -Abstract: - - Implementation of functions manipulating unicode/ansi strings. (lstr*A/W) - - - ---*/ - -#include "pal/palinternal.h" -#include "pal/dbgmsg.h" - -SET_DEFAULT_DEBUG_CHANNEL(CRT); - - -/*++ -Function: - lstrlenA - - -The lstrlen function returns the length in bytes (ANSI version) or -characters (Unicode version) of the specified string (not including -the terminating null character). - -Parameters - -lpString [in] Pointer to a null-terminated string. - -Return Values - -The return value specifies the length of the string, in TCHARs. This -refers to bytes for ANSI versions of the function or characters for -Unicode versions. - ---*/ -int -PALAPI -lstrlenA( IN LPCSTR lpString) -{ - int nChar = 0; - - PERF_ENTRY(lstrlenA); - ENTRY("lstrlenA (lpString=%p (%s))\n", lpString?lpString:"NULL", lpString?lpString:"NULL"); - if (lpString) - { - while (*lpString++) - { - nChar++; - } - } - LOGEXIT("lstrlenA returning int %d\n", nChar); - PERF_EXIT(lstrlenA); - return nChar; -} - - -/*++ -Function: - lstrlenW - -The lstrlen function returns the length in bytes (ANSI version) or -characters (Unicode version) of the specified string (not including -the terminating null character). - -Parameters - -lpString [in] Pointer to a null-terminated string. - -Return Values - -The return value specifies the length of the string, in TCHARs. This -refers to bytes for ANSI versions of the function or characters for -Unicode versions. - ---*/ -int -PALAPI -lstrlenW( - IN LPCWSTR lpString) -{ - int nChar = 0; - - PERF_ENTRY(lstrlenW); - ENTRY("lstrlenW (lpString=%p (%S))\n", lpString?lpString:W16_NULLSTRING, lpString?lpString:W16_NULLSTRING); - if (lpString != NULL) - { - while (*lpString++) - { - nChar++; - } - } - LOGEXIT("lstrlenW returning int %d\n", nChar); - PERF_EXIT(lstrlenW); - return nChar; -} diff --git a/src/pal/src/file/path.cpp b/src/pal/src/file/path.cpp index d998b72b2e..928a8398ce 100644 --- a/src/pal/src/file/path.cpp +++ b/src/pal/src/file/path.cpp @@ -869,11 +869,11 @@ DWORD FILEGetDirectoryFromFullPathA( LPCSTR lpFullPath, DWORD nBufferLength, LPSTR lpBuffer ) { - int full_len, dir_len, i; + size_t full_len, dir_len, i; LPCSTR lpDirEnd; DWORD dwRetLength; - full_len = lstrlenA( lpFullPath ); + full_len = strlen( lpFullPath ); /* look for the first path separator backwards */ lpDirEnd = lpFullPath + full_len - 1; @@ -886,7 +886,7 @@ DWORD FILEGetDirectoryFromFullPathA( LPCSTR lpFullPath, { dwRetLength = 0; } - else if (static_cast<DWORD>(dir_len) >= nBufferLength) + else if (dir_len >= nBufferLength) { dwRetLength = dir_len + 1; /* +1 for NULL char */ } diff --git a/src/pal/src/loader/module.cpp b/src/pal/src/loader/module.cpp index 3f246895a8..e39cd6e41f 100644 --- a/src/pal/src/loader/module.cpp +++ b/src/pal/src/loader/module.cpp @@ -536,7 +536,7 @@ GetModuleFileNameW( /* Copy module name into supplied buffer */ - name_length = lstrlenW(wide_name); + name_length = PAL_wcslen(wide_name); if (name_length >= (INT)nSize) { TRACE("Buffer too small (%u) to copy module's file name (%u).\n", nSize, name_length); @@ -548,7 +548,7 @@ GetModuleFileNameW( wcscpy_s(lpFileName, nSize, wide_name); TRACE("file name of module %p is %S\n", hModule, lpFileName); - retval = name_length; + retval = (DWORD)name_length; done: UnlockModuleList(); LOGEXIT("GetModuleFileNameW returns DWORD %u\n", retval); diff --git a/src/pal/src/thread/process.cpp b/src/pal/src/thread/process.cpp index bf7420e802..a9cae77506 100644 --- a/src/pal/src/thread/process.cpp +++ b/src/pal/src/thread/process.cpp @@ -3544,9 +3544,9 @@ CorUnix::InitializeProcessCommandLine( { LPWSTR lpwstr = PAL_wcsrchr(lpwstrFullPath, '/'); lpwstr[0] = '\0'; - INT n = lstrlenW(lpwstrFullPath) + 1; + size_t n = PAL_wcslen(lpwstrFullPath) + 1; - int iLen = n; + size_t iLen = n; initial_dir = reinterpret_cast<LPWSTR>(InternalMalloc(iLen*sizeof(WCHAR))); if (NULL == initial_dir) { diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp index e10f2ea8a1..d163e5e240 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp @@ -50,7 +50,7 @@ BOOL GetCurrentDir(WCHAR* szwCurrentDir) } // now strip the file name from the full path to get the current path - nCount = lstrlenW(szwReturnedPath) - lstrlenW(szwFileName); + nCount = wcslen(szwReturnedPath) - wcslen(szwFileName); memset(szwCurrentDir, 0, sizeof(WCHAR)*(_MAX_DIR+1)); wcsncpy(szwCurrentDir, szwReturnedPath, nCount - 1); diff --git a/src/pal/tests/palsuite/miscellaneous/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CMakeLists.txt index d437fc9320..539417223b 100644 --- a/src/pal/tests/palsuite/miscellaneous/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CMakeLists.txt @@ -28,8 +28,6 @@ add_subdirectory(InterLockedExchangeAdd) add_subdirectory(InterlockedExchangePointer) add_subdirectory(InterlockedIncrement) add_subdirectory(InterlockedIncrement64) -add_subdirectory(lstrlenA) -add_subdirectory(lstrlenW) add_subdirectory(queryperformancecounter) add_subdirectory(queryperformancefrequency) add_subdirectory(SetEnvironmentVariableA) diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenA/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrlenA/CMakeLists.txt deleted file mode 100644 index f6aa0cb2d9..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenA/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) - diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/CMakeLists.txt deleted file mode 100644 index f0b43ac143..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test.cpp -) - -add_executable(paltest_lstrlena_test1 - ${SOURCES} -) - -add_dependencies(paltest_lstrlena_test1 coreclrpal) - -target_link_libraries(paltest_lstrlena_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/test.cpp deleted file mode 100644 index 13e935ba50..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/test.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================ -** -** Source: test.c -** -** Purpose: Test for lstrlenA() function -** -** -**=========================================================*/ - -#include <palsuite.h> - -int __cdecl main(int argc, char *argv[]) { - - char * FirstString = "Pal Testing"; /* 11 characters */ - - /* - * Initialize the PAL and return FAILURE if this fails - */ - - if(0 != (PAL_Initialize(argc, argv))) - { - return FAIL; - } - - /* The string size should be 11 */ - if(lstrlen(FirstString) != 11) - { - Fail("ERROR: The string size returned was %d but it should have " - "been 11 in this test.\n",lstrlen(FirstString)); - } - - /* A NULL pointer should return 0 length */ - if(lstrlen(NULL) != 0) - { - Fail("ERROR: Checking the length of NULL pointer should return " - "a value of 0, but %d was returned.\n",lstrlen(NULL)); - } - - - PAL_Terminate(); - return PASS; -} - - - diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/testinfo.dat b/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/testinfo.dat deleted file mode 100644 index 2c8b795f64..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = Miscellaneous -Function = lstrlenA -Name = Positive test of lstrlenA -TYPE = DEFAULT -EXE1 = test -Description -= Test a standard NULL terminated string and a NULL pointer -= to ensure values are correct. - - - diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenW/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrlenW/CMakeLists.txt deleted file mode 100644 index f6aa0cb2d9..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenW/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) - diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/CMakeLists.txt deleted file mode 100644 index a036291da5..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test.cpp -) - -add_executable(paltest_lstrlenw_test1 - ${SOURCES} -) - -add_dependencies(paltest_lstrlenw_test1 coreclrpal) - -target_link_libraries(paltest_lstrlenw_test1 - ${COMMON_TEST_LIBRARIES} -) diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/test.cpp deleted file mode 100644 index 49bc6d8f67..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/test.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================ -** -** Source: test.c -** -** Purpose: Test for lstrlenW() function -** -** -**=========================================================*/ - -#define UNICODE - -#include <palsuite.h> - -int __cdecl main(int argc, char *argv[]) { - - WCHAR FirstString[] = {'T','E','S','T','\0'}; /* 4 characters */ - - /* - * Initialize the PAL and return FAILURE if this fails - */ - - if(0 != (PAL_Initialize(argc, argv))) - { - return FAIL; - } - - /* The string size should be 4, as noted just above */ - if(lstrlen(FirstString) != 4) - { - Fail("ERROR: The return value was %d when it should have shown the " - "size to be 4 characters.\n",lstrlen(FirstString)); - } - - /* A NULL pointer should return 0 length */ - if(lstrlen(NULL) != 0) - { - Fail("ERROR: The return value was %d when it should have been 0, the " - "length of a NULL pointer.\n",lstrlen(NULL)); - } - - - PAL_Terminate(); - return PASS; -} - - - diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/testinfo.dat b/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/testinfo.dat deleted file mode 100644 index 4e9a4eb2b7..0000000000 --- a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/testinfo.dat +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = Miscellaneous -Function = lstrlenW -Name = Positive test of lstrlenW -TYPE = DEFAULT -EXE1 = test -Description -= Test a standard NULL terminated string and -= a NULL pointer to ensure values are correct. - - - diff --git a/src/pal/tests/palsuite/paltestlist.txt b/src/pal/tests/palsuite/paltestlist.txt index 861892a249..4a75b67c17 100644 --- a/src/pal/tests/palsuite/paltestlist.txt +++ b/src/pal/tests/palsuite/paltestlist.txt @@ -679,8 +679,6 @@ miscellaneous/InterlockedIncrement/test1/paltest_interlockedincrement_test1 miscellaneous/InterlockedIncrement/test2/paltest_interlockedincrement_test2 miscellaneous/InterlockedIncrement64/test1/paltest_interlockedincrement64_test1 miscellaneous/InterlockedIncrement64/test2/paltest_interlockedincrement64_test2 -miscellaneous/lstrlenA/test1/paltest_lstrlena_test1 -miscellaneous/lstrlenW/test1/paltest_lstrlenw_test1 miscellaneous/queryperformancefrequency/test1/paltest_queryperformancefrequency_test1 miscellaneous/SetEnvironmentVariableA/test1/paltest_setenvironmentvariablea_test1 miscellaneous/SetEnvironmentVariableA/test2/paltest_setenvironmentvariablea_test2 diff --git a/src/pal/tests/palsuite/palverify.dat b/src/pal/tests/palsuite/palverify.dat deleted file mode 100644 index b39e7e7228..0000000000 --- a/src/pal/tests/palsuite/palverify.dat +++ /dev/null @@ -1,893 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -c_runtime/__iscsym/test1,1 -c_runtime/_alloca/test1,1 -c_runtime/_fdopen/test1,1 -c_runtime/_finite/test1,1 -c_runtime/_finitef/test1,1 -c_runtime/_fullpath/test1,1 -c_runtime/_gcvt/test1,1 -c_runtime/_gcvt/test2,1 -c_runtime/_getw/test1,1 -c_runtime/_isnan/test1,1 -c_runtime/_isnanf/test1,1 -c_runtime/_itow/test1,1 -c_runtime/_mbsdec/test1,1 -c_runtime/_mbsinc/test1,1 -c_runtime/_mbsninc/test1,1 -c_runtime/_open_osfhandle/test1,1 -c_runtime/_open_osfhandle/test2,1 -c_runtime/_putenv/test1,1 -c_runtime/_putenv/test2,1 -c_runtime/_putenv/test3,1 -c_runtime/_putenv/test4,1 -c_runtime/_putw/test1,1 -c_runtime/_rotl/test1,1 -c_runtime/_rotr/test1,1 -c_runtime/_snprintf_s/test1,1 -c_runtime/_snprintf_s/test2,1 -c_runtime/_snprintf_s/test3,1 -c_runtime/_snprintf_s/test4,1 -c_runtime/_snprintf_s/test6,1 -c_runtime/_snprintf_s/test7,1 -c_runtime/_snprintf_s/test8,1 -c_runtime/_snprintf_s/test9,1 -c_runtime/_snprintf_s/test10,1 -c_runtime/_snprintf_s/test11,1 -c_runtime/_snprintf_s/test12,1 -c_runtime/_snprintf_s/test13,1 -c_runtime/_snprintf_s/test14,1 -c_runtime/_snprintf_s/test15,1 -c_runtime/_snprintf_s/test16,1 -c_runtime/_snprintf_s/test17,1 -c_runtime/_snprintf_s/test18,1 -c_runtime/_snprintf_s/test19,1 -c_runtime/_snwprintf_s/test1,1 -c_runtime/_snwprintf_s/test2,1 -c_runtime/_snwprintf_s/test3,1 -c_runtime/_snwprintf_s/test4,1 -c_runtime/_snwprintf_s/test6,1 -c_runtime/_snwprintf_s/test7,1 -c_runtime/_snwprintf_s/test8,1 -c_runtime/_snwprintf_s/test9,1 -c_runtime/_snwprintf_s/test10,1 -c_runtime/_snwprintf_s/test11,1 -c_runtime/_snwprintf_s/test12,1 -c_runtime/_snwprintf_s/test13,1 -c_runtime/_snwprintf_s/test14,1 -c_runtime/_snwprintf_s/test15,1 -c_runtime/_snwprintf_s/test16,1 -c_runtime/_snwprintf_s/test17,1 -c_runtime/_snwprintf_s/test18,1 -c_runtime/_snwprintf_s/test19,1 -c_runtime/_stricmp/test1,1 -c_runtime/_strlwr/test1,1 -c_runtime/_strnicmp/test1,1 -c_runtime/_vsnprintf_s/test1,1 -c_runtime/_vsnprintf_s/test2,1 -c_runtime/_vsnprintf_s/test3,1 -c_runtime/_vsnprintf_s/test4,1 -c_runtime/_vsnprintf_s/test6,1 -c_runtime/_vsnprintf_s/test7,1 -c_runtime/_vsnprintf_s/test8,1 -c_runtime/_vsnprintf_s/test9,1 -c_runtime/_vsnprintf_s/test10,1 -c_runtime/_vsnprintf_s/test11,1 -c_runtime/_vsnprintf_s/test12,1 -c_runtime/_vsnprintf_s/test13,1 -c_runtime/_vsnprintf_s/test14,1 -c_runtime/_vsnprintf_s/test15,1 -c_runtime/_vsnprintf_s/test16,1 -c_runtime/_vsnprintf_s/test17,1 -c_runtime/_vsnprintf_s/test18,1 -c_runtime/_vsnprintf_s/test19,1 -c_runtime/_vsnwprintf_s/test1,1 -c_runtime/_vsnwprintf_s/test2,1 -c_runtime/_vsnwprintf_s/test3,1 -c_runtime/_vsnwprintf_s/test4,1 -c_runtime/_vsnwprintf_s/test5,1 -c_runtime/_vsnwprintf_s/test6,1 -c_runtime/_vsnwprintf_s/test7,1 -c_runtime/_vsnwprintf_s/test8,1 -c_runtime/_vsnwprintf_s/test9,1 -c_runtime/_vsnwprintf_s/test10,1 -c_runtime/_vsnwprintf_s/test11,1 -c_runtime/_vsnwprintf_s/test12,1 -c_runtime/_vsnwprintf_s/test13,1 -c_runtime/_vsnwprintf_s/test14,1 -c_runtime/_vsnwprintf_s/test15,1 -c_runtime/_vsnwprintf_s/test16,1 -c_runtime/_vsnwprintf_s/test17,1 -c_runtime/_vsnwprintf_s/test18,1 -c_runtime/_vsnwprintf_s/test19,1 -c_runtime/_wcsicmp/test1,1 -c_runtime/_wcslwr/test1,1 -c_runtime/_wcsnicmp/test1,1 -c_runtime/_wfopen/test1,1 -c_runtime/_wfopen/test2,1 -c_runtime/_wfopen/test3,1 -c_runtime/_wfopen/test4,1 -c_runtime/_wfopen/test5,1 -c_runtime/_wfopen/test6,1 -c_runtime/_wfopen/test7,1 -c_runtime/_wtoi/test1,1 -c_runtime/abs/test1,1 -c_runtime/acos/test1,1 -c_runtime/acosf/test1,1 -c_runtime/acosh/test1,1 -c_runtime/acoshf/test1,1 -c_runtime/asin/test1,1 -c_runtime/asinf/test1,1 -c_runtime/asinh/test1,1 -c_runtime/asinhf/test1,1 -c_runtime/atan/test1,1 -c_runtime/atan2/test1,1 -c_runtime/atan2f/test1,1 -c_runtime/atanf/test1,1 -c_runtime/atanh/test1,1 -c_runtime/atanhf/test1,1 -c_runtime/atof/test1,1 -c_runtime/atoi/test1,1 -c_runtime/atol/test1,1 -c_runtime/bsearch/test1,1 -c_runtime/bsearch/test2,1 -c_runtime/cbrt/test1,1 -c_runtime/cbrtf/test1,1 -c_runtime/ceil/test1,1 -c_runtime/ceilf/test1,1 -c_runtime/cos/test1,1 -c_runtime/cosf/test1,1 -c_runtime/cosh/test1,1 -c_runtime/coshf/test1,1 -c_runtime/ctime/test1,1 -c_runtime/errno/test1,1 -c_runtime/errno/test2,1 -c_runtime/exit/test1,1 -c_runtime/exp/test1,1 -c_runtime/expf/test1,1 -c_runtime/fabs/test1,1 -c_runtime/fabsf/test1,1 -c_runtime/fclose/test1,1 -c_runtime/fclose/test2,1 -c_runtime/feof/test1,1 -c_runtime/ferror/test1,1 -c_runtime/ferror/test2,1 -c_runtime/fflush/test1,1 -c_runtime/fgets/test1,1 -c_runtime/fgets/test2,1 -c_runtime/fgets/test3,1 -c_runtime/floor/test1,1 -c_runtime/floorf/test1,1 -c_runtime/fma/test1,1 -c_runtime/fmaf/test1,1 -c_runtime/fmod/test1,1 -c_runtime/fmodf/test1,1 -c_runtime/fopen/test1,1 -c_runtime/fopen/test2,1 -c_runtime/fopen/test3,1 -c_runtime/fopen/test4,1 -c_runtime/fopen/test5,1 -c_runtime/fopen/test6,1 -c_runtime/fopen/test7,1 -c_runtime/fprintf/test1,1 -c_runtime/fprintf/test2,1 -c_runtime/fprintf/test3,1 -c_runtime/fprintf/test4,1 -c_runtime/fprintf/test5,1 -c_runtime/fprintf/test6,1 -c_runtime/fprintf/test7,1 -c_runtime/fprintf/test8,1 -c_runtime/fprintf/test9,1 -c_runtime/fprintf/test10,1 -c_runtime/fprintf/test11,1 -c_runtime/fprintf/test12,1 -c_runtime/fprintf/test13,1 -c_runtime/fprintf/test14,1 -c_runtime/fprintf/test15,1 -c_runtime/fprintf/test16,1 -c_runtime/fprintf/test17,1 -c_runtime/fprintf/test18,1 -c_runtime/fprintf/test19,1 -c_runtime/fputs/test1,1 -c_runtime/fputs/test2,1 -c_runtime/fread/test1,1 -c_runtime/fread/test2,1 -c_runtime/fread/test3,1 -c_runtime/free/test1,1 -c_runtime/fseek/test1,1 -c_runtime/ftell/test1,1 -c_runtime/fwprintf/test1,1 -c_runtime/fwprintf/test2,1 -c_runtime/fwprintf/test3,1 -c_runtime/fwprintf/test4,1 -c_runtime/fwprintf/test5,1 -c_runtime/fwprintf/test6,1 -c_runtime/fwprintf/test7,1 -c_runtime/fwprintf/test8,1 -c_runtime/fwprintf/test9,1 -c_runtime/fwprintf/test10,1 -c_runtime/fwprintf/test11,1 -c_runtime/fwprintf/test12,1 -c_runtime/fwprintf/test13,1 -c_runtime/fwprintf/test14,1 -c_runtime/fwprintf/test15,1 -c_runtime/fwprintf/test16,1 -c_runtime/fwprintf/test17,1 -c_runtime/fwprintf/test18,1 -c_runtime/fwprintf/test19,1 -c_runtime/fwrite/test1,1 -c_runtime/getc/test1,1 -c_runtime/getenv/test1,0 -c_runtime/getenv/test2,1 -c_runtime/getenv/test3,1 -c_runtime/ilogb/test1,1 -c_runtime/ilogbf/test1,1 -c_runtime/isalnum/test1,1 -c_runtime/isalpha/test1,1 -c_runtime/isdigit/test1,1 -c_runtime/islower/test1,1 -c_runtime/isprint/test1,1 -c_runtime/isprint/test2,1 -c_runtime/isspace/test1,1 -c_runtime/isupper/test1,1 -c_runtime/iswdigit/test1,1 -c_runtime/iswprint/test1,1 -c_runtime/iswspace/test1,1 -c_runtime/iswupper/test1,1 -c_runtime/iswxdigit/test1,1 -c_runtime/isxdigit/test1,1 -c_runtime/labs/test1,1 -c_runtime/llabs/test1,1 -c_runtime/localtime/test1,1 -c_runtime/log/test1,1 -c_runtime/log2/test1,1 -c_runtime/log2f/test1,1 -c_runtime/log10/test1,1 -c_runtime/log10f/test1,1 -c_runtime/logf/test1,1 -c_runtime/malloc/test1,1 -c_runtime/memchr/test1,1 -c_runtime/memcmp/test1,1 -c_runtime/memcpy/test1,1 -c_runtime/memmove/test1,1 -c_runtime/memset/test1,1 -c_runtime/modf/test1,1 -c_runtime/pow/test1,1 -c_runtime/powf/test1,1 -c_runtime/printf/test1,1 -c_runtime/printf/test2,1 -c_runtime/printf/test3,1 -c_runtime/printf/test4,1 -c_runtime/printf/test5,1 -c_runtime/printf/test6,1 -c_runtime/printf/test7,1 -c_runtime/printf/test8,1 -c_runtime/printf/test9,1 -c_runtime/printf/test10,1 -c_runtime/printf/test11,1 -c_runtime/printf/test12,1 -c_runtime/printf/test13,1 -c_runtime/printf/test14,1 -c_runtime/printf/test15,1 -c_runtime/printf/test16,1 -c_runtime/printf/test17,1 -c_runtime/printf/test18,1 -c_runtime/printf/test19,1 -c_runtime/qsort/test1,1 -c_runtime/qsort/test2,1 -c_runtime/rand_srand/test1,1 -c_runtime/realloc/test1,1 -c_runtime/scalbn/test1,1 -c_runtime/scalbnf/test1,1 -c_runtime/sin/test1,1 -c_runtime/sinf/test1,1 -c_runtime/sinh/test1,1 -c_runtime/sinhf/test1,1 -c_runtime/sprintf_s/test1,1 -c_runtime/sprintf_s/test2,1 -c_runtime/sprintf_s/test3,1 -c_runtime/sprintf_s/test4,1 -c_runtime/sprintf_s/test6,1 -c_runtime/sprintf_s/test7,1 -c_runtime/sprintf_s/test8,1 -c_runtime/sprintf_s/test9,1 -c_runtime/sprintf_s/test10,1 -c_runtime/sprintf_s/test11,1 -c_runtime/sprintf_s/test12,1 -c_runtime/sprintf_s/test13,1 -c_runtime/sprintf_s/test14,1 -c_runtime/sprintf_s/test15,1 -c_runtime/sprintf_s/test16,1 -c_runtime/sprintf_s/test17,1 -c_runtime/sprintf_s/test18,1 -c_runtime/sprintf_s/test19,1 -c_runtime/sqrt/test1,1 -c_runtime/sqrtf/test1,1 -c_runtime/sscanf_s/test1,1 -c_runtime/sscanf_s/test2,1 -c_runtime/sscanf_s/test3,1 -c_runtime/sscanf_s/test4,1 -c_runtime/sscanf_s/test5,1 -c_runtime/sscanf_s/test6,1 -c_runtime/sscanf_s/test7,1 -c_runtime/sscanf_s/test8,1 -c_runtime/sscanf_s/test9,1 -c_runtime/sscanf_s/test10,1 -c_runtime/sscanf_s/test11,1 -c_runtime/sscanf_s/test12,1 -c_runtime/sscanf_s/test13,1 -c_runtime/sscanf_s/test14,1 -c_runtime/sscanf_s/test15,1 -c_runtime/sscanf_s/test16,1 -c_runtime/sscanf_s/test17,1 -c_runtime/strcat/test1,1 -c_runtime/strchr/test1,1 -c_runtime/strcmp/test1,1 -c_runtime/strcpy/test1,1 -c_runtime/strcspn/test1,1 -c_runtime/strlen/test1,1 -c_runtime/strncat/test1,1 -c_runtime/strncmp/test1,1 -c_runtime/strncpy/test1,1 -c_runtime/strpbrk/test1,1 -c_runtime/strrchr/test1,1 -c_runtime/strspn/test1,1 -c_runtime/strstr/test1,1 -c_runtime/strtod/test1,1 -c_runtime/strtod/test2,1 -c_runtime/strtok/test1,1 -c_runtime/strtoul/test1,1 -c_runtime/swprintf/test1,1 -c_runtime/swprintf/test2,1 -c_runtime/swprintf/test3,1 -c_runtime/swprintf/test4,1 -c_runtime/swprintf/test5,1 -c_runtime/swprintf/test6,1 -c_runtime/swprintf/test7,1 -c_runtime/swprintf/test8,1 -c_runtime/swprintf/test9,1 -c_runtime/swprintf/test10,1 -c_runtime/swprintf/test11,1 -c_runtime/swprintf/test12,1 -c_runtime/swprintf/test13,1 -c_runtime/swprintf/test14,1 -c_runtime/swprintf/test15,1 -c_runtime/swprintf/test16,1 -c_runtime/swprintf/test17,1 -c_runtime/swprintf/test18,1 -c_runtime/swprintf/test19,1 -c_runtime/swscanf/test1,1 -c_runtime/swscanf/test2,1 -c_runtime/swscanf/test3,1 -c_runtime/swscanf/test4,1 -c_runtime/swscanf/test5,1 -c_runtime/swscanf/test6,1 -c_runtime/swscanf/test7,1 -c_runtime/swscanf/test8,1 -c_runtime/swscanf/test9,1 -c_runtime/swscanf/test10,1 -c_runtime/swscanf/test11,1 -c_runtime/swscanf/test12,1 -c_runtime/swscanf/test13,1 -c_runtime/swscanf/test14,1 -c_runtime/swscanf/test15,1 -c_runtime/swscanf/test16,1 -c_runtime/swscanf/test17,1 -c_runtime/tan/test1,1 -c_runtime/tanf/test1,1 -c_runtime/tanh/test1,1 -c_runtime/tanhf/test1,1 -c_runtime/time/test1,1 -c_runtime/tolower/test1,1 -c_runtime/toupper/test1,1 -c_runtime/towlower/test1,1 -c_runtime/towupper/test1,1 -c_runtime/ungetc/test1,1 -c_runtime/vfprintf/test1,1 -c_runtime/vfprintf/test2,1 -c_runtime/vfprintf/test3,1 -c_runtime/vfprintf/test4,1 -c_runtime/vfprintf/test5,1 -c_runtime/vfprintf/test6,1 -c_runtime/vfprintf/test7,1 -c_runtime/vfprintf/test8,1 -c_runtime/vfprintf/test9,1 -c_runtime/vfprintf/test10,1 -c_runtime/vfprintf/test11,1 -c_runtime/vfprintf/test12,1 -c_runtime/vfprintf/test13,1 -c_runtime/vfprintf/test14,1 -c_runtime/vfprintf/test15,1 -c_runtime/vfprintf/test16,1 -c_runtime/vfprintf/test17,1 -c_runtime/vfprintf/test18,1 -c_runtime/vfprintf/test19,1 -c_runtime/vprintf/test1,1 -c_runtime/vprintf/test2,1 -c_runtime/vprintf/test3,1 -c_runtime/vprintf/test4,1 -c_runtime/vprintf/test5,1 -c_runtime/vprintf/test6,1 -c_runtime/vprintf/test7,1 -c_runtime/vprintf/test8,1 -c_runtime/vprintf/test9,1 -c_runtime/vprintf/test10,1 -c_runtime/vprintf/test11,1 -c_runtime/vprintf/test12,1 -c_runtime/vprintf/test13,1 -c_runtime/vprintf/test14,1 -c_runtime/vprintf/test15,1 -c_runtime/vprintf/test16,1 -c_runtime/vprintf/test17,1 -c_runtime/vprintf/test18,1 -c_runtime/vprintf/test19,1 -c_runtime/vsprintf/test1,1 -c_runtime/vsprintf/test2,1 -c_runtime/vsprintf/test3,1 -c_runtime/vsprintf/test4,1 -c_runtime/vsprintf/test5,1 -c_runtime/vsprintf/test6,1 -c_runtime/vsprintf/test7,1 -c_runtime/vsprintf/test8,1 -c_runtime/vsprintf/test9,1 -c_runtime/vsprintf/test10,1 -c_runtime/vsprintf/test11,1 -c_runtime/vsprintf/test12,1 -c_runtime/vsprintf/test13,1 -c_runtime/vsprintf/test14,1 -c_runtime/vsprintf/test15,1 -c_runtime/vsprintf/test16,1 -c_runtime/vsprintf/test17,1 -c_runtime/vsprintf/test18,1 -c_runtime/vsprintf/test19,1 -c_runtime/vswprintf/test1,1 -c_runtime/vswprintf/test2,1 -c_runtime/vswprintf/test3,1 -c_runtime/vswprintf/test4,1 -c_runtime/vswprintf/test5,1 -c_runtime/vswprintf/test6,1 -c_runtime/vswprintf/test7,1 -c_runtime/vswprintf/test8,1 -c_runtime/vswprintf/test9,1 -c_runtime/vswprintf/test10,1 -c_runtime/vswprintf/test11,1 -c_runtime/vswprintf/test12,1 -c_runtime/vswprintf/test13,1 -c_runtime/vswprintf/test14,1 -c_runtime/vswprintf/test15,1 -c_runtime/vswprintf/test16,1 -c_runtime/vswprintf/test17,1 -c_runtime/vswprintf/test18,1 -c_runtime/vswprintf/test19,1 -c_runtime/wcscat/test1,1 -c_runtime/wcschr/test1,1 -c_runtime/wcscmp/test1,1 -c_runtime/wcscpy/test1,1 -c_runtime/wcslen/test1,1 -c_runtime/wcsncat/test1,1 -c_runtime/wcsncmp/test1,1 -c_runtime/wcsncpy/test1,1 -c_runtime/wcspbrk/test1,1 -c_runtime/wcsrchr/test1,1 -c_runtime/wcsstr/test1,1 -c_runtime/wcstod/test1,1 -c_runtime/wcstod/test2,1 -c_runtime/wcstok/test1,1 -c_runtime/wcstol/test1,1 -c_runtime/wcstol/test2,1 -c_runtime/wcstol/test3,1 -c_runtime/wcstol/test4,1 -c_runtime/wcstol/test5,1 -c_runtime/wcstol/test6,1 -c_runtime/wcstoul/test1,1 -c_runtime/wcstoul/test2,1 -c_runtime/wcstoul/test3,1 -c_runtime/wcstoul/test4,1 -c_runtime/wcstoul/test5,1 -c_runtime/wcstoul/test6,1 -debug_api/writeprocessmemory/test1,1 -exception_handling/pal_except/test1,1 -exception_handling/pal_except/test2,1 -exception_handling/pal_except/test3,1 -exception_handling/pal_except/test4,1 -exception_handling/pal_except/test5,1 -exception_handling/pal_except/test6,1 -exception_handling/pal_except/test7,1 -exception_handling/pal_except_filter/test1,1 -exception_handling/pal_except_filter/test2,1 -exception_handling/pal_except_filter/test3,1 -exception_handling/pal_except_filter_ex/test1,1 -exception_handling/pal_except_filter_ex/test2,1 -exception_handling/pal_except_filter_ex/test3,1 -exception_handling/pal_getbottommostregistration/test1,1 -exception_handling/pal_getbottommostregistration/test2,1 -exception_handling/pal_finally/test1,1 -exception_handling/pal_try_except/test1,1 -exception_handling/pal_try_except/test2,1 -exception_handling/pal_try_except_ex/test1,1 -exception_handling/pal_try_except_ex/test2,1 -exception_handling/pal_try_except_ex/test3,1 -exception_handling/pal_try_leave_finally/test1,1 -exception_handling/raiseexception/test1,1 -exception_handling/raiseexception/test2,1 -exception_handling/raiseexception/test3,1 -file_io/comparefiletime/test1,1 -file_io/copyfilea/test1,1 -file_io/copyfilea/test2,1 -file_io/copyfilea/test3,1 -file_io/copyfilea/test4,1 -file_io/copyfilew/test1,1 -file_io/copyfilew/test2,1 -file_io/createdirectorya/test1,1 -file_io/createdirectoryw/test1,1 -file_io/createfilea/test1,1 -file_io/createfilew/test1,1 -file_io/deletefilea/test1,1 -file_io/deletefilew/test1,1 -file_io/errorpathnotfound/test1,1 -file_io/errorpathnotfound/test2,1 -file_io/errorpathnotfound/test3,1 -file_io/findclose/test1,1 -file_io/findfirstfilea/test1,1 -#file_io/findfirstfilew/test1,1 -file_io/findnextfilea/test1,1 -file_io/findnextfilew/test1,1 -file_io/flushfilebuffers/test1,1 -file_io/getconsoleoutputcp/test1,1 -file_io/getcurrentdirectorya/test1,1 -file_io/getcurrentdirectoryw/test1,1 -#file_io/getfileattributesa/test1,1 -#file_io/getfileattributesexw/test1,1 -file_io/getfileattributesexw/test2,1 -#file_io/getfileattributesw/test1,1 -file_io/getfullpathnamea/test1,1 -file_io/getfullpathnamea/test2,1 -file_io/getfullpathnamea/test3,1 -file_io/getfullpathnamea/test4,1 -file_io/getfullpathnamew/test1,1 -file_io/getfullpathnamew/test2,1 -#file_io/getfullpathnamew/test3,1 -#file_io/getfullpathnamew/test4,1 -file_io/getlongpathnamew/test1,1 -file_io/getlongpathnamew/test2,1 -file_io/getsystemtime/test1,1 -file_io/getsystemtimeasfiletime/test1,1 -file_io/gettempfilenamea/test1,1 -file_io/gettempfilenamea/test3,1 -file_io/gettempfilenamew/test1,1 -file_io/gettempfilenamew/test3,1 -file_io/gettemppatha/test1,1 -file_io/gettemppathw/test1,1 -file_io/movefileexw/test1,1 -#file_io/readfile/test1,1 -file_io/readfile/test2,1 -file_io/readfile/test3,1 -file_io/readfile/test4,1 -file_io/removedirectoryw/test1,1 -file_io/setcurrentdirectorya/test1,1 -file_io/setcurrentdirectorya/test2,1 -file_io/setcurrentdirectorya/test3,1 -file_io/setcurrentdirectoryw/test1,1 -file_io/setcurrentdirectoryw/test2,1 -#file_io/setcurrentdirectoryw/test3,1 -file_io/setendoffile/test1,1 -file_io/setendoffile/test2,1 -file_io/setendoffile/test3,1 -file_io/setendoffile/test4,1 -file_io/setendoffile/test5,1 -file_io/setfileattributesa/test2,1 -file_io/setfileattributesa/test3,1 -file_io/setfileattributesw/test2,1 -file_io/setfileattributesw/test3,1 -file_io/setfilepointer/test1,1 -file_io/setfilepointer/test2,1 -file_io/setfilepointer/test3,1 -file_io/setfilepointer/test4,1 -file_io/writefile/test1,1 -file_io/writefile/test2,1 -file_io/writefile/test3,1 -file_io/writefile/test4,1 -file_io/writefile/test5,1 -filemapping_memmgt/createfilemappinga/test1,1 -filemapping_memmgt/createfilemappinga/test3,1 -filemapping_memmgt/createfilemappinga/test4,1 -filemapping_memmgt/createfilemappinga/test5,1 -filemapping_memmgt/createfilemappinga/test6,1 -filemapping_memmgt/createfilemappinga/test7,1 -filemapping_memmgt/createfilemappinga/test8,1 -filemapping_memmgt/createfilemappinga/test9,1 -filemapping_memmgt/createfilemappingw/test1,1 -filemapping_memmgt/createfilemappingw/test3,1 -filemapping_memmgt/createfilemappingw/test4,1 -filemapping_memmgt/createfilemappingw/test5,1 -filemapping_memmgt/createfilemappingw/test6,1 -filemapping_memmgt/createfilemappingw/test7,1 -filemapping_memmgt/createfilemappingw/test8,1 -filemapping_memmgt/createfilemappingw/test9,1 -filemapping_memmgt/freelibrary/test1,1 -filemapping_memmgt/freelibrary/test2,1 -filemapping_memmgt/freelibraryandexitthread/test1,1 -filemapping_memmgt/getmodulefilenamea/test1,1 -filemapping_memmgt/getmodulefilenamea/test2,1 -filemapping_memmgt/getmodulefilenamew/test1,1 -filemapping_memmgt/getmodulefilenamew/test2,1 -filemapping_memmgt/getprocaddress/test1,1 -filemapping_memmgt/getprocaddress/test2,1 -filemapping_memmgt/getprocessheap/test1,1 -filemapping_memmgt/heapalloc/test1,1 -filemapping_memmgt/heapalloc/test2,1 -filemapping_memmgt/heapfree/test1,1 -filemapping_memmgt/heaprealloc/test1,1 -filemapping_memmgt/heaprealloc/test2,1 -filemapping_memmgt/heaprealloc/test3,1 -filemapping_memmgt/heaprealloc/test4,1 -filemapping_memmgt/heaprealloc/test5,1 -filemapping_memmgt/localalloc/test1,1 -filemapping_memmgt/localfree/test1,1 -filemapping_memmgt/localfree/test2,1 -filemapping_memmgt/lockfile/test1,1 -filemapping_memmgt/lockfile/test2,1 -filemapping_memmgt/lockfile/test3,1 -filemapping_memmgt/lockfile/test4,1 -filemapping_memmgt/lockfile/test5,1 -filemapping_memmgt/lockfile/test6,1 -filemapping_memmgt/lockfile/test7,1 -filemapping_memmgt/mapviewoffile/test1,1 -filemapping_memmgt/mapviewoffile/test2,1 -filemapping_memmgt/mapviewoffile/test3,1 -filemapping_memmgt/mapviewoffile/test4,1 -filemapping_memmgt/mapviewoffile/test5,1 -filemapping_memmgt/mapviewoffile/test6,1 -filemapping_memmgt/openfilemappinga/test1,1 -filemapping_memmgt/openfilemappinga/test2,1 -filemapping_memmgt/openfilemappinga/test3,1 -filemapping_memmgt/openfilemappingw/test1,1 -filemapping_memmgt/openfilemappingw/test2,1 -filemapping_memmgt/openfilemappingw/test3,1 -filemapping_memmgt/readprocessmemory/readprocessmemory_neg1,1 -filemapping_memmgt/readprocessmemory/test1,1 -filemapping_memmgt/rtlmovememory/test1,1 -filemapping_memmgt/rtlmovememory/test3,1 -filemapping_memmgt/rtlmovememory/test4,1 -filemapping_memmgt/rtlmovememory/test5,1 -filemapping_memmgt/unlockfile/test1,1 -filemapping_memmgt/unlockfile/test2,1 -filemapping_memmgt/unlockfile/test3,1 -filemapping_memmgt/unlockfile/test4,1 -filemapping_memmgt/unmapviewoffile/test1,1 -filemapping_memmgt/virtualalloc/test1,1 -filemapping_memmgt/virtualalloc/test2,1 -filemapping_memmgt/virtualalloc/test3,1 -filemapping_memmgt/virtualalloc/test4,1 -filemapping_memmgt/virtualalloc/test5,1 -filemapping_memmgt/virtualalloc/test6,1 -filemapping_memmgt/virtualalloc/test7,1 -filemapping_memmgt/virtualalloc/test8,1 -filemapping_memmgt/virtualalloc/test9,1 -filemapping_memmgt/virtualalloc/test10,1 -filemapping_memmgt/virtualalloc/test11,1 -filemapping_memmgt/virtualalloc/test12,1 -filemapping_memmgt/virtualalloc/test13,1 -filemapping_memmgt/virtualalloc/test14,1 -filemapping_memmgt/virtualalloc/test15,1 -filemapping_memmgt/virtualalloc/test16,1 -filemapping_memmgt/virtualalloc/test17,1 -filemapping_memmgt/virtualalloc/test18,1 -filemapping_memmgt/virtualalloc/test19,1 -filemapping_memmgt/virtualalloc/test20,1 -filemapping_memmgt/virtualalloc/test21,1 -filemapping_memmgt/virtualfree/test1,1 -filemapping_memmgt/virtualfree/test2,1 -filemapping_memmgt/virtualfree/test3,1 -filemapping_memmgt/virtualprotect/test1,1 -filemapping_memmgt/virtualprotect/test2,1 -filemapping_memmgt/virtualprotect/test3,1 -filemapping_memmgt/virtualprotect/test4,1 -filemapping_memmgt/virtualprotect/test6,1 -filemapping_memmgt/virtualprotect/test7,1 -filemapping_memmgt/virtualquery/test1,1 -loader/loadlibrarya/test1,1 -loader/loadlibrarya/test2,1 -loader/loadlibrarya/test3,0 -loader/loadlibrarya/test5,1 -loader/loadlibrarya/test6,1 -loader/loadlibraryw/test1,1 -loader/loadlibraryw/test2,1 -loader/loadlibraryw/test3,1 -loader/loadlibraryw/test5,1 -locale_info/comparestringw/test1,1 -locale_info/getacp/test1,1 -locale_info/getcpinfo/test1,1 -locale_info/getlocaleinfow/test1,1 -locale_info/getlocaleinfow/test2,1 -locale_info/getstringtypeexw/test1,1 -locale_info/getstringtypeexw/test2,0 -locale_info/getsystemdefaultlangid/test1,1 -locale_info/getthreadlocale/test1,1 -locale_info/gettimezoneinformation/test1,1 -locale_info/getuserdefaultlangid/test1,1 -locale_info/getuserdefaultlcid/test1,1 -locale_info/isdbcsleadbyteex/test1,1 -locale_info/isvalidcodepage/test1,1 -locale_info/isvalidlocale/test1,1 -locale_info/multibytetowidechar/test1,1 -locale_info/multibytetowidechar/test2,1 -locale_info/multibytetowidechar/test3,1 -locale_info/setthreadlocale/test1,1 -locale_info/widechartomultibyte/test1,1 -locale_info/widechartomultibyte/test2,1 -locale_info/widechartomultibyte/test3,1 -miscellaneous/_i64tow/test1,1 -miscellaneous/charnexta/test1,1 -miscellaneous/charnexta/test2,1 -miscellaneous/charnextexa/test1,1 -miscellaneous/charnextexa/test2,1 -miscellaneous/closehandle/test1,1 -miscellaneous/closehandle/test2,1 -miscellaneous/createpipe/test1,1 -miscellaneous/flushinstructioncache/test1,1 -miscellaneous/formatmessagew/test1,1 -miscellaneous/formatmessagew/test2,1 -miscellaneous/formatmessagew/test3,1 -miscellaneous/formatmessagew/test4,1 -miscellaneous/formatmessagew/test5,1 -miscellaneous/formatmessagew/test6,1 -miscellaneous/freeenvironmentstringsw/test1,1 -miscellaneous/freeenvironmentstringsw/test2,1 -miscellaneous/getcalendarinfow/test1,1 -miscellaneous/getcommandlinew/test1,1 -miscellaneous/getenvironmentstringsw/test1,1 -miscellaneous/getenvironmentvariablea/test1,1 -miscellaneous/getenvironmentvariablea/test2,1 -miscellaneous/getenvironmentvariablea/test3,1 -miscellaneous/getenvironmentvariablea/test4,1 -miscellaneous/getenvironmentvariablew/test1,1 -miscellaneous/getenvironmentvariablew/test2,1 -miscellaneous/getenvironmentvariablew/test3,1 -miscellaneous/getenvironmentvariablew/test4,1 -miscellaneous/getlasterror/test1,1 -miscellaneous/getsysteminfo/test1,1 -miscellaneous/getglobalmemorystatusex/test1,1 -miscellaneous/gettickcount/test1,1 -miscellaneous/getversionexa/test1,1 -miscellaneous/getversionexw/test1,1 -miscellaneous/interlockedcompareexchange/test1,1 -miscellaneous/interlockedcompareexchangepointer/test1,1 -miscellaneous/interlockeddecrement/test1,1 -miscellaneous/interlockedexchange/test1,1 -miscellaneous/interlockedexchangepointer/test1,1 -miscellaneous/interlockedincrement/test1,1 -miscellaneous/isbadcodeptr/test1,1 -miscellaneous/isbadreadptr/test1,1 -miscellaneous/isbadwriteptr/test1,1 -miscellaneous/isbadwriteptr/test2,1 -miscellaneous/isbadwriteptr/test3,1 -miscellaneous/lstrcatw/test1,1 -miscellaneous/lstrcatw/test2,1 -miscellaneous/lstrcatw/test3,1 -miscellaneous/lstrcatw/test4,1 -miscellaneous/lstrcpynw/test1,1 -miscellaneous/lstrcpyw/test1,1 -miscellaneous/lstrlena/test1,1 -miscellaneous/lstrlenw/test1,1 -miscellaneous/queryperformancecounter/test1,1 -miscellaneous/queryperformancefrequency/test1,1 -miscellaneous/setenvironmentvariablea/test1,1 -miscellaneous/setenvironmentvariablea/test2,1 -miscellaneous/setenvironmentvariablew/test1,1 -miscellaneous/setenvironmentvariablew/test2,1 -miscellaneous/setlasterror/test1,1 -miscellaneous/wsprintfa/test1,1 -miscellaneous/wsprintfa/test2,1 -miscellaneous/wsprintfa/test3,1 -miscellaneous/wsprintfa/test6,1 -miscellaneous/wsprintfa/test7,1 -miscellaneous/wsprintfa/test8,1 -miscellaneous/wsprintfa/test9,1 -miscellaneous/wsprintfa/test11,1 -miscellaneous/wsprintfa/test12,1 -miscellaneous/wsprintfa/test13,1 -miscellaneous/wsprintfw/test1,1 -miscellaneous/wsprintfw/test2,1 -miscellaneous/wsprintfw/test3,1 -miscellaneous/wsprintfw/test6,1 -miscellaneous/wsprintfw/test7,1 -miscellaneous/wsprintfw/test8,1 -miscellaneous/wsprintfw/test9,1 -miscellaneous/wsprintfw/test11,1 -miscellaneous/wsprintfw/test12,1 -miscellaneous/wsprintfw/test13,1 -pal_specific/pal_errno/test1,1 -pal_specific/pal_getpaldirectoryw/test1,1 -pal_specific/pal_getuserconfigurationdirectoryw/test1,1 -pal_specific/pal_initialize_terminate/test1,1 -threading/createeventa/test1,1 -threading/createeventa/test2,1 -threading/createeventa/test3,1 -threading/createeventw/test1,1 -threading/createeventw/test2,1 -threading/createeventw/test3,1 -threading/createmutexw_releasemutex/test1,1 -threading/createmutexw_releasemutex/test2,1 -threading/createprocessa/test1,1 -threading/createprocessa/test2,1 -threading/createprocessw/test1,1 -threading/createprocessw/test2,1 -threading/createsemaphorea_releasesemaphore/test1,1 -threading/createsemaphorea_releasesemaphore/test2,1 -threading/createsemaphorea_releasesemaphore/test3,1 -threading/createsemaphorew_releasesemaphore/test1,1 -threading/createsemaphorew_releasesemaphore/test2,1 -threading/createsemaphorew_releasesemaphore/test3,1 -threading/createthread/test1,1 -threading/createthread/test2,1 -threading/createthread/test3,1 -threading/criticalsectionfunctions/test1,1 -threading/criticalsectionfunctions/test2,1 -threading/criticalsectionfunctions/test3,1 -threading/criticalsectionfunctions/test4,1 -threading/criticalsectionfunctions/test5,1 -threading/criticalsectionfunctions/test6,1 -threading/criticalsectionfunctions/test7,1 -threading/disablethreadlibrarycalls/test1,1 -threading/disablethreadlibrarycalls/test2,1 -threading/duplicatehandle/test1,1 -threading/duplicatehandle/test2,1 -threading/duplicatehandle/test3,1 -threading/duplicatehandle/test4,1 -threading/duplicatehandle/test5,1 -threading/duplicatehandle/test6,1 -threading/duplicatehandle/test7,1 -threading/duplicatehandle/test8,1 -threading/duplicatehandle/test9,1 -threading/duplicatehandle/test10,1 -threading/duplicatehandle/test11,1 -threading/exitprocess/test1,1 -threading/exitthread/test1,1 -#threading/exitthread/test2,1 -threading/exitthread/test3,1 -threading/getcurrentprocess/test1,1 -threading/getcurrentprocessid/test1,1 -threading/getcurrentthread/test1,1 -threading/getcurrentthread/test2,1 -threading/getcurrentthreadid/test1,1 -threading/getexitcodeprocess/test1,1 -threading/getprocesstimes/test2,1 -threading/openeventw/test1,1 -threading/openeventw/test2,1 -threading/openeventw/test3,1 -threading/openeventw/test4,1 -threading/openeventw/test5,1 -threading/openprocess/test1,1 -threading/queueuserapc/test1,1 -threading/queueuserapc/test2,1 -threading/queueuserapc/test3,1 -threading/queueuserapc/test4,1 -threading/queueuserapc/test5,0 -threading/queueuserapc/test6,0 -threading/queueuserapc/test7,1 -threading/releasemutex/test3,1 -threading/releasesemaphore/test1,1 -threading/resetevent/test1,1 -threading/resumethread/test1,1 -threading/seterrormode/test1,1 -threading/setevent/test1,1 -threading/setthreadcontext/test1,1 -threading/sleepex/test2,1 -threading/suspendthread/test1,1 -threading/terminateprocess/test1,1 -threading/tls/test1,1 -threading/tls/test2,1 -threading/tls/test3,1 -threading/tls/test4,1 -threading/tls/test5,1 -threading/waitformultipleobjects/test1,1 -threading/waitformultipleobjectsex/test1,1 -threading/waitformultipleobjectsex/test2,1 -threading/waitformultipleobjectsex/test3,1 -threading/waitformultipleobjectsex/test4,1 -threading/waitformultipleobjectsex/test5,1 - - diff --git a/src/palrt/path.cpp b/src/palrt/path.cpp index fc01183e33..3d6c7a6564 100644 --- a/src/palrt/path.cpp +++ b/src/palrt/path.cpp @@ -46,11 +46,11 @@ STDAPI_(LPWSTR) StrRChrW(LPCWSTR lpStart, LPCWSTR lpEnd, WCHAR wMatch) LPCWSTR lpFound = NULL; RIPMSG(lpStart && IS_VALID_STRING_PTRW(lpStart, -1), "StrRChrW: caller passed bad lpStart"); - RIPMSG(!lpEnd || lpEnd <= lpStart + lstrlenW(lpStart), "StrRChrW: caller passed bad lpEnd"); + RIPMSG(!lpEnd || lpEnd <= lpStart + wcslen(lpStart), "StrRChrW: caller passed bad lpEnd"); // don't need to check for NULL lpStart if (!lpEnd) - lpEnd = lpStart + lstrlenW(lpStart); + lpEnd = lpStart + wcslen(lpStart); for ( ; lpStart < lpEnd; lpStart++) { @@ -206,7 +206,7 @@ LPCWSTR GetPCEnd(LPCWSTR lpszStart) } if (!lpszEnd) { - lpszEnd = lpszStart + lstrlenW(lpszStart); + lpszEnd = lpszStart + wcslen(lpszStart); } return lpszEnd; @@ -439,9 +439,9 @@ STDAPI_(LPWSTR) PathCombineW(LPWSTR lpszDest, LPCWSTR lpszDir, LPCWSTR lpszFile) pszT = PathAddBackslashW(szTemp); if (pszT) { - int iRemaining = (int)(ARRAYSIZE(szTemp) - (pszT - szTemp)); + size_t iRemaining = ARRAYSIZE(szTemp) - (pszT - szTemp); - if (lstrlenW(lpszFile) < iRemaining) + if (wcslen(lpszFile) < iRemaining) { StringCchCopyNW(pszT, iRemaining, lpszFile, iRemaining); } @@ -527,7 +527,7 @@ STDAPI_(LPWSTR) PathAddBackslashW(LPWSTR lpszPath) if (lpszPath) { - int ichPath = lstrlenW(lpszPath); + size_t ichPath = wcslen(lpszPath); LPWSTR lpszEnd = lpszPath + ichPath; if (ichPath) diff --git a/src/utilcode/guidfromname.cpp b/src/utilcode/guidfromname.cpp index 3a6878305e..4919bea6fd 100644 --- a/src/utilcode/guidfromname.cpp +++ b/src/utilcode/guidfromname.cpp @@ -232,5 +232,5 @@ void CorGuidFromNameW pGuidResult, COMPLUS_RUNTIME_GUID, wzName, - (DWORD)((cchName == (SIZE_T) -1 ? (lstrlenW(wzName)+1) : cchName) * sizeof(WCHAR))); + (DWORD)((cchName == (SIZE_T) -1 ? (wcslen(wzName)+1) : cchName) * sizeof(WCHAR))); } diff --git a/src/vm/clrprivbinderwinrt.cpp b/src/vm/clrprivbinderwinrt.cpp index 085af57b8b..2441dae399 100644 --- a/src/vm/clrprivbinderwinrt.cpp +++ b/src/vm/clrprivbinderwinrt.cpp @@ -330,7 +330,7 @@ HRESULT CLRPrivBinderWinRT::BindWinRTAssemblyByName( // native image for this WinRT assembly. // The WinRT team has said that WinMDs will have the same simple name as the filename. // - IfFailGo(pAssemblyDefName->SetProperty(ASM_NAME_NAME, wszFileNameStripped, (lstrlenW(wszFileNameStripped) + 1) * sizeof(WCHAR))); + IfFailGo(pAssemblyDefName->SetProperty(ASM_NAME_NAME, wszFileNameStripped, (DWORD)((wcslen(wszFileNameStripped) + 1) * sizeof(WCHAR)))); NewHolder<CoreBindResult> pBindResult(new CoreBindResult()); StackSString sAssemblyPath(pResource->GetPath()); diff --git a/src/vm/debughelp.cpp b/src/vm/debughelp.cpp index 23443ceece..b60434658a 100644 --- a/src/vm/debughelp.cpp +++ b/src/vm/debughelp.cpp @@ -404,7 +404,7 @@ wchar_t* formatMethodDesc(MethodDesc* pMD, } buff[bufSize - 1] = W('\0'); // this will guarantee the buffer is also NULL-terminated - if(_snwprintf_s( &buff[lstrlenW(buff)] , bufSize -lstrlenW(buff) - 1, _TRUNCATE, W("::%S"), pMD->GetName()) < 0) + if(_snwprintf_s( &buff[wcslen(buff)] , bufSize - wcslen(buff) - 1, _TRUNCATE, W("::%S"), pMD->GetName()) < 0) { return NULL; } @@ -412,8 +412,8 @@ wchar_t* formatMethodDesc(MethodDesc* pMD, #ifdef _DEBUG if (pMD->m_pszDebugMethodSignature) { - if(_snwprintf_s(&buff[lstrlenW(buff)], - bufSize -lstrlenW(buff) - 1, + if(_snwprintf_s(&buff[wcslen(buff)], + bufSize - wcslen(buff) - 1, _TRUNCATE, W(" %S"), pMD->m_pszDebugMethodSignature) < 0) @@ -424,7 +424,7 @@ wchar_t* formatMethodDesc(MethodDesc* pMD, } #endif - if(_snwprintf_s(&buff[lstrlenW(buff)], bufSize -lstrlenW(buff) - 1, _TRUNCATE, W("(%x)"), (size_t)pMD) < 0) + if(_snwprintf_s(&buff[wcslen(buff)], bufSize - wcslen(buff) - 1, _TRUNCATE, W("(%x)"), (size_t)pMD) < 0) { return NULL; } @@ -483,7 +483,7 @@ int dumpStack(BYTE* topOfStack, unsigned len) return(0); } - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); const wchar_t* kind = W("RETADDR "); @@ -526,7 +526,7 @@ int dumpStack(BYTE* topOfStack, unsigned len) return(0); } - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); if (ftn != 0) { @@ -536,12 +536,12 @@ int dumpStack(BYTE* topOfStack, unsigned len) return(0); } - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); } else { wcsncpy_s(buffPtr, nLen - (buffPtr - buff), W("<UNKNOWN FTN>"), _TRUNCATE); - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); } if (whereCalled != 0) @@ -551,11 +551,11 @@ int dumpStack(BYTE* topOfStack, unsigned len) return(0); } - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); } wcsncpy_s(buffPtr, nLen - (buffPtr - buff), W("\n"), _TRUNCATE); - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); WszOutputDebugString(buff); } @@ -568,14 +568,14 @@ int dumpStack(BYTE* topOfStack, unsigned len) return(0); } - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); if( formatMethodTable(pMT, buffPtr, static_cast<DWORD>(buff+ nLen -buffPtr-1)) == NULL) { return(0); } - buffPtr += lstrlenW(buffPtr); + buffPtr += wcslen(buffPtr); wcsncpy_s(buffPtr, nLen - (buffPtr - buff), W("\n"), _TRUNCATE); WszOutputDebugString(buff); @@ -903,8 +903,8 @@ StackWalkAction PrintStackTraceCallback(CrawlFrame* pCF, VOID* pData) if (pCBD->withAppDomain) { - if(_snwprintf_s(&buff[lstrlenW(buff)], - nLen -lstrlenW(buff) - 1, + if(_snwprintf_s(&buff[wcslen(buff)], + nLen - wcslen(buff) - 1, _TRUNCATE, W("{[%3.3x] %s} "), pCF->GetAppDomain()->GetId().m_dwId, @@ -920,7 +920,7 @@ StackWalkAction PrintStackTraceCallback(CrawlFrame* pCF, VOID* pData) if (clsName != 0) { - if(_snwprintf_s(&buff[lstrlenW(buff)], nLen -lstrlenW(buff) - 1, _TRUNCATE, W("%S::"), clsName) < 0) + if(_snwprintf_s(&buff[wcslen(buff)], nLen - wcslen(buff) - 1, _TRUNCATE, W("%S::"), clsName) < 0) { return SWA_CONTINUE; } @@ -930,8 +930,8 @@ StackWalkAction PrintStackTraceCallback(CrawlFrame* pCF, VOID* pData) // But this routine is diagnostic aid, not customer-reachable so we won't bother to plug. AllocMemTracker dummyAmTracker; - int buffLen = _snwprintf_s(&buff[lstrlenW(buff)], - nLen -lstrlenW(buff) - 1, + int buffLen = _snwprintf_s(&buff[wcslen(buff)], + nLen - wcslen(buff) - 1, _TRUNCATE, W("%S %S "), pMD->GetName(), @@ -952,8 +952,8 @@ StackWalkAction PrintStackTraceCallback(CrawlFrame* pCF, VOID* pData) TADDR start = pCF->GetCodeInfo()->GetStartAddress(); - if(_snwprintf_s(&buff[lstrlenW(buff)], - nLen -lstrlenW(buff) - 1, + if(_snwprintf_s(&buff[wcslen(buff)], + nLen - wcslen(buff) - 1, _TRUNCATE, W("JIT ESP:%X MethStart:%X EIP:%X(rel %X)"), (size_t)GetRegdisplaySP(regs), @@ -968,7 +968,7 @@ StackWalkAction PrintStackTraceCallback(CrawlFrame* pCF, VOID* pData) else { - if(_snwprintf_s(&buff[lstrlenW(buff)], nLen -lstrlenW(buff) - 1, _TRUNCATE, W("EE implemented")) < 0) + if(_snwprintf_s(&buff[wcslen(buff)], nLen - wcslen(buff) - 1, _TRUNCATE, W("EE implemented")) < 0) { return SWA_CONTINUE; } @@ -979,8 +979,8 @@ StackWalkAction PrintStackTraceCallback(CrawlFrame* pCF, VOID* pData) { Frame* frame = pCF->GetFrame(); - if(_snwprintf_s(&buff[lstrlenW(buff)], - nLen -lstrlenW(buff) - 1, + if(_snwprintf_s(&buff[wcslen(buff)], + nLen - wcslen(buff) - 1, _TRUNCATE, W("EE Frame is") LFMT_ADDR, (size_t)DBG_ADDR(frame)) < 0) diff --git a/src/vm/winrthelpers.cpp b/src/vm/winrthelpers.cpp index 63ab357482..a034fb542d 100644 --- a/src/vm/winrthelpers.cpp +++ b/src/vm/winrthelpers.cpp @@ -157,8 +157,8 @@ GetBindableWinRTName( sNamespaceAndType.AppendUTF8(szNameSpace); sNamespaceAndType.Append(W(".")); sNamespaceAndType.AppendUTF8(szTypeName); - - pIAssemblyName->SetProperty(ASM_NAME_NAME, sNamespaceAndType.GetUnicode(), (lstrlenW(sNamespaceAndType.GetUnicode()) + 1) * sizeof(WCHAR)); - + + pIAssemblyName->SetProperty(ASM_NAME_NAME, sNamespaceAndType.GetUnicode(), (sNamespaceAndType.GetCount() + 1) * sizeof(WCHAR)); + return hr; } |