Module: wine Branch: master Commit: 523553512a580a885b1783c773699dfe0928e3b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523553512a580a885b1783c77...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Oct 22 11:12:04 2021 +0200
msi: Use the standard va_list instead of __ms_va_list.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msi/msiquery.c | 12 ++++++------ dlls/msi/tests/custom.c | 6 +++--- dlls/msi/tests/db.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 4ee9a973917..c217ee7c8f5 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/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/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d74d0a2d097..75e234c6583 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/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/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4ffd30f0376..eedfcac486d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/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__)
-
Alexandre Julliard