Module: wine Branch: master Commit: b1d5649b5c12ce8f9cacf74880122674a95f1d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1d5649b5c12ce8f9cacf7488...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Oct 22 11:11:48 2021 +0200
kernel32/tests: Use the standard va_list instead of __ms_va_list.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/tests/debugger.c | 6 +++--- dlls/kernel32/tests/format_msg.c | 20 ++++++++++---------- dlls/kernel32/tests/process.c | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 1a258ad69a6..0955025a650 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -60,11 +60,11 @@ static HMODULE ntdll;
static void WINAPIV __WINE_PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) { - __ms_va_list valist; + va_list valist;
- __ms_va_start(valist, msg); + va_start(valist, msg); winetest_vok(condition, msg, valist); - __ms_va_end(valist); + va_end(valist); if (!condition) ++child_failures; }
diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 794069e341d..0e09ba904d0 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -29,26 +29,26 @@ static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { - __ms_va_list list; + va_list list; DWORD r;
- __ms_va_start(list, outsize); + va_start(list, outsize); r = FormatMessageA(flags, src, msg_id, lang_id, out, outsize, &list); - __ms_va_end(list); + va_end(list); return r; }
static DWORD WINAPIV doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPWSTR out, DWORD outsize, ... ) { - __ms_va_list list; + va_list list; DWORD r;
- __ms_va_start(list, outsize); + va_start(list, outsize); r = FormatMessageW(flags, src, msg_id, lang_id, out, outsize, &list); - __ms_va_end(list); + va_end(list); return r; }
@@ -297,11 +297,11 @@ static void test_message_from_string_wide(void) { ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, L"%1!*.*u!,%1!*.*u!", - 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (va_list *)args ); ok(!lstrcmpW(L" 0002, 00003", out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==13,"failed: r=%d\n",r); r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, L"%1!*.*u!,%4!*.*u!", - 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (va_list *)args ); ok(!lstrcmpW(L" 0002, 001", out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==12,"failed: r=%d\n",r); } @@ -593,11 +593,11 @@ static void test_message_from_string(void) { ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, - "%1!*.*u!,%1!*.*u!", 0, 0, out, sizeof(out), (__ms_va_list *)args ); + "%1!*.*u!,%1!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); ok(!strcmp(" 0002, 00003", out),"failed out=[%s]\n",out); ok(r==13,"failed: r=%d\n",r); r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, - "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (__ms_va_list *)args ); + "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); ok(!strcmp(" 0002, 001", out),"failed out=[%s]\n",out); ok(r==12,"failed: r=%d\n",r); } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 87873d4a90d..0d1a2f1a31d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -307,13 +307,13 @@ static void get_file_name(char* buf) */ static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { - __ms_va_list valist; + va_list valist; char buffer[1024+4*MAX_LISTED_ENV_VAR]; DWORD w;
- __ms_va_start(valist, fmt); + va_start(valist, fmt); vsprintf(buffer, fmt, valist); - __ms_va_end(valist); + va_end(valist); WriteFile(h, buffer, strlen(buffer), &w, NULL); }
-
Alexandre Julliard