Alexandre Julliard : cmd: Use the standard va_list instead of __ms_va_list.
Alexandre Julliard
julliard at winehq.org
Mon Oct 25 16:30:05 CDT 2021
Module: wine
Branch: master
Commit: a8a250cdbc0dec401ed9620da3538e42aec3c678
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a250cdbc0dec401ed9620da3538e42aec3c678
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 25 11:00:27 2021 +0200
cmd: Use the standard va_list instead of __ms_va_list.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/cmd/wcmdmain.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 4ed1c96a9c2..675d7c5f464 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -122,15 +122,15 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device)
void WINAPIV WCMD_output (const WCHAR *format, ...) {
- __ms_va_list ap;
+ va_list ap;
WCHAR* string;
DWORD len;
- __ms_va_start(ap,format);
+ va_start(ap,format);
string = NULL;
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
format, 0, 0, (LPWSTR)&string, 0, &ap);
- __ms_va_end(ap);
+ va_end(ap);
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE)
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
else
@@ -147,15 +147,15 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) {
void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) {
- __ms_va_list ap;
+ va_list ap;
WCHAR* string;
DWORD len;
- __ms_va_start(ap,format);
+ va_start(ap,format);
string = NULL;
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
format, 0, 0, (LPWSTR)&string, 0, &ap);
- __ms_va_end(ap);
+ va_end(ap);
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE)
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
else
@@ -172,14 +172,14 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) {
WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...)
{
- __ms_va_list ap;
+ va_list ap;
WCHAR* string;
DWORD len;
- __ms_va_start(ap,format);
+ va_start(ap,format);
len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER,
format, 0, 0, (LPWSTR)&string, 0, &ap);
- __ms_va_end(ap);
+ va_end(ap);
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) {
WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format));
string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2);
More information about the wine-cvs
mailing list