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
fdda17de
Commit
fdda17de
authored
May 24, 2006
by
Robert Shearman
Committed by
Alexandre Julliard
May 25, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpcrt4: Move the initialising of the stub message structure nearer to the top of NdrClientCall2.
Set stubMsg.StackTop after calling the initialise function.
parent
9d874474
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
ndr_stubless.c
dlls/rpcrt4/ndr_stubless.c
+16
-16
No files found.
dlls/rpcrt4/ndr_stubless.c
View file @
fdda17de
...
...
@@ -410,13 +410,6 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
TRACE
(
"pStubDesc %p, pFormat %p, ...
\n
"
,
pStubDesc
,
pFormat
);
/* needed for conformance of top-level objects */
#ifdef __i386__
stubMsg
.
StackTop
=
*
(
unsigned
char
**
)(
&
pFormat
+
1
);
#else
# warning Stack not retrieved for your CPU architecture
#endif
/* Later NDR language versions probably won't be backwards compatible */
if
(
pStubDesc
->
Version
>
0x50002
)
{
...
...
@@ -439,9 +432,25 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
current_offset
=
sizeof
(
NDR_PROC_HEADER
);
}
if
(
pProcHeader
->
Oi_flags
&
RPC_FC_PROC_OIF_OBJECT
)
{
/* object is always the first argument */
This
=
*
(
void
**
)
ARG_FROM_OFFSET
(
stubMsg
,
0
);
NdrProxyInitialize
(
This
,
&
rpcMsg
,
&
stubMsg
,
pStubDesc
,
procedure_number
);
}
else
NdrClientInitializeNew
(
&
rpcMsg
,
&
stubMsg
,
pStubDesc
,
procedure_number
);
TRACE
(
"Oi_flags = 0x%02x
\n
"
,
pProcHeader
->
Oi_flags
);
TRACE
(
"MIDL stub version = 0x%lx
\n
"
,
pStubDesc
->
MIDLVersion
);
/* needed for conformance of top-level objects */
#ifdef __i386__
stubMsg
.
StackTop
=
*
(
unsigned
char
**
)(
&
pFormat
+
1
);
#else
# warning Stack not retrieved for your CPU architecture
#endif
/* we only need a handle if this isn't an object method */
if
(
!
(
pProcHeader
->
Oi_flags
&
RPC_FC_PROC_OIF_OBJECT
))
{
...
...
@@ -547,15 +556,6 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
current_offset
+=
pExtensions
->
Size
;
}
if
(
pProcHeader
->
Oi_flags
&
RPC_FC_PROC_OIF_OBJECT
)
{
/* object is always the first argument */
This
=
*
(
void
**
)
ARG_FROM_OFFSET
(
stubMsg
,
0
);
NdrProxyInitialize
(
This
,
&
rpcMsg
,
&
stubMsg
,
pStubDesc
,
procedure_number
);
}
else
NdrClientInitializeNew
(
&
rpcMsg
,
&
stubMsg
,
pStubDesc
,
procedure_number
);
/* create the full pointer translation tables, if requested */
if
(
pProcHeader
->
Oi_flags
&
RPC_FC_PROC_OIF_FULLPTR
)
#if 0
...
...
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