mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 18:15:11 +00:00
[WINESYNC] msi: Use the standard va_list instead of __ms_va_list.
Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 523553512a580a885b1783c773699dfe0928e3b6 by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
8c1eae241a
commit
f56eca297a
3 changed files with 12 additions and 12 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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__)
|
||||
|
||||
|
|
Loading…
Reference in a new issue