Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
348336b8
Commit
348336b8
authored
3 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
rpcrt4: Use the standard va_list instead of __ms_va_list.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5b15bf33
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/rpcrt4/ndr_es.c
+3
-3
3 additions, 3 deletions
dlls/rpcrt4/ndr_es.c
dlls/rpcrt4/ndr_stubless.c
+12
-12
12 additions, 12 deletions
dlls/rpcrt4/ndr_stubless.c
with
15 additions
and
15 deletions
dlls/rpcrt4/ndr_es.c
+
3
−
3
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
);
...
...
This diff is collapsed.
Click to expand it.
dlls/rpcrt4/ndr_stubless.c
+
12
−
12
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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment