Commit 55e4c7f1 authored by Alexandre Julliard's avatar Alexandre Julliard

shlwapi: Convert SHPackDispParams to use an MS ABI vararg list for x86_64.

parent b9f0ee96
...@@ -2816,7 +2816,7 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM ...@@ -2816,7 +2816,7 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM
* *
* _SHPackDispParamsV * _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; VARIANTARG *iter;
...@@ -2870,14 +2870,12 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...@@ -2870,14 +2870,12 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt,
*/ */
HRESULT WINAPIV SHPackDispParams(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...) HRESULT WINAPIV SHPackDispParams(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...)
{ {
va_list valist; __ms_va_list valist;
HRESULT hres; HRESULT hres;
va_start(valist, cnt); __ms_va_start(valist, cnt);
hres = SHPackDispParamsV(params, args, cnt, valist); hres = SHPackDispParamsV(params, args, cnt, valist);
__ms_va_end(valist);
va_end(valist);
return hres; return hres;
} }
...@@ -3003,7 +3001,7 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam( ...@@ -3003,7 +3001,7 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
IConnectionPoint *iCP; IConnectionPoint *iCP;
IConnectionPointContainer *iCPC; IConnectionPointContainer *iCPC;
DISPPARAMS dispParams = {buffer, NULL, cParams, 0}; DISPPARAMS dispParams = {buffer, NULL, cParams, 0};
va_list valist; __ms_va_list valist;
if (!container) if (!container)
return E_NOINTERFACE; return E_NOINTERFACE;
...@@ -3017,9 +3015,9 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam( ...@@ -3017,9 +3015,9 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
if(FAILED(result)) if(FAILED(result))
return result; return result;
va_start(valist, cParams); __ms_va_start(valist, cParams);
SHPackDispParamsV(&dispParams, buffer, cParams, valist); SHPackDispParamsV(&dispParams, buffer, cParams, valist);
va_end(valist); __ms_va_end(valist);
result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams); result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams);
IConnectionPoint_Release(iCP); IConnectionPoint_Release(iCP);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment