Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:05:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi: Use the standard va_list instead of __ms_va_list.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 523553512a580a885b1783c773699dfe0928e3b6 by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
winesync 2022-03-13 23:59:52 +01:00 • committed by Mark Jansen
parent 8c1eae241a
commit f56eca297a
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dll/win32/msi/msiquery.c
View file

@ -146,11 +146,11 @@ UINT WINAPIV MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... )
/* construct the string */ /* construct the string */
for (;;) for (;;)
{ {
__ms_va_list va; va_list va;
query = msi_alloc( size*sizeof(WCHAR) ); query = msi_alloc( size*sizeof(WCHAR) );
__ms_va_start(va, fmt); va_start(va, fmt);
res = vswprintf(query, size, fmt, va); res = vswprintf(query, size, fmt, va);
__ms_va_end(va); va_end(va);
if (res == -1) size *= 2; if (res == -1) size *= 2;
else if (res >= size) size = res + 1; else if (res >= size) size = res + 1;
else break; else break;
@ -211,11 +211,11 @@ MSIRECORD * WINAPIV MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR fmt, ... )
/* construct the string */ /* construct the string */
for (;;) for (;;)
{ {
__ms_va_list va; va_list va;
query = msi_alloc( size*sizeof(WCHAR) ); query = msi_alloc( size*sizeof(WCHAR) );
__ms_va_start(va, fmt); va_start(va, fmt);
res = vswprintf(query, size, fmt, va); res = vswprintf(query, size, fmt, va);
__ms_va_end(va); va_end(va);
if (res == -1) size *= 2; if (res == -1) size *= 2;
else if (res >= size) size = res + 1; else if (res >= size) size = res + 1;
else break; else break;

6
modules/rostests/winetests/msi/custom.c
View file

@ -38,11 +38,11 @@ static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file, int line, i
{ {
static char buffer[2000]; static char buffer[2000];
MSIHANDLE record; MSIHANDLE record;
__ms_va_list valist; va_list valist;
__ms_va_start(valist, msg); va_start(valist, msg);
vsprintf(buffer, msg, valist); vsprintf(buffer, msg, valist);
__ms_va_end(valist); va_end(valist);
record = MsiCreateRecord(5); record = MsiCreateRecord(5);
MsiRecordSetInteger(record, 1, todo); MsiRecordSetInteger(record, 1, todo);

6
modules/rostests/winetests/msi/db.c
View file

@ -38,13 +38,13 @@ static const WCHAR msifile2W[] = L"winetst2-db.msi";
static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...)
{ {
__ms_va_list args; va_list args;
UINT i; UINT i;
ok_(__FILE__, line)(count == MsiRecordGetFieldCount(rec), ok_(__FILE__, line)(count == MsiRecordGetFieldCount(rec),
"expected %u fields, got %u\n", 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) 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); "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__) #define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__)