Michael Stefaniuc : rpcrt4:
For Win64 compatibility use a temp variable of the right type in
ComputeVariance ().
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Nov 8 14:12:08 CST 2006
Module: wine
Branch: master
Commit: 4e2b462d4f6c8058be382575da656f7cd7909ac9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2b462d4f6c8058be382575da656f7cd7909ac9
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Nov 7 22:01:45 2006 +0100
rpcrt4: For Win64 compatibility use a temp variable of the right type in ComputeVariance().
---
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);
More information about the wine-cvs
mailing list