Mikhail Maroukhine : rpcrt4: Fix compiler warnings with flag -Wcast-qual.

Alexandre Julliard julliard at winehq.org
Thu Apr 1 11:25:05 CDT 2010


Module: wine
Branch: master
Commit: 9b933a35944522dd871d1f8530d2c6818e0aa221
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9b933a35944522dd871d1f8530d2c6818e0aa221

Author: Mikhail Maroukhine <mikolg at yandex.ru>
Date:   Sat Mar 27 02:53:36 2010 +0600

rpcrt4: Fix compiler warnings with flag -Wcast-qual.

---

 dlls/rpcrt4/ndr_marshall.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 9946bd1..f36069c 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -2395,7 +2395,7 @@ unsigned char *  WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubM
 
   TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat);
 
-  maxsize = *(USHORT *)&pFormat[2];
+  maxsize = *(const USHORT *)&pFormat[2];
 
   if (*pFormat == RPC_FC_CSTRING)
   {
@@ -2445,7 +2445,7 @@ unsigned char *  WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStu
   TRACE("(pStubMsg == ^%p, *pMemory == ^%p, pFormat == ^%p, fMustAlloc == %u)\n",
     pStubMsg, *ppMemory, pFormat, fMustAlloc);
 
-  maxsize = *(USHORT *)&pFormat[2];
+  maxsize = *(const USHORT *)&pFormat[2];
 
   ReadVariance(pStubMsg, NULL, maxsize);
   if (pStubMsg->Offset)
@@ -2495,7 +2495,7 @@ void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
 
   TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat);
 
-  maxsize = *(USHORT *)&pFormat[2];
+  maxsize = *(const USHORT *)&pFormat[2];
 
   SizeVariance(pStubMsg);
 
@@ -2538,7 +2538,7 @@ ULONG WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
 
   TRACE("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat);
 
-  maxsize = *(USHORT *)&pFormat[2];
+  maxsize = *(const USHORT *)&pFormat[2];
 
   ReadVariance(pStubMsg, NULL, maxsize);
 
@@ -6268,7 +6268,7 @@ static unsigned char *WINAPI NdrRangeMarshall(
     unsigned char *pMemory,
     PFORMAT_STRING pFormat)
 {
-    NDR_RANGE *pRange = (NDR_RANGE *)pFormat;
+    const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat;
     unsigned char base_type;
 
     TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat);
@@ -6294,7 +6294,7 @@ unsigned char *WINAPI NdrRangeUnmarshall(
     PFORMAT_STRING pFormat,
     unsigned char fMustAlloc)
 {
-    NDR_RANGE *pRange = (NDR_RANGE *)pFormat;
+    const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat;
     unsigned char base_type;
 
     TRACE("pStubMsg: %p, ppMemory: %p, type: 0x%02x, fMustAlloc: %s\n", pStubMsg, ppMemory, *pFormat, fMustAlloc ? "true" : "false");
@@ -6391,7 +6391,7 @@ static void WINAPI NdrRangeBufferSize(
     unsigned char *pMemory,
     PFORMAT_STRING pFormat)
 {
-    NDR_RANGE *pRange = (NDR_RANGE *)pFormat;
+    const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat;
     unsigned char base_type;
 
     TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat);
@@ -6413,7 +6413,7 @@ static ULONG WINAPI NdrRangeMemorySize(
     PMIDL_STUB_MESSAGE pStubMsg,
     PFORMAT_STRING pFormat)
 {
-    NDR_RANGE *pRange = (NDR_RANGE *)pFormat;
+    const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat;
     unsigned char base_type;
 
     if (pRange->type != RPC_FC_RANGE)




More information about the wine-cvs mailing list