Alexandre Julliard : shlwapi: Convert SHPackDispParams to use an MS ABI vararg list for x86_64.
Alexandre Julliard
julliard at winehq.org
Fri Jan 2 08:25:31 CST 2009
Module: wine
Branch: master
Commit: 55e4c7f14e6fff73eaf1573b0d3a67a5b6f8783e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e4c7f14e6fff73eaf1573b0d3a67a5b6f8783e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Dec 31 20:48:33 2008 +0100
shlwapi: Convert SHPackDispParams to use an MS ABI vararg list for x86_64.
---
dlls/shlwapi/ordinal.c | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 68e934f..5da2879 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -2816,7 +2816,7 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM
*
* _SHPackDispParamsV
*/
-HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, va_list valist)
+HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, __ms_va_list valist)
{
VARIANTARG *iter;
@@ -2870,14 +2870,12 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt,
*/
HRESULT WINAPIV SHPackDispParams(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...)
{
- va_list valist;
+ __ms_va_list valist;
HRESULT hres;
- va_start(valist, cnt);
-
+ __ms_va_start(valist, cnt);
hres = SHPackDispParamsV(params, args, cnt, valist);
-
- va_end(valist);
+ __ms_va_end(valist);
return hres;
}
@@ -3003,7 +3001,7 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
IConnectionPoint *iCP;
IConnectionPointContainer *iCPC;
DISPPARAMS dispParams = {buffer, NULL, cParams, 0};
- va_list valist;
+ __ms_va_list valist;
if (!container)
return E_NOINTERFACE;
@@ -3017,9 +3015,9 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
if(FAILED(result))
return result;
- va_start(valist, cParams);
+ __ms_va_start(valist, cParams);
SHPackDispParamsV(&dispParams, buffer, cParams, valist);
- va_end(valist);
+ __ms_va_end(valist);
result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams);
IConnectionPoint_Release(iCP);
More information about the wine-cvs
mailing list