rpcrt4: For Win64 compatibility use a temp variable of the right
type in ComputeVariance().
Michael Stefaniuc
mstefani at redhat.de
Tue Nov 7 15:01:45 CST 2006
---
dlls/rpcrt4/ndr_misc.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h
index a1560b9..b5c3d88 100644
--- a/dlls/rpcrt4/ndr_misc.h
+++ b/dlls/rpcrt4/ndr_misc.h
@@ -41,8 +41,13 @@ static inline PFORMAT_STRING ComputeConf
static inline PFORMAT_STRING ComputeVariance(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, ULONG def)
{
+ PFORMAT_STRING ret;
+ ULONG_PTR ActualCount = pStubMsg->ActualCount;
+
pStubMsg->Offset = 0;
- return ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->ActualCount);
+ ret = ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &ActualCount);
+ pStubMsg->ActualCount = (ULONG)ActualCount;
+ return ret;
}
typedef unsigned char* (WINAPI *NDR_MARSHALL) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING);
--
1.4.2.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061107/3a43bd37/attachment.pgp
More information about the wine-patches
mailing list