Skip to content

W
wine-cw
Commit 5728d6b4 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

rpcrt4: Fix tracing of non-conformant strings.

parent 1707c1c5
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 12 deletions
dlls/rpcrt4/ndr_marshall.c
View file @ 5728d6b4
......@@ -2405,20 +2405,18 @@ unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubM
if (*pFormat == RPC_FC_CSTRING)
{
ULONG i;
ULONG i = 0;
const char *str = (const char *)pMemory;
for (i = 0; i < maxsize && *str; i++, str++)
;
while (i < maxsize && str[i]) i++;
TRACE("string=%s\n", debugstr_an(str, i));
pStubMsg->ActualCount = i + 1;
esize = 1;
}
else if (*pFormat == RPC_FC_WSTRING)
{
ULONG i;
ULONG i = 0;
const WCHAR *str = (const WCHAR *)pMemory;
for (i = 0; i < maxsize && *str; i++, str++)
;
while (i < maxsize && str[i]) i++;
TRACE("string=%s\n", debugstr_wn(str, i));
pStubMsg->ActualCount = i + 1;
esize = 2;
......@@ -2507,20 +2505,18 @@ void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
if (*pFormat == RPC_FC_CSTRING)
{
ULONG i;
ULONG i = 0;
const char *str = (const char *)pMemory;
for (i = 0; i < maxsize && *str; i++, str++)
;
while (i < maxsize && str[i]) i++;
TRACE("string=%s\n", debugstr_an(str, i));
pStubMsg->ActualCount = i + 1;
esize = 1;
}
else if (*pFormat == RPC_FC_WSTRING)
{
ULONG i;
ULONG i = 0;
const WCHAR *str = (const WCHAR *)pMemory;
for (i = 0; i < maxsize && *str; i++, str++)
;
while (i < maxsize && str[i]) i++;
TRACE("string=%s\n", debugstr_wn(str, i));
pStubMsg->ActualCount = i + 1;
esize = 2;
......
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