Alexandre Julliard : winetest: Use the standard va_list instead of __ms_va_list.
Alexandre Julliard
julliard at winehq.org
Mon Oct 25 16:30:06 CDT 2021
Module: wine
Branch: master
Commit: acefbcf6c9ad79d962b273d2ac0159075280b8eb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=acefbcf6c9ad79d962b273d2ac0159075280b8eb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 25 11:02:53 2021 +0200
winetest: Use the standard va_list instead of __ms_va_list.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/winetest/gui.c | 56 ++++++++++++++++++++++----------------------
programs/winetest/send.c | 6 ++---
programs/winetest/util.c | 16 ++++++-------
programs/winetest/winetest.h | 2 +-
4 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c
index bf9c3de8e82..e42d8c37112 100644
--- a/programs/winetest/gui.c
+++ b/programs/winetest/gui.c
@@ -60,7 +60,7 @@ MBdefault (int uType)
/* report (R_STATUS, fmt, ...) */
static int
-textStatus (__ms_va_list ap)
+textStatus (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -71,7 +71,7 @@ textStatus (__ms_va_list ap)
}
static int
-guiStatus (__ms_va_list ap)
+guiStatus (va_list ap)
{
size_t len;
char *str = vstrmake (&len, ap);
@@ -84,7 +84,7 @@ guiStatus (__ms_va_list ap)
/* report (R_PROGRESS, barnum, steps) */
static int
-textProgress (__ms_va_list ap)
+textProgress (va_list ap)
{
progressGroup = va_arg (ap, int);
progressMax = va_arg (ap, int);
@@ -93,7 +93,7 @@ textProgress (__ms_va_list ap)
}
static int
-guiProgress (__ms_va_list ap)
+guiProgress (va_list ap)
{
unsigned int max;
HWND pb;
@@ -114,7 +114,7 @@ guiProgress (__ms_va_list ap)
/* report (R_STEP, fmt, ...) */
static int
-textStep (__ms_va_list ap)
+textStep (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -126,7 +126,7 @@ textStep (__ms_va_list ap)
}
static int
-guiStep (__ms_va_list ap)
+guiStep (va_list ap)
{
const int pgID = IDC_ST0 + progressGroup * 2;
char *str = vstrmake (NULL, ap);
@@ -141,7 +141,7 @@ guiStep (__ms_va_list ap)
/* report (R_DELTA, inc, fmt, ...) */
static int
-textDelta (__ms_va_list ap)
+textDelta (va_list ap)
{
const int inc = va_arg (ap, int);
char *str = vstrmake (NULL, ap);
@@ -154,7 +154,7 @@ textDelta (__ms_va_list ap)
}
static int
-guiDelta (__ms_va_list ap)
+guiDelta (va_list ap)
{
const int inc = va_arg (ap, int);
const int pgID = IDC_ST0 + progressGroup * 2;
@@ -170,7 +170,7 @@ guiDelta (__ms_va_list ap)
/* report (R_TAG) */
static int
-textTag (__ms_va_list ap)
+textTag (va_list ap)
{
fputs ("Tag: ", stderr);
fputs (tag, stderr);
@@ -179,7 +179,7 @@ textTag (__ms_va_list ap)
}
static int
-guiTag (__ms_va_list ap)
+guiTag (va_list ap)
{
SetDlgItemTextA (dialog, IDC_TAG, tag);
return 0;
@@ -187,7 +187,7 @@ guiTag (__ms_va_list ap)
/* report (R_DIR, fmt, ...) */
static int
-textDir (__ms_va_list ap)
+textDir (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -199,7 +199,7 @@ textDir (__ms_va_list ap)
}
static int
-guiDir (__ms_va_list ap)
+guiDir (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -210,7 +210,7 @@ guiDir (__ms_va_list ap)
/* report (R_OUT, fmt, ...) */
static int
-textOut (__ms_va_list ap)
+textOut (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -222,7 +222,7 @@ textOut (__ms_va_list ap)
}
static int
-guiOut (__ms_va_list ap)
+guiOut (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -233,7 +233,7 @@ guiOut (__ms_va_list ap)
/* report (R_WARNING, fmt, ...) */
static int
-textWarning (__ms_va_list ap)
+textWarning (va_list ap)
{
fputs ("Warning: ", stderr);
textStatus (ap);
@@ -241,7 +241,7 @@ textWarning (__ms_va_list ap)
}
static int
-guiWarning (__ms_va_list ap)
+guiWarning (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -252,7 +252,7 @@ guiWarning (__ms_va_list ap)
/* report (R_ERROR, fmt, ...) */
static int
-textError (__ms_va_list ap)
+textError (va_list ap)
{
fputs ("Error: ", stderr);
textStatus (ap);
@@ -260,7 +260,7 @@ textError (__ms_va_list ap)
}
static int
-guiError (__ms_va_list ap)
+guiError (va_list ap)
{
char *str = vstrmake (NULL, ap);
@@ -271,7 +271,7 @@ guiError (__ms_va_list ap)
/* report (R_FATAL, fmt, ...) */
static int
-textFatal (__ms_va_list ap)
+textFatal (va_list ap)
{
textError (ap);
exit (1);
@@ -279,7 +279,7 @@ textFatal (__ms_va_list ap)
}
static int
-guiFatal (__ms_va_list ap)
+guiFatal (va_list ap)
{
guiError (ap);
exit (1);
@@ -288,7 +288,7 @@ guiFatal (__ms_va_list ap)
/* report (R_ASK, type, fmt, ...) */
static int
-textAsk (__ms_va_list ap)
+textAsk (va_list ap)
{
int uType = va_arg (ap, int);
int ret = MBdefault (uType);
@@ -301,7 +301,7 @@ textAsk (__ms_va_list ap)
}
static int
-guiAsk (__ms_va_list ap)
+guiAsk (va_list ap)
{
int uType = va_arg (ap, int);
char *str = vstrmake (NULL, ap);
@@ -395,13 +395,13 @@ guiAskEmail (void)
/* Quiet functions */
static int
-qNoOp (__ms_va_list ap)
+qNoOp (va_list ap)
{
return 0;
}
static int
-qAsk (__ms_va_list ap)
+qAsk (va_list ap)
{
return MBdefault (va_arg (ap, int));
}
@@ -480,9 +480,9 @@ DlgThreadProc (LPVOID param)
int WINAPIV report (enum report_type t, ...)
{
- typedef int r_fun_t (__ms_va_list);
+ typedef int r_fun_t (va_list);
- __ms_va_list ap;
+ va_list ap;
int ret = 0;
static r_fun_t * const text_funcs[] =
{textStatus, textProgress, textStep, textDelta,
@@ -547,9 +547,9 @@ int WINAPIV report (enum report_type t, ...)
}
}
- __ms_va_start (ap, t);
+ va_start (ap, t);
if (t < ARRAY_SIZE(text_funcs)) ret = funcs[t](ap);
else report (R_WARNING, "unimplemented report type: %d", t);
- __ms_va_end (ap);
+ va_end (ap);
return ret;
}
diff --git a/programs/winetest/send.c b/programs/winetest/send.c
index 1d4e3a78674..4b575e11a34 100644
--- a/programs/winetest/send.c
+++ b/programs/winetest/send.c
@@ -105,14 +105,14 @@ send_buf (SOCKET s, const char *buf, size_t length)
static int WINAPIV send_str (SOCKET s, ...)
{
- __ms_va_list ap;
+ va_list ap;
char *p;
int ret;
size_t len;
- __ms_va_start (ap, s);
+ va_start (ap, s);
p = vstrmake (&len, ap);
- __ms_va_end (ap);
+ va_end (ap);
if (!p) return 1;
ret = send_buf (s, p, len);
heap_free (p);
diff --git a/programs/winetest/util.c b/programs/winetest/util.c
index b3d112eab0f..ec145d7f5e6 100644
--- a/programs/winetest/util.c
+++ b/programs/winetest/util.c
@@ -57,7 +57,7 @@ void heap_free (void *op)
HeapFree(GetProcessHeap(), 0, op);
}
-static char *vstrfmtmake (size_t *lenp, const char *fmt, __ms_va_list ap)
+static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap)
{
size_t size = 1000;
char *p, *q;
@@ -81,7 +81,7 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, __ms_va_list ap)
return p;
}
-char *vstrmake (size_t *lenp, __ms_va_list ap)
+char *vstrmake (size_t *lenp, va_list ap)
{
const char *fmt;
@@ -91,27 +91,27 @@ char *vstrmake (size_t *lenp, __ms_va_list ap)
char * WINAPIV strmake (size_t *lenp, ...)
{
- __ms_va_list ap;
+ va_list ap;
char *p;
- __ms_va_start (ap, lenp);
+ va_start (ap, lenp);
p = vstrmake (lenp, ap);
if (!p) report (R_FATAL, "Out of memory.");
- __ms_va_end (ap);
+ va_end (ap);
return p;
}
void WINAPIV xprintf (const char *fmt, ...)
{
- __ms_va_list ap;
+ va_list ap;
size_t size;
DWORD written;
char *buffer, *head;
- __ms_va_start (ap, fmt);
+ va_start (ap, fmt);
buffer = vstrfmtmake (&size, fmt, ap);
head = buffer;
- __ms_va_end (ap);
+ va_end (ap);
while (size) {
if (!WriteFile( logfile, head, size, &written, NULL ))
report (R_FATAL, "Can't write logs: %u", GetLastError());
diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h
index 32d3f904709..6f02422ce4f 100644
--- a/programs/winetest/winetest.h
+++ b/programs/winetest/winetest.h
@@ -29,7 +29,7 @@
void fatal (const char* msg);
void warning (const char* msg);
void WINAPIV xprintf (const char *fmt, ...);
-char *vstrmake (size_t *lenp, __ms_va_list ap);
+char *vstrmake (size_t *lenp, va_list ap);
char * WINAPIV strmake (size_t *lenp, ...);
int goodtagchar (char c);
const char *findbadtagchar (const char *tag);
More information about the wine-cvs
mailing list