Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
52355351
Commit
52355351
authored
Oct 22, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Use the standard va_list instead of __ms_va_list.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b14447b1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
msiquery.c
dlls/msi/msiquery.c
+6
-6
custom.c
dlls/msi/tests/custom.c
+3
-3
db.c
dlls/msi/tests/db.c
+3
-3
No files found.
dlls/msi/msiquery.c
View file @
52355351
...
...
@@ -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
;
...
...
dlls/msi/tests/custom.c
View file @
52355351
...
...
@@ -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
);
...
...
dlls/msi/tests/db.c
View file @
52355351
...
...
@@ -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__)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment