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
ed5ade57
Commit
ed5ade57
authored
Apr 11, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Apr 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpcrt4: Don't cast ptrdiff_t to ULONG in traces, use %I instead.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
be8acff7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
ndr_marshall.c
dlls/rpcrt4/ndr_marshall.c
+6
-6
No files found.
dlls/rpcrt4/ndr_marshall.c
View file @
ed5ade57
...
@@ -121,9 +121,9 @@ static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned cha
...
@@ -121,9 +121,9 @@ static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned cha
}
}
#define STD_OVERFLOW_CHECK(_Msg) do { \
#define STD_OVERFLOW_CHECK(_Msg) do { \
TRACE("buffer=%
ld/%ld\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer)
, _Msg->BufferLength); \
TRACE("buffer=%
Id/%ld\n", _Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer
, _Msg->BufferLength); \
if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \
if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \
ERR("buffer overflow %
ld bytes\n", (ULONG)(_Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)
)); \
ERR("buffer overflow %
Id bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength
)); \
} while (0)
} while (0)
#define NDR_POINTER_ID_BASE 0x20000
#define NDR_POINTER_ID_BASE 0x20000
...
@@ -3629,7 +3629,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
...
@@ -3629,7 +3629,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
/* save it for use by embedded pointer code later */
/* save it for use by embedded pointer code later */
pStubMsg
->
PointerBufferMark
=
(
unsigned
char
*
)
pStubMsg
->
RpcMsg
->
Buffer
+
pStubMsg
->
BufferLength
;
pStubMsg
->
PointerBufferMark
=
(
unsigned
char
*
)
pStubMsg
->
RpcMsg
->
Buffer
+
pStubMsg
->
BufferLength
;
TRACE
(
"difference = 0x%
lx
\n
"
,
(
ULONG
)(
pStubMsg
->
PointerBufferMark
-
pStubMsg
->
Buffer
)
);
TRACE
(
"difference = 0x%
Ix
\n
"
,
pStubMsg
->
PointerBufferMark
-
pStubMsg
->
Buffer
);
pointer_buffer_mark_set
=
TRUE
;
pointer_buffer_mark_set
=
TRUE
;
/* restore the original buffer length */
/* restore the original buffer length */
...
@@ -3715,7 +3715,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
...
@@ -3715,7 +3715,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
/* save it for use by embedded pointer code later */
/* save it for use by embedded pointer code later */
pStubMsg
->
PointerBufferMark
=
pStubMsg
->
Buffer
;
pStubMsg
->
PointerBufferMark
=
pStubMsg
->
Buffer
;
TRACE
(
"difference = 0x%
lx
\n
"
,
(
ULONG
)(
pStubMsg
->
PointerBufferMark
-
saved_buffer
)
);
TRACE
(
"difference = 0x%
Ix
\n
"
,
pStubMsg
->
PointerBufferMark
-
saved_buffer
);
pointer_buffer_mark_set
=
TRUE
;
pointer_buffer_mark_set
=
TRUE
;
/* restore the original buffer */
/* restore the original buffer */
...
@@ -4186,7 +4186,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
...
@@ -4186,7 +4186,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
/* save it for use by embedded pointer code later */
/* save it for use by embedded pointer code later */
pStubMsg
->
PointerBufferMark
=
(
unsigned
char
*
)
pStubMsg
->
RpcMsg
->
Buffer
+
pStubMsg
->
BufferLength
;
pStubMsg
->
PointerBufferMark
=
(
unsigned
char
*
)
pStubMsg
->
RpcMsg
->
Buffer
+
pStubMsg
->
BufferLength
;
TRACE
(
"difference = 0x%
lx
\n
"
,
(
ULONG
)(
pStubMsg
->
Buffer
-
(
unsigned
char
*
)
pStubMsg
->
RpcMsg
->
Buffer
)
);
TRACE
(
"difference = 0x%
Ix
\n
"
,
pStubMsg
->
Buffer
-
(
unsigned
char
*
)
pStubMsg
->
RpcMsg
->
Buffer
);
pointer_buffer_mark_set
=
TRUE
;
pointer_buffer_mark_set
=
TRUE
;
/* restore fields */
/* restore fields */
...
@@ -4242,7 +4242,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
...
@@ -4242,7 +4242,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
NdrComplexArrayMemorySize
(
pStubMsg
,
pFormat
);
NdrComplexArrayMemorySize
(
pStubMsg
,
pFormat
);
pStubMsg
->
IgnoreEmbeddedPointers
=
saved_ignore_embedded
;
pStubMsg
->
IgnoreEmbeddedPointers
=
saved_ignore_embedded
;
TRACE
(
"difference = 0x%
lx
\n
"
,
(
ULONG
)(
pStubMsg
->
Buffer
-
saved_buffer
)
);
TRACE
(
"difference = 0x%
Ix
\n
"
,
pStubMsg
->
Buffer
-
saved_buffer
);
if
(
!
pStubMsg
->
PointerBufferMark
)
if
(
!
pStubMsg
->
PointerBufferMark
)
{
{
/* save it for use by embedded pointer code later */
/* save it for use by embedded pointer code later */
...
...
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