Alexandre Julliard : shlwapi: Use the standard va_list instead of __ms_va_list.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 56af82b16520993de9e347f37c1363d4407c86d2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=56af82b16520993de9e347f37...

Author: Alexandre Julliard 
Date:   Fri Oct 22 11:12:52 2021 +0200

shlwapi: Use the standard va_list instead of __ms_va_list.

Signed-off-by: Alexandre Julliard

---

dlls/shlwapi/ordinal.c  | 22 +++++++++++-----------
 dlls/shlwapi/wsprintf.c | 16 ++++++++--------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 63945deaea3..f15dba14f21 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -2363,7 +2363,7 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM
  *
  * _SHPackDispParamsV
  */
-HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, __ms_va_list valist)
+HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, va_list valist)
 {
   VARIANTARG *iter;

@@ -2417,12 +2417,12 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt,
  */
 HRESULT WINAPIV SHPackDispParams(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...)
 {
-  __ms_va_list valist;
+  va_list valist;
   HRESULT hres;

-  __ms_va_start(valist, cnt);
+  va_start(valist, cnt);
   hres = SHPackDispParamsV(params, args, cnt, valist);
-  __ms_va_end(valist);
+  va_end(valist);
   return hres;
 }

@@ -2579,7 +2579,7 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
   IConnectionPoint *iCP;
   IConnectionPointContainer *iCPC;
   DISPPARAMS dispParams = {buffer, NULL, cParams, 0};
-  __ms_va_list valist;
+  va_list valist;

if (!container)
     return E_NOINTERFACE;
@@ -2593,9 +2593,9 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
   if(FAILED(result))
       return result;

-  __ms_va_start(valist, cParams);
+  va_start(valist, cParams);
   SHPackDispParamsV(&dispParams, buffer, cParams, valist);
-  __ms_va_end(valist);
+  va_end(valist);

result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams);
   IConnectionPoint_Release(iCP);
@@ -4031,10 +4031,10 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
     WCHAR *szText = NULL, szTitle[100];
     LPCWSTR pszText, pszTitle = szTitle;
     LPWSTR pszTemp;
-    __ms_va_list args;
+    va_list args;
     int ret;

-    __ms_va_start(args, uType);
+    va_start(args, uType);

TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType);

@@ -4056,7 +4056,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
         pszText = szText;
         if (!pszText) {
             WARN("Failed to load id %d\n", LOWORD(lpText));
-            __ms_va_end(args);
+            va_end(args);
             return 0;
         }
     }
@@ -4066,7 +4066,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
     FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
                    pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args);

-    __ms_va_end(args);
+    va_end(args);

ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType);

diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c
index dfc1488f634..fbd2a7e75bf 100644
--- a/dlls/shlwapi/wsprintf.c
+++ b/dlls/shlwapi/wsprintf.c
@@ -349,7 +349,7 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg,
  *  Success: The number of characters written.
  *  Failure: -1.
  */
-INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args )
+INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args )
 {
     WPRINTF_FORMAT format;
     LPSTR p = buffer;
@@ -471,7 +471,7 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args
  *
  * See wvnsprintfA.
  */
-INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list args )
+INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args )
 {
     WPRINTF_FORMAT format;
     LPWSTR p = buffer;
@@ -602,12 +602,12 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar
  */
 int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
 {
-    __ms_va_list valist;
+    va_list valist;
     INT res;

-    __ms_va_start( valist, lpFmt );
+    va_start( valist, lpFmt );
     res = wvnsprintfA( lpOut, cchLimitIn, lpFmt, valist );
-    __ms_va_end( valist );
+    va_end( valist );
     return res;
 }

@@ -619,11 +619,11 @@ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
  */
 int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...)
 {
-    __ms_va_list valist;
+    va_list valist;
     INT res;

-    __ms_va_start( valist, lpFmt );
+    va_start( valist, lpFmt );
     res = wvnsprintfW( lpOut, cchLimitIn, lpFmt, valist );
-    __ms_va_end( valist );
+    va_end( valist );
     return res;
 }