Module: wine Branch: master Commit: ca78a8b65f90a8a72f1e599ef9cb0931f09d85a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca78a8b65f90a8a72f1e599ef9...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Thu Jul 5 23:27:24 2007 +0100
ole32: Cast-qual warnings fix.
---
dlls/ole32/stg_bigblockfile.c | 2 +- dlls/ole32/stg_prop.c | 4 ++-- dlls/ole32/storage32.c | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index aa48a9d..0fe2a3b 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -896,7 +896,7 @@ static HRESULT WINAPI ImplBIGBLOCKFILE_WriteAt(
if (bytes_left) { - readPtr = (LPBYTE)readPtr + bytes_to_page; + readPtr = (const BYTE *)readPtr + bytes_to_page; page_index ++; offset_in_page = 0; if (bytes_left > PAGE_SIZE) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index f2c96ee..76a86ca 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1775,8 +1775,8 @@ static BOOL PropertyStorage_PropertiesWriter(const void *key, const void *value, assert(value); assert(extra); assert(closure); - c->hr = PropertyStorage_WritePropertyToStream(This, - c->propNum++, (DWORD)key, (PROPVARIANT *)value, c->sectionOffset); + c->hr = PropertyStorage_WritePropertyToStream(This, c->propNum++, + (DWORD)key, value, c->sectionOffset); return SUCCEEDED(c->hr); }
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f787faa..584b132 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4643,10 +4643,6 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, return STG_E_DOCFILECORRUPT; }
- /* - * Here, I'm casting away the constness on the buffer variable - * This is OK since we don't intend to modify that buffer. - */ *bytesWritten = 0; bufferWalker = (const BYTE*)buffer;
@@ -4667,7 +4663,7 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This,
StorageImpl_WriteAt(This->parentStorage, ulOffset, - (BYTE*)bufferWalker, + bufferWalker, bytesToWrite, &bytesWrittenAt);