system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpcrt4: Add support for 64-bit conformance values.

Browse source
This commit is contained in:
Alexandre Julliard 2011-06-17 14:11:12 +02:00
parent d8ccfafd5b
commit 4f247d3130
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/rpcrt4/ndr_marshall.c
View file

@ -536,7 +536,7 @@ PFORMAT_STRING ComputeConformanceOrVariance(
BYTE dtype = pFormat[0] & 0xf; BYTE dtype = pFormat[0] & 0xf;
short ofs = *(const short *)&pFormat[2]; short ofs = *(const short *)&pFormat[2];
LPVOID ptr = NULL; LPVOID ptr = NULL;
DWORD data = 0; ULONG_PTR data = 0;
if (!IsConformanceOrVariancePresent(pFormat)) { if (!IsConformanceOrVariancePresent(pFormat)) {
/* null descriptor */ /* null descriptor */
@ -565,7 +565,7 @@ PFORMAT_STRING ComputeConformanceOrVariance(
break; break;
case RPC_FC_CONSTANT_CONFORMANCE: case RPC_FC_CONSTANT_CONFORMANCE:
data = ofs | ((DWORD)pFormat[1] << 16); data = ofs | ((DWORD)pFormat[1] << 16);
TRACE("constant conformance, val=%d\n", data); TRACE("constant conformance, val=%ld\n", data);
*pCount = data; *pCount = data;
goto finish_conf; goto finish_conf;
case RPC_FC_TOP_LEVEL_MULTID_CONFORMANCE: case RPC_FC_TOP_LEVEL_MULTID_CONFORMANCE:
@ -630,11 +630,14 @@ PFORMAT_STRING ComputeConformanceOrVariance(
case RPC_FC_USMALL: case RPC_FC_USMALL:
data = *(UCHAR*)ptr; data = *(UCHAR*)ptr;
break; break;
case RPC_FC_HYPER:
data = *(ULONGLONG *)ptr;
break;
default: default:
FIXME("unknown conformance data type %x\n", dtype); FIXME("unknown conformance data type %x\n", dtype);
goto done_conf_grab; goto done_conf_grab;
} }
TRACE("dereferenced data type %x at %p, got %d\n", dtype, ptr, data); TRACE("dereferenced data type %x at %p, got %ld\n", dtype, ptr, data);
done_conf_grab: done_conf_grab:
switch (pFormat[1]) { switch (pFormat[1]) {