[CRT] Stop implementing non-conforming swprintf / vswprintf

- Don't compile the non-conformng swprintf (it is identical to _swprinf)
- Rename swprintf to _swprintf
- Forward non-conforming exports to the underscored versions in CRT dlls
This commit is contained in:
Timo Kreuzer
2024-05-18 14:18:36 +03:00
parent 1cf31524d5
commit da64ad34ef
9 changed files with 12 additions and 26 deletions

View File

@@ -1886,7 +1886,7 @@
@ cdecl strstr(str str)
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long)
@ varargs swprintf(ptr wstr)
@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
@ cdecl -arch=i386,x86_64 tan(double)
@ cdecl tolower(long)
@ cdecl toupper(long) toupper_nt_mb

View File

@@ -482,7 +482,7 @@
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long) CRTDLL_strtoul
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(wstr wstr)
@ varargs swprintf(wstr wstr) _swprintf # Non-conforming swprintf
@ varargs swscanf(wstr wstr)
@ cdecl system(str) CRTDLL_system
@ cdecl tan(double)
@@ -500,7 +500,7 @@
@ cdecl vfwprintf(ptr wstr long)
@ cdecl vprintf(str long)
@ cdecl vsprintf(ptr str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
@ cdecl vwprintf(wstr long)
@ cdecl wcscat(wstr wstr)
@ cdecl wcschr(wstr long)

View File

@@ -1460,7 +1460,7 @@
@ cdecl strtoul(str ptr long)
@ cdecl -impsym strtoull(str ptr long) _strtoui64
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(ptr wstr) _swprintf
@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
@ varargs -version=0x600+ swprintf_s(ptr long wstr)
@ varargs swscanf(wstr wstr)
@ varargs -version=0x600+ swscanf_s(wstr wstr)
@@ -1492,7 +1492,7 @@
@ cdecl -version=0x600+ vsnprintf(ptr long str ptr) _vsnprintf
@ cdecl vsprintf(ptr str ptr)
@ cdecl -version=0x600+ vsprintf_s(ptr long str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
@ cdecl -version=0x600+ vswprintf_s(ptr long wstr ptr)
@ cdecl vwprintf(wstr ptr)
@ cdecl -version=0x600+ vwprintf_s(wstr ptr)

View File

@@ -1093,7 +1093,7 @@
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long)
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(ptr wstr)
@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
@ varargs swscanf(wstr wstr)
@ cdecl system(str)
@ cdecl tan(double)
@@ -1112,7 +1112,7 @@
@ cdecl vfwprintf(ptr wstr ptr)
@ cdecl vprintf(str ptr)
@ cdecl vsprintf(ptr str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
@ cdecl vwprintf(wstr long)
@ cdecl wcscat(wstr wstr)
@ cdecl wcschr(wstr long)

View File

@@ -1131,7 +1131,7 @@
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long)
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(ptr wstr)
@ varargs swprintf(ptr wstr) _swprintf # Non-conforming swprintf
@ varargs swscanf(wstr wstr)
@ cdecl system(str)
@ cdecl tan(double)
@@ -1150,7 +1150,7 @@
@ cdecl vfwprintf(ptr wstr long)
@ cdecl vprintf(str long)
@ cdecl vsprintf(ptr str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vswprintf(ptr wstr ptr) _vswprintf # Non-conforming vswprintf
@ cdecl vwprintf(wstr long)
@ cdecl wcscat(wstr wstr)
@ cdecl wcschr(wstr long)

View File

@@ -1622,7 +1622,7 @@
@ cdecl strrchr()
@ cdecl strspn()
@ cdecl strstr()
@ cdecl swprintf()
@ cdecl swprintf() _swprintf # Non-conforming swprintf
@ cdecl tolower()
@ cdecl toupper() toupper_nt_mb
@ cdecl towlower()

View File

@@ -6,7 +6,7 @@
* PROGRAMMER: Timo Kreuzer
*/
#define _sxprintf vswprintf
#define _sxprintf _vswprintf
#define USE_COUNT 0
#define USE_VARARGS 1
#define _UNICODE

View File

@@ -7,11 +7,10 @@ list(APPEND LIBCNTPR_PRINTF_SOURCE
printf/_vscwprintf.c
printf/_vsnprintf.c
printf/_vsnwprintf.c
printf/_vswprintf.c
printf/sprintf.c
printf/streamout.c
printf/swprintf.c
printf/vprintf.c
printf/vsprintf.c
printf/vswprintf.c
printf/wstreamout.c
)

View File

@@ -1,13 +0,0 @@
/*
* COPYRIGHT: GNU GPL, see COPYING in the top level directory
* PROJECT: ReactOS crt library
* FILE: lib/sdk/crt/printf/swprintf.c
* PURPOSE: Implementation of swprintf
* PROGRAMMER: Timo Kreuzer
*/
#define _sxprintf swprintf
#define USE_COUNT 0
#define _UNICODE
#include "_sxprintf.c"