[ros-diffs] [reactos] 338/360: [WINESYNC] msi: Use the standard va_list instead of __ms_va_list.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f56eca297ac4748385847…

commit f56eca297ac47483858479d28f49ffee4ca1dd1e
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 23:59:52 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:41 2022 +0100

    [WINESYNC] msi: Use the standard va_list instead of __ms_va_list.
    
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 523553512a580a885b1783c773699dfe0928e3b6 by Alexandre Julliard
<julliard(a)winehq.org>
---
 dll/win32/msi/msiquery.c                | 12 ++++++------
 modules/rostests/winetests/msi/custom.c |  6 +++---
 modules/rostests/winetests/msi/db.c     |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dll/win32/msi/msiquery.c b/dll/win32/msi/msiquery.c
index 5298073bfb6..2f04d441717 100644
--- a/dll/win32/msi/msiquery.c
+++ b/dll/win32/msi/msiquery.c
@@ -146,11 +146,11 @@ UINT WINAPIV MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view,
LPCWSTR fmt, ... )
     /* construct the string */
     for (;;)
     {
-        __ms_va_list va;
+        va_list va;
         query = msi_alloc( size*sizeof(WCHAR) );
-        __ms_va_start(va, fmt);
+        va_start(va, fmt);
         res = vswprintf(query, size, fmt, va);
-        __ms_va_end(va);
+        va_end(va);
         if (res == -1) size *= 2;
         else if (res >= size) size = res + 1;
         else break;
@@ -211,11 +211,11 @@ MSIRECORD * WINAPIV MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR
fmt, ... )
     /* construct the string */
     for (;;)
     {
-        __ms_va_list va;
+        va_list va;
         query = msi_alloc( size*sizeof(WCHAR) );
-        __ms_va_start(va, fmt);
+        va_start(va, fmt);
         res = vswprintf(query, size, fmt, va);
-        __ms_va_end(va);
+        va_end(va);
         if (res == -1) size *= 2;
         else if (res >= size) size = res + 1;
         else break;
diff --git a/modules/rostests/winetests/msi/custom.c
b/modules/rostests/winetests/msi/custom.c
index d74d0a2d097..75e234c6583 100644
--- a/modules/rostests/winetests/msi/custom.c
+++ b/modules/rostests/winetests/msi/custom.c
@@ -38,11 +38,11 @@ static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file,
int line, i
 {
     static char buffer[2000];
     MSIHANDLE record;
-    __ms_va_list valist;
+    va_list valist;
 
-    __ms_va_start(valist, msg);
+    va_start(valist, msg);
     vsprintf(buffer, msg, valist);
-    __ms_va_end(valist);
+    va_end(valist);
 
     record = MsiCreateRecord(5);
     MsiRecordSetInteger(record, 1, todo);
diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c
index 4ffd30f0376..eedfcac486d 100644
--- a/modules/rostests/winetests/msi/db.c
+++ b/modules/rostests/winetests/msi/db.c
@@ -38,13 +38,13 @@ static const WCHAR msifile2W[] = L"winetst2-db.msi";
 
 static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...)
 {
-    __ms_va_list args;
+    va_list args;
     UINT i;
 
     ok_(__FILE__, line)(count == MsiRecordGetFieldCount(rec),
             "expected %u fields, got %u\n", count,
MsiRecordGetFieldCount(rec));
 
-    __ms_va_start(args, count);
+    va_start(args, count);
 
     for (i = 1; i <= count; ++i)
     {
@@ -57,7 +57,7 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count,
...)
                 "field %u: expected \"%s\", got \"%s\"\n",
i, expect, buffer);
     }
 
-    __ms_va_end(args);
+    va_end(args);
 }
 #define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__)