[PATCH] avifil32: Use __ms_va* varargs variant for AVISave[A,W]
Nikolay Sivov
nsivov at codeweavers.com
Sat Nov 28 12:24:54 CST 2015
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
For https://bugs.winehq.org/show_bug.cgi?id=39580.
AVISave is the only WINAPIV left that's using 'va_list'.
Recent clang is needed, I tested with "clang version 3.8.0 (trunk 254234)" on Linux.
dlls/avifil32/api.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 4612611..cc7e55d 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -2278,7 +2278,7 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile)
HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback,
int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...)
{
- va_list vl;
+ __ms_va_list vl;
int i;
HRESULT ret;
PAVISTREAM *streams;
@@ -2300,13 +2300,13 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK l
streams[0] = pavi;
options[0] = lpOptions;
- va_start(vl, lpOptions);
+ __ms_va_start(vl, lpOptions);
for (i = 1; i < nStreams; i++)
{
streams[i] = va_arg(vl, void *);
options[i] = va_arg(vl, void *);
}
- va_end(vl);
+ __ms_va_end(vl);
for (i = 0; i < nStreams; i++)
TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]);
@@ -2321,7 +2321,7 @@ error:
HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback,
int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...)
{
- va_list vl;
+ __ms_va_list vl;
int i;
HRESULT ret;
PAVISTREAM *streams;
@@ -2343,13 +2343,13 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK
streams[0] = pavi;
options[0] = lpOptions;
- va_start(vl, lpOptions);
+ __ms_va_start(vl, lpOptions);
for (i = 1; i < nStreams; i++)
{
streams[i] = va_arg(vl, void *);
options[i] = va_arg(vl, void *);
}
- va_end(vl);
+ __ms_va_end(vl);
for (i = 0; i < nStreams; i++)
TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]);
--
2.6.2
More information about the wine-patches
mailing list