Remove _vsnwprintf_s from PAL

_woutput_s was not removed because it is intertwined
with the implementation for printf. The linker will just
prune the implementation anyways.

Remove all wprintf testing from PAL

src/coreclr/dlls/mscordac/mscordac_unixexports.src

@@ -76,7 +76,6 @@ nativeStringResourceTable_mscorrc
 #vsprintf_s
 #_snprintf_s
 #_vsnprintf_s
-#_vsnwprintf_s
 #_itow_s
 #_i64tow_s
 #memcpy_s

src/coreclr/pal/inc/mbusafecrt.h

@@ -90,8 +90,6 @@ extern int _snprintf_s( char *string, size_t sizeInBytes, size_t count, const ch
 extern int vsprintf_s( char* string, size_t sizeInBytes, const char* format, va_list arglist );
 extern int _vsnprintf_s( char* string, size_t sizeInBytes, size_t count, const char* format, va_list arglist );
 
-extern int _vsnwprintf_s( WCHAR* string, size_t sizeInWords, size_t count, const WCHAR* format, va_list arglist );
-
 extern int sscanf_s( const char *string, const char *format, ... );
 extern int swscanf_s( const WCHAR *string, const WCHAR *format, ... );
 

src/coreclr/pal/inc/pal.h

@@ -4122,7 +4122,6 @@ PALIMPORT DLLEXPORT int __cdecl _wcsicmp(const WCHAR *, const WCHAR*);
 PALIMPORT int __cdecl _wcsnicmp(const WCHAR *, const WCHAR *, size_t);
 PALIMPORT int __cdecl _vsnprintf(char *, size_t, const char *, va_list);
 PALIMPORT DLLEXPORT int __cdecl _vsnprintf_s(char *, size_t, size_t, const char *, va_list);
-PALIMPORT DLLEXPORT int __cdecl _vsnwprintf_s(WCHAR *, size_t, size_t, const WCHAR *, va_list);
 PALIMPORT DLLEXPORT int __cdecl _snprintf_s(char *, size_t, size_t, const char *, ...);
 PALIMPORT DLLEXPORT int __cdecl sprintf_s(char *, size_t, const char *, ... );
 PALIMPORT DLLEXPORT int __cdecl sscanf_s(const char *, const char *, ...);

src/coreclr/pal/inc/rt/safecrt.h

@@ -385,7 +385,6 @@ void __cdecl _invalid_parameter(const WCHAR *_Message, const WCHAR *_FunctionNam
 #define _tmakepath_s    _wmakepath_s
 #define _tsplitpath_s   _wsplitpath_s
 #define _stprintf_s     swprintf_s
-#define _vsntprintf_s   _vsnwprintf_s
 #define _tscanf_s       wscanf_s
 #define _tsscanf_s      swscanf_s
 
@@ -1681,7 +1680,7 @@ int __cdecl vsprintf_s(char (&_Dst)[_SizeInBytes], const char *_Format, va_list
 
 /* _vsnprintf_s */
 /*
- * _vsnprintf_s, _vsnwprintf_s format a string and copy at max _Count characters into _Dst;
+ * _vsnprintf_s formats a string and copy at max _Count characters into _Dst;
  * need safecrt.lib and msvcrt.dll;
  * string _Dst will always be null-terminated;
  * will call _SAFECRT_INVALID_PARAMETER if there is not enough space in _Dst;
@@ -1707,21 +1706,6 @@ int __cdecl _vsnprintf_s(char (&_Dst)[_SizeInBytes], size_t _Count, const char *
 
 /* no inline version of _vsnprintf_s */
 
-/* _vsnwprintf_s */
-_SAFECRT__EXTERN_C
-int __cdecl _vsnwprintf_s(WCHAR *_Dst, size_t _SizeInWords, size_t _Count, const WCHAR *_Format, va_list _ArgList);
-
-#if defined(__cplusplus) && _SAFECRT_USE_CPP_OVERLOADS
-template <size_t _SizeInWords>
-inline
-int __cdecl _vsnwprintf_s(char (&_Dst)[_SizeInWords], size_t _Count, const char *_Format, va_list _ArgList)
-{
-    return _vsnwprintf_s(_Dst, _SizeInWords, _Count, _Format, _ArgList);
-}
-#endif
-
-/* no inline version of _vsnwprintf_s */
-
 /* wscanf_s */
 _SAFECRT__EXTERN_C
 int __cdecl wscanf_s(const WCHAR *_Format, ...);

src/coreclr/pal/src/CMakeLists.txt

@@ -193,7 +193,6 @@ set(SOURCES
   safecrt/strncpy_s.cpp
   safecrt/strtok_s.cpp
   safecrt/vsprintf.cpp
-  safecrt/vswprint.cpp
   safecrt/wcscat_s.cpp
   safecrt/wcscpy_s.cpp
   safecrt/wcslen_s.cpp

src/coreclr/pal/src/safecrt/internal.h

@@ -279,21 +279,15 @@ int __cdecl _output(__inout FILE * _File, _In_z_ __format_string const char *_Fo
 int __cdecl _woutput(__inout FILE * _File, _In_z_ __format_string const char16_t *_Format, va_list _ArgList);
 int __cdecl _output_s(__inout FILE * _File, _In_z_ __format_string const char *_Format, va_list _ArgList);
 int __cdecl _output_p(__inout FILE * _File, _In_z_ __format_string const char *_Format, va_list _ArgList);
-int __cdecl _woutput_s(__inout FILE * _File, _In_z_ __format_string const char16_t *_Format, va_list _ArgList);
-int __cdecl _woutput_p(__inout FILE * _File, _In_z_ __format_string const char16_t *_Format, va_list _ArgList);
 typedef int (*OUTPUTFN)(FILE *, const char *, va_list);
-typedef int (*WOUTPUTFN)(FILE *, const char16_t *, va_list);
 
 #else  /* _SAFECRT_IMPL */
 
 int __cdecl _output_l(__inout FILE * _File, _In_z_ __format_string const char *_Format, _In_opt_ _locale_t _Locale, va_list _ArgList);
 int __cdecl _woutput_l(__inout FILE * _File, _In_z_ __format_string const char16_t *_Format, _In_opt_ _locale_t _Locale, va_list _ArgList);
 int __cdecl _output_s_l(__inout FILE * _File, _In_z_ __format_string const char *_Format, _In_opt_ _locale_t _Locale, va_list _ArgList);
 int __cdecl _output_p_l(__inout FILE * _File, _In_z_ __format_string const char *_Format, _In_opt_ _locale_t _Locale, va_list _ArgList);
-int __cdecl _woutput_s_l(__inout FILE * _File, _In_z_ __format_string const char16_t *_Format, _In_opt_ _locale_t _Locale, va_list _ArgList);
-int __cdecl _woutput_p_l(__inout FILE * _File, _In_z_ __format_string const char16_t *_Format, _In_opt_ _locale_t _Locale, va_list _ArgList);
 typedef int (*OUTPUTFN)(__inout FILE * _File, const char *, _locale_t, va_list);
-typedef int (*WOUTPUTFN)(__inout FILE * _File, const char16_t *, _locale_t, va_list);
 
 #endif  /* _SAFECRT_IMPL */
 
@@ -302,7 +296,6 @@ typedef int (*WOUTPUTFN)(__inout FILE * _File, const char16_t *, _locale_t, va_l
 int __cdecl _input(_In_ FILE * _File, _In_z_ __format_string const unsigned char * _Format, va_list _ArgList);
 int __cdecl _winput(_In_ FILE * _File, _In_z_ __format_string const char16_t * _Format, va_list _ArgList);
 int __cdecl _input_s(_In_ FILE * _File, _In_z_ __format_string const unsigned char * _Format, va_list _ArgList);
-int __cdecl _winput_s(_In_ FILE * _File, _In_z_ __format_string const char16_t * _Format, va_list _ArgList);
 typedef int (*INPUTFN)(FILE *, const unsigned char *, va_list);
 typedef int (*WINPUTFN)(FILE *, const char16_t *, va_list);
 

src/coreclr/pal/src/safecrt/mbusafecrt_internal.h

@@ -88,7 +88,6 @@ void _safecrt_wfassign(int flag, void* argument, char16_t * number );
 int _minimal_chartowchar( char16_t* outWChar, const char* inChar );
 
 int _output_s( miniFILE* outfile, const char* _Format, va_list _ArgList);
-int _woutput_s( miniFILE* outfile, const char16_t* _Format, va_list _ArgList);
 int _output( miniFILE *outfile, const char* _Format, va_list _ArgList);
 
 int __tinput_s( miniFILE* inFile, const unsigned char * inFormat, va_list inArgList );

src/coreclr/pal/tests/palsuite/CMakeLists.txt

@@ -322,24 +322,6 @@ add_executable_clr(paltests
   c_runtime/vsprintf/test7/test7.cpp
   c_runtime/vsprintf/test8/test8.cpp
   c_runtime/vsprintf/test9/test9.cpp
-  c_runtime/vswprintf/test1/test1.cpp
-  c_runtime/vswprintf/test10/test10.cpp
-  c_runtime/vswprintf/test11/test11.cpp
-  c_runtime/vswprintf/test12/test12.cpp
-  c_runtime/vswprintf/test13/test13.cpp
-  c_runtime/vswprintf/test14/test14.cpp
-  c_runtime/vswprintf/test15/test15.cpp
-  c_runtime/vswprintf/test16/test16.cpp
-  c_runtime/vswprintf/test17/test17.cpp
-  c_runtime/vswprintf/test18/test18.cpp
-  c_runtime/vswprintf/test19/test19.cpp
-  c_runtime/vswprintf/test2/test2.cpp
-  c_runtime/vswprintf/test3/test3.cpp
-  c_runtime/vswprintf/test4/test4.cpp
-  c_runtime/vswprintf/test6/test6.cpp
-  c_runtime/vswprintf/test7/test7.cpp
-  c_runtime/vswprintf/test8/test8.cpp
-  c_runtime/vswprintf/test9/test9.cpp
   c_runtime/wcscat/test1/test1.cpp
   c_runtime/wcschr/test1/test1.cpp
   c_runtime/wcscmp/test1/test1.cpp
@@ -390,24 +372,6 @@ add_executable_clr(paltests
   c_runtime/_snprintf_s/test7/test7.cpp
   c_runtime/_snprintf_s/test8/test8.cpp
   c_runtime/_snprintf_s/test9/test9.cpp
-  c_runtime/_snwprintf_s/test1/test1.cpp
-  c_runtime/_snwprintf_s/test10/test10.cpp
-  c_runtime/_snwprintf_s/test11/test11.cpp
-  c_runtime/_snwprintf_s/test12/test12.cpp
-  c_runtime/_snwprintf_s/test13/test13.cpp
-  c_runtime/_snwprintf_s/test14/test14.cpp
-  c_runtime/_snwprintf_s/test15/test15.cpp
-  c_runtime/_snwprintf_s/test16/test16.cpp
-  c_runtime/_snwprintf_s/test17/test17.cpp
-  c_runtime/_snwprintf_s/test18/test18.cpp
-  c_runtime/_snwprintf_s/test19/test19.cpp
-  c_runtime/_snwprintf_s/test2/test2.cpp
-  c_runtime/_snwprintf_s/test3/test3.cpp
-  c_runtime/_snwprintf_s/test4/test4.cpp
-  c_runtime/_snwprintf_s/test6/test6.cpp
-  c_runtime/_snwprintf_s/test7/test7.cpp
-  c_runtime/_snwprintf_s/test8/test8.cpp
-  c_runtime/_snwprintf_s/test9/test9.cpp
   c_runtime/_stricmp/test1/test1.cpp
   c_runtime/_strnicmp/test1/test1.cpp
   c_runtime/_vsnprintf_s/test1/test1.cpp
@@ -428,24 +392,6 @@ add_executable_clr(paltests
   c_runtime/_vsnprintf_s/test7/test7.cpp
   c_runtime/_vsnprintf_s/test8/test8.cpp
   c_runtime/_vsnprintf_s/test9/test9.cpp
-  c_runtime/_vsnwprintf_s/test1/test1.cpp
-  c_runtime/_vsnwprintf_s/test10/test10.cpp
-  c_runtime/_vsnwprintf_s/test11/test11.cpp
-  c_runtime/_vsnwprintf_s/test12/test12.cpp
-  c_runtime/_vsnwprintf_s/test13/test13.cpp
-  c_runtime/_vsnwprintf_s/test14/test14.cpp
-  c_runtime/_vsnwprintf_s/test15/test15.cpp
-  c_runtime/_vsnwprintf_s/test16/test16.cpp
-  c_runtime/_vsnwprintf_s/test17/test17.cpp
-  c_runtime/_vsnwprintf_s/test18/test18.cpp
-  c_runtime/_vsnwprintf_s/test19/test19.cpp
-  c_runtime/_vsnwprintf_s/test2/test2.cpp
-  c_runtime/_vsnwprintf_s/test3/test3.cpp
-  c_runtime/_vsnwprintf_s/test4/test4.cpp
-  c_runtime/_vsnwprintf_s/test6/test6.cpp
-  c_runtime/_vsnwprintf_s/test7/test7.cpp
-  c_runtime/_vsnwprintf_s/test8/test8.cpp
-  c_runtime/_vsnwprintf_s/test9/test9.cpp
   c_runtime/_wcsicmp/test1/test1.cpp
   c_runtime/_wcslwr_s/test1/test1.cpp
   c_runtime/_wcsnicmp/test1/test1.cpp