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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 348336b8cd6fe9f62bbf0886dbc70cbc59601afa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=348336b8cd6fe9f62bbf0886d...

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

rpcrt4: Use the standard va_list instead of __ms_va_list.

Signed-off-by: Alexandre Julliard

---

dlls/rpcrt4/ndr_es.c       |  6 +++---
 dlls/rpcrt4/ndr_stubless.c | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c
index 158bc7cda2a..a756b178c5d 100644
--- a/dlls/rpcrt4/ndr_es.c
+++ b/dlls/rpcrt4/ndr_es.c
@@ -407,7 +407,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu
     /* header for procedure string */
     const NDR_PROC_HEADER *pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0];
     const RPC_CLIENT_INTERFACE *client_interface;
-    __ms_va_list args;
+    va_list args;
     unsigned int number_of_params;
     ULONG_PTR arg_buffer[256];

@@ -474,9 +474,9 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu
     TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion);

/* needed for conformance of top-level objects */
-    __ms_va_start( args, pFormat );
+    va_start( args, pFormat );
     pEsMsg->StubMsg.StackTop = va_arg( args, unsigned char * );
-    __ms_va_end( args );
+    va_end( args );

pFormat = convert_old_args( &pEsMsg->StubMsg, pFormat, stack_size, FALSE,
                                 arg_buffer, sizeof(arg_buffer), &number_of_params );
diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 3e0c824c733..815b8ecce23 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1023,12 +1023,12 @@ __ASM_GLOBAL_FUNC( NdrClientCall2,
  */
 CLIENT_CALL_RETURN WINAPIV NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... )
 {
-    __ms_va_list args;
+    va_list args;
     LONG_PTR ret;

-    __ms_va_start( args, format );
+    va_start( args, format );
     ret = ndr_client_call( desc, format, va_arg( args, void ** ), NULL );
-    __ms_va_end( args );
+    va_end( args );
     return *(CLIENT_CALL_RETURN *)&ret;
 }

@@ -1923,12 +1923,12 @@ __ASM_GLOBAL_FUNC( NdrAsyncClientCall,
  */
 CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... )
 {
-    __ms_va_list args;
+    va_list args;
     LONG_PTR ret;

-    __ms_va_start( args, format );
+    va_start( args, format );
     ret = ndr_async_client_call( desc, format, va_arg( args, void ** ));
-    __ms_va_end( args );
+    va_end( args );
     return *(CLIENT_CALL_RETURN *)&ret;
 }

@@ -2263,12 +2263,12 @@ __ASM_GLOBAL_FUNC( NdrClientCall3,
  */
 CLIENT_CALL_RETURN WINAPIV NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... )
 {
-    __ms_va_list args;
+    va_list args;
     LONG_PTR ret;

-    __ms_va_start( args, retval );
+    va_start( args, retval );
     ret = ndr64_client_call( info, proc, retval, va_arg( args, void ** ), NULL );
-    __ms_va_end( args );
+    va_end( args );
     return *(CLIENT_CALL_RETURN *)&ret;
 }

@@ -2323,12 +2323,12 @@ __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall,
  */
 CLIENT_CALL_RETURN WINAPIV Ndr64AsyncClientCall( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... )
 {
-    __ms_va_list args;
+    va_list args;
     LONG_PTR ret;

-    __ms_va_start( args, retval );
+    va_start( args, retval );
     ret = ndr64_async_client_call( info, proc, retval, va_arg( args, void ** ), NULL );
-    __ms_va_end( args );
+    va_end( args );
     return *(CLIENT_CALL_RETURN *)&ret;
 }