Commit 348336b8 authored by Alexandre Julliard's avatar Alexandre Julliard

rpcrt4: Use the standard va_list instead of __ms_va_list.

parent 5b15bf33
......@@ -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 );
......
......@@ -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;
}
......
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