Jacek Caban : ucrtbase: Use public headers for _vsnprintf implementation.

Alexandre Julliard julliard at winehq.org
Sun Feb 16 15:23:59 CST 2020


Module: wine
Branch: master
Commit: 18545725b1156745a98a9af31a1a485452211ce8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=18545725b1156745a98a9af31a1a485452211ce8

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Feb 14 15:40:59 2020 +0100

ucrtbase: Use public headers for _vsnprintf implementation.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ucrtbase/printf.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/ucrtbase/printf.c b/dlls/ucrtbase/printf.c
index 099026950f..6a1e5fdea7 100644
--- a/dlls/ucrtbase/printf.c
+++ b/dlls/ucrtbase/printf.c
@@ -21,15 +21,14 @@
 #pragma makedep implib
 #endif
 
-#define _CRTIMP
 #include <stdarg.h>
-#include "msvcrt.h"
+#include <corecrt_stdio_config.h>
 
-int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, MSVCRT_size_t len,
-                                    const char *format, MSVCRT__locale_t locale, __ms_va_list valist);
+int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len,
+                                    const char *format, _locale_t locale, __ms_va_list valist);
 
-int __cdecl _vsnprintf( char *buf, MSVCRT_size_t size, const char *fmt, __ms_va_list args )
+int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args )
 {
-    return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR,
+    return __stdio_common_vsprintf( _CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,
                                     buf, size, fmt, NULL, args );
 }




More information about the wine-cvs mailing list