ntdll: Use the standard C library names for the wide char functions.

dlls/ntdll/locale.c

@@ -1467,7 +1467,7 @@ NTSTATUS WINAPI RtlUpcaseUnicodeToOemN( char *dst, DWORD dstlen, DWORD *reslen,
 /*********************************************************************
  *	towlower   (NTDLL.@)
  */
-WCHAR __cdecl NTDLL_towlower( WCHAR ch )
+WCHAR __cdecl towlower( WCHAR ch )
 {
     if (ch >= 0x100) return ch;
     return casemap( nls_info.LowerCaseTable, ch );
@@ -1477,7 +1477,7 @@ WCHAR __cdecl NTDLL_towlower( WCHAR ch )
 /*********************************************************************
  *           towupper    (NTDLL.@)
  */
-WCHAR __cdecl NTDLL_towupper( WCHAR ch )
+WCHAR __cdecl towupper( WCHAR ch )
 {
     if (nls_info.UpperCaseTable) return casemap( nls_info.UpperCaseTable, ch );
     return casemap_ascii( ch );

dlls/ntdll/ntdll.spec

@@ -1475,10 +1475,10 @@
 @ cdecl _vsnwprintf(ptr long wstr ptr)
 @ cdecl _vsnwprintf_s(ptr long long wstr ptr)
 @ cdecl _vswprintf(ptr wstr ptr)
-@ cdecl _wcsicmp(wstr wstr) NTDLL__wcsicmp
-@ cdecl _wcslwr(wstr) NTDLL__wcslwr
-@ cdecl _wcsnicmp(wstr wstr long) NTDLL__wcsnicmp
-@ cdecl _wcsupr(wstr) NTDLL__wcsupr
+@ cdecl _wcsicmp(wstr wstr)
+@ cdecl _wcslwr(wstr)
+@ cdecl _wcsnicmp(wstr wstr long)
+@ cdecl _wcsupr(wstr)
 @ cdecl _wtoi(wstr)
 @ cdecl -ret64 _wtoi64(wstr)
 @ cdecl _wtol(wstr)
@@ -1501,16 +1501,16 @@
 @ cdecl ispunct(long)
 @ cdecl isspace(long)
 @ cdecl isupper(long)
-@ cdecl iswalpha(long) NTDLL_iswalpha
-@ cdecl iswctype(long long) NTDLL_iswctype
-@ cdecl iswdigit(long) NTDLL_iswdigit
-@ cdecl iswlower(long) NTDLL_iswlower
-@ cdecl iswspace(long) NTDLL_iswspace
-@ cdecl iswxdigit(long) NTDLL_iswxdigit
+@ cdecl iswalpha(long)
+@ cdecl iswctype(long long)
+@ cdecl iswdigit(long)
+@ cdecl iswlower(long)
+@ cdecl iswspace(long)
+@ cdecl iswxdigit(long)
 @ cdecl isxdigit(long)
 @ cdecl labs(long) NTDLL_abs
 @ cdecl log(double) NTDLL_log
-@ cdecl mbstowcs(ptr str long) NTDLL_mbstowcs
+@ cdecl mbstowcs(ptr str long)
 @ cdecl memchr(ptr long long)
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
@@ -1544,30 +1544,30 @@
 @ cdecl tan(double) NTDLL_tan
 @ cdecl tolower(long)
 @ cdecl toupper(long)
-@ cdecl towlower(long) NTDLL_towlower
-@ cdecl towupper(long) NTDLL_towupper
+@ cdecl towlower(long)
+@ cdecl towupper(long)
 @ stdcall vDbgPrintEx(long long str ptr)
 @ stdcall vDbgPrintExWithPrefix(str long long str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vsprintf_s(ptr long str ptr)
 @ cdecl vswprintf_s(ptr long wstr ptr)
-@ cdecl wcscat(wstr wstr) NTDLL_wcscat
-@ cdecl wcschr(wstr long) NTDLL_wcschr
-@ cdecl wcscmp(wstr wstr) NTDLL_wcscmp
-@ cdecl wcscpy(ptr wstr) NTDLL_wcscpy
-@ cdecl wcscspn(wstr wstr) NTDLL_wcscspn
-@ cdecl wcslen(wstr) NTDLL_wcslen
-@ cdecl wcsncat(wstr wstr long) NTDLL_wcsncat
-@ cdecl wcsncmp(wstr wstr long) NTDLL_wcsncmp
-@ cdecl wcsncpy(ptr wstr long) NTDLL_wcsncpy
-@ cdecl wcspbrk(wstr wstr) NTDLL_wcspbrk
-@ cdecl wcsrchr(wstr long) NTDLL_wcsrchr
-@ cdecl wcsspn(wstr wstr) NTDLL_wcsspn
-@ cdecl wcsstr(wstr wstr) NTDLL_wcsstr
-@ cdecl wcstok(wstr wstr) NTDLL_wcstok
-@ cdecl wcstol(wstr ptr long) NTDLL_wcstol
-@ cdecl wcstombs(ptr ptr long) NTDLL_wcstombs
-@ cdecl wcstoul(wstr ptr long) NTDLL_wcstoul
+@ cdecl wcscat(wstr wstr)
+@ cdecl wcschr(wstr long)
+@ cdecl wcscmp(wstr wstr)
+@ cdecl wcscpy(ptr wstr)
+@ cdecl wcscspn(wstr wstr)
+@ cdecl wcslen(wstr)
+@ cdecl wcsncat(wstr wstr long)
+@ cdecl wcsncmp(wstr wstr long)
+@ cdecl wcsncpy(ptr wstr long)
+@ cdecl wcspbrk(wstr wstr)
+@ cdecl wcsrchr(wstr long)
+@ cdecl wcsspn(wstr wstr)
+@ cdecl wcsstr(wstr wstr)
+@ cdecl wcstok(wstr wstr)
+@ cdecl wcstol(wstr ptr long)
+@ cdecl wcstombs(ptr ptr long)
+@ cdecl wcstoul(wstr ptr long)
 
 ##################
 # Wine extensions

dlls/ntdll/ntdll_misc.h

@@ -147,47 +147,6 @@ void     WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
 #define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp)
 #endif
 
-/* string functions */
-int    __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 );
-int    __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, size_t n );
-int    __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 );
-int    __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, size_t n );
-WCHAR  __cdecl NTDLL_towlower( WCHAR ch );
-WCHAR  __cdecl NTDLL_towupper( WCHAR ch );
-LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str );
-LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str );
-LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src );
-LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src );
-LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch );
-size_t __cdecl NTDLL_wcslen( LPCWSTR str );
-size_t __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject );
-LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, size_t n );
-LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n );
-LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept );
-LPWSTR __cdecl NTDLL_wcsrchr( LPCWSTR str, WCHAR ch );
-size_t __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept );
-LPWSTR __cdecl NTDLL_wcsstr( LPCWSTR str, LPCWSTR sub );
-LPWSTR __cdecl NTDLL_wcstok( LPWSTR str, LPCWSTR delim );
-LONG   __cdecl NTDLL_wcstol( LPCWSTR s, LPWSTR *end, INT base );
-ULONG  __cdecl NTDLL_wcstoul( LPCWSTR s, LPWSTR *end, INT base );
-
-#define wcsicmp(s1,s2) NTDLL__wcsicmp(s1,s2)
-#define wcsnicmp(s1,s2,n) NTDLL__wcsnicmp(s1,s2,n)
-#define towupper(c) NTDLL_towupper(c)
-#define wcslwr(s) NTDLL__wcslwr(s)
-#define wcsupr(s) NTDLL__wcsupr(s)
-#define wcscpy(d,s) NTDLL_wcscpy(d,s)
-#define wcscat(d,s) NTDLL_wcscat(d,s)
-#define wcschr(s,c) NTDLL_wcschr(s,c)
-#define wcspbrk(s,a) NTDLL_wcspbrk(s,a)
-#define wcsrchr(s,c) NTDLL_wcsrchr(s,c)
-#define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b)
-#define wcslen(s) NTDLL_wcslen(s)
-#define wcscspn(s,r) NTDLL_wcscspn(s,r)
-#define wcsspn(s,a) NTDLL_wcsspn(s,a)
-#define wcscmp(s1,s2) NTDLL_wcscmp(s1,s2)
-#define wcsncmp(s1,s2,n) NTDLL_wcsncmp(s1,s2,n)
-
 /* convert from straight ASCII to Unicode without depending on the current codepage */
 static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )
 {