PATCH: lvalue casts
Marcus Meissner
marcus at jet.franken.de
Fri Apr 30 01:36:46 CDT 2004
Hi,
This fixes lvalue casts (casts to components left of =), which
are no longer allowed in gcc 3.5.
Ciao, Marcus
Changelog:
Fixed lvalue casts.
Index: marshal.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/marshal.c,v
retrieving revision 1.12
diff -u -r1.12 marshal.c
--- dlls/ole32/marshal.c 11 Sep 2003 03:06:25 -0000 1.12
+++ dlls/ole32/marshal.c 30 Apr 2004 06:21:10 -0000
@@ -379,7 +379,8 @@
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;
Index: storage.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/storage.c,v
retrieving revision 1.37
diff -u -r1.37 storage.c
--- dlls/ole32/storage.c 7 Feb 2004 01:27:51 -0000 1.37
+++ dlls/ole32/storage.c 30 Apr 2004 06:21:13 -0000
@@ -1061,6 +1061,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
More information about the wine-patches
mailing list