From aedfc471a23cc7223c7e1f0e15dacaa9e5941074 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Fri, 30 Apr 2004 18:32:36 +0000
Subject: [PATCH] Fixed lvalue casts.

---
 dlls/ole32/marshal.c |  3 ++-
 dlls/ole32/storage.c | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index c0631b81a6c..a045f3d999d 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -379,7 +379,8 @@ CoGetStandardMarshal(
   TRACE("(%s,%p,%lx,%p,%lx,%p)\n",
     debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags,pMarshal
   );
-  dm = (StdMarshalImpl*) *pMarshal = HeapAlloc(GetProcessHeap(),0,sizeof(StdMarshalImpl));
+  *pMarshal = HeapAlloc(GetProcessHeap(),0,sizeof(StdMarshalImpl));
+  dm = (StdMarshalImpl*) *pMarshal;
   if (!dm) return E_FAIL;
   dm->lpvtbl		= &stdmvtbl;
   dm->ref		= 1;
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index 2f753ad6712..664d661cec3 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -1061,6 +1061,7 @@ HRESULT WINAPI IStream16_fnRead(
 	BYTE	block[BIGSIZE];
 	ULONG	*bytesread=pcbRead,xxread;
 	int	blocknr;
+	LPBYTE	pbv = pv;
 
 	TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbRead);
 	if (!pcbRead) bytesread=&xxread;
@@ -1081,9 +1082,9 @@ HRESULT WINAPI IStream16_fnRead(
 			cc = cb;
 			if (cc>SMALLSIZE-(This->offset.u.LowPart&(SMALLSIZE-1)))
 				cc=SMALLSIZE-(This->offset.u.LowPart&(SMALLSIZE-1));
-			memcpy((LPBYTE)pv,block+(This->offset.u.LowPart&(SMALLSIZE-1)),cc);
+			memcpy(pbv,block+(This->offset.u.LowPart&(SMALLSIZE-1)),cc);
 			This->offset.u.LowPart+=cc;
-			(LPBYTE)pv+=cc;
+			pbv+=cc;
 			*bytesread+=cc;
 			cb-=cc;
 			blocknr = STORAGE_get_next_small_blocknr(This->hf,blocknr);
@@ -1101,9 +1102,9 @@ HRESULT WINAPI IStream16_fnRead(
 			cc = cb;
 			if (cc>BIGSIZE-(This->offset.u.LowPart&(BIGSIZE-1)))
 				cc=BIGSIZE-(This->offset.u.LowPart&(BIGSIZE-1));
-			memcpy((LPBYTE)pv,block+(This->offset.u.LowPart&(BIGSIZE-1)),cc);
+			memcpy(pbv,block+(This->offset.u.LowPart&(BIGSIZE-1)),cc);
 			This->offset.u.LowPart+=cc;
-			(LPBYTE)pv+=cc;
+			pbv+=cc;
 			*bytesread+=cc;
 			cb-=cc;
 			blocknr=STORAGE_get_next_big_blocknr(This->hf,blocknr);
@@ -1123,6 +1124,7 @@ HRESULT WINAPI IStream16_fnWrite(
 	ULONG	*byteswritten=pcbWrite,xxwritten;
 	int	oldsize,newsize,i,curoffset=0,lastblocknr,blocknr,cc;
 	HANDLE	hf = This->hf;
+	LPBYTE	pbv = (LPBYTE)pv;
 
 	if (!pcbWrite) byteswritten=&xxwritten;
 	*byteswritten = 0;
@@ -1340,14 +1342,14 @@ HRESULT WINAPI IStream16_fnWrite(
 			if (cc>cb)
 				cc=cb;
 			memcpy(	((LPBYTE)block)+(This->offset.u.LowPart&(SMALLSIZE-1)),
-				(LPBYTE)((char *) pv+curoffset),
+				pbv+curoffset,
 				cc
 			);
 			if (!STORAGE_put_small_block(hf,blocknr,block))
 				return E_FAIL;
 			cb			-= cc;
 			curoffset		+= cc;
-			(LPBYTE)pv		+= cc;
+			pbv			+= cc;
 			This->offset.u.LowPart	+= cc;
 			*byteswritten		+= cc;
 			blocknr = STORAGE_get_next_small_blocknr(hf,blocknr);
@@ -1368,14 +1370,14 @@ HRESULT WINAPI IStream16_fnWrite(
 			if (cc>cb)
 				cc=cb;
 			memcpy(	((LPBYTE)block)+(This->offset.u.LowPart&(BIGSIZE-1)),
-				(LPBYTE)((char *) pv+curoffset),
+				pbv+curoffset,
 				cc
 			);
 			if (!STORAGE_put_big_block(hf,blocknr,block))
 				return E_FAIL;
 			cb			-= cc;
 			curoffset		+= cc;
-			(LPBYTE)pv		+= cc;
+			pbv			+= cc;
 			This->offset.u.LowPart	+= cc;
 			*byteswritten		+= cc;
 			blocknr = STORAGE_get_next_big_blocknr(hf,blocknr);