lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-02 09:20:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[UNICODE] Sync with Wine Staging 4.18. CORE-16441

Browse Source
This commit is contained in:
Amine Khaldi
2019-12-23 00:58:51 +01:00
parent 3cfeed64b1
commit 1a472d9453
84 changed files with 1111 additions and 1845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/tools/unicode/string.c
View File

@@ -23,7 +23,6 @@
#include <limits.h>
#include <stdio.h>
#define WINE_UNICODE_INLINE /* nothing */
#include "wine/unicode.h"
#ifdef __REACTOS__
@@ -469,14 +468,19 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist)
/* FIXME: for unrecognised types, should ignore % when printing */
char *bufaiter = bufa;
if (*iter == 'p')
#ifdef __REACTOS__
sprintf(bufaiter, "%p", va_arg(valist, void*));
#else
sprintf(bufaiter, "%0*lX", 2 * (int)sizeof(void*),
(unsigned long)va_arg(valist, void *));
#endif
else
{
*fmta++ = *iter;
*fmta = '\0';
if (*iter == 'a' || *iter == 'A' ||
*iter == 'e' || *iter == 'E' ||
*iter == 'f' || *iter == 'F' ||
*iter == 'f' || *iter == 'F' ||
*iter == 'g' || *iter == 'G')
sprintf(bufaiter, fmtbufa, va_arg(valist, double));
else