https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd6e2d752d80b660ec603…
commit fd6e2d752d80b660ec603102f97204f794837a7a
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Fri Mar 23 22:02:31 2018 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Mar 23 22:03:35 2018 +0100
[CRT] Fix implementation of _vsc(w)printf() for native NT.
---
sdk/lib/crt/printf/_vscprintf.c | 5 +++--
sdk/lib/crt/printf/_vscwprintf.c | 18 ++++--------------
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/sdk/lib/crt/printf/_vscprintf.c b/sdk/lib/crt/printf/_vscprintf.c
index 7b4e6b5f72..1f626783d2 100644
--- a/sdk/lib/crt/printf/_vscprintf.c
+++ b/sdk/lib/crt/printf/_vscprintf.c
@@ -11,9 +11,10 @@
int __cdecl streamout(FILE *stream, const char *format, va_list argptr);
int
+__cdecl
_vscprintf(
- const char *format,
- va_list argptr)
+ const char *format,
+ va_list argptr)
{
FILE nulfile;
nulfile._tmpfname = nulfile._ptr = nulfile._base = NULL;
diff --git a/sdk/lib/crt/printf/_vscwprintf.c b/sdk/lib/crt/printf/_vscwprintf.c
index 5b01fc1db9..e0c2b1b164 100644
--- a/sdk/lib/crt/printf/_vscwprintf.c
+++ b/sdk/lib/crt/printf/_vscwprintf.c
@@ -2,33 +2,23 @@
* COPYRIGHT: GNU GPL, see COPYING in the top level directory
* PROJECT: ReactOS crt library
* FILE: lib/sdk/crt/printf/_vscwprintf.c
- * PURPOSE: Implementation of _vscprintf
+ * PURPOSE: Implementation of _vscwprintf
*/
#include <stdio.h>
#include <stdarg.h>
-#ifdef _LIBCNT_
-#include <ntddk.h>
-#endif
-
int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
int
__cdecl
_vscwprintf(
- const wchar_t *format,
- va_list argptr)
+ const wchar_t *format,
+ va_list argptr)
{
- int ret;
-#ifndef _LIBCNT_
FILE nulfile;
nulfile._tmpfname = nulfile._ptr = nulfile._base = NULL;
nulfile._bufsiz = nulfile._charbuf = nulfile._cnt = 0;
nulfile._flag = _IOSTRG | _IOWRT;
- ret = wstreamout(&nulfile, format, argptr);
-#else
- ret = -1;
-#endif
- return ret;
+ return wstreamout(&nulfile, format, argptr);
}