Alexandre Julliard : kernel32/tests: Use __ms_va_list in the FormatMessage test.
Alexandre Julliard
julliard at winehq.org
Fri Oct 30 11:04:29 CDT 2009
Module: wine
Branch: master
Commit: 24a8e33fb68bed795558948109f88f9237390115
URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a8e33fb68bed795558948109f88f9237390115
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Oct 29 19:15:20 2009 +0100
kernel32/tests: Use __ms_va_list in the FormatMessage test.
---
dlls/kernel32/tests/format_msg.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c
index 4b4192e..43b3ce2 100644
--- a/dlls/kernel32/tests/format_msg.c
+++ b/dlls/kernel32/tests/format_msg.c
@@ -26,29 +26,29 @@
/* #define ok(cond,failstr) if(!(cond)) {printf("line %d : %s\n",__LINE__,failstr);exit(1);} */
-static DWORD doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
- LPSTR out, DWORD outsize, ... )
+static DWORD __cdecl doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
+ LPSTR out, DWORD outsize, ... )
{
- va_list list;
+ __ms_va_list list;
DWORD r;
- va_start(list, outsize);
+ __ms_va_start(list, outsize);
r = FormatMessageA(flags, src, msg_id,
lang_id, out, outsize, &list);
- va_end(list);
+ __ms_va_end(list);
return r;
}
-static DWORD doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
- LPWSTR out, DWORD outsize, ... )
+static DWORD __cdecl doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id,
+ LPWSTR out, DWORD outsize, ... )
{
- va_list list;
+ __ms_va_list list;
DWORD r;
- va_start(list, outsize);
+ __ms_va_start(list, outsize);
r = FormatMessageW(flags, src, msg_id,
lang_id, out, outsize, &list);
- va_end(list);
+ __ms_va_end(list);
return r;
}
@@ -343,11 +343,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, fmt_1oou1oou,
- 0, 0, out, sizeof(out)/sizeof(WCHAR), (va_list *)args );
+ 0, 0, out, sizeof(out)/sizeof(WCHAR), (__ms_va_list *)args );
ok(!lstrcmpW(s_sp002sp003, 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, fmt_1oou4oou,
- 0, 0, out, sizeof(out)/sizeof(WCHAR), (va_list *)args );
+ 0, 0, out, sizeof(out)/sizeof(WCHAR), (__ms_va_list *)args );
ok(!lstrcmpW(s_sp002sp001, out),"failed out=[%s]\n", wine_dbgstr_w(out));
ok(r==12,"failed: r=%d\n",r);
}
@@ -595,11 +595,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), (va_list *)args );
+ "%1!*.*u!,%1!*.*u!", 0, 0, out, sizeof(out), (__ms_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), (va_list *)args );
+ "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (__ms_va_list *)args );
ok(!strcmp(" 0002, 001", out),"failed out=[%s]\n",out);
ok(r==12,"failed: r=%d\n",r);
}
More information about the wine-cvs
mailing list