Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
348336b8
Commit
348336b8
authored
Oct 22, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpcrt4: Use the standard va_list instead of __ms_va_list.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5b15bf33
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
ndr_es.c
dlls/rpcrt4/ndr_es.c
+3
-3
ndr_stubless.c
dlls/rpcrt4/ndr_stubless.c
+12
-12
No files found.
dlls/rpcrt4/ndr_es.c
View file @
348336b8
...
...
@@ -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
);
...
...
dlls/rpcrt4/ndr_stubless.c
View file @
348336b8
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment