Andrew Talbot : ole32: Constify some variables.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jul 5 13:31:24 CDT 2007
Module: wine
Branch: master
Commit: 67d667b82823a948371e70abe13a6dd43aabfd33
URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d667b82823a948371e70abe13a6dd43aabfd33
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Wed Jul 4 20:12:48 2007 +0100
ole32: Constify some variables.
---
dlls/ole32/stg_bigblockfile.c | 2 +-
dlls/ole32/stg_prop.c | 4 ++--
dlls/ole32/storage.c | 4 ++--
dlls/ole32/storage32.c | 26 +++++++++++++-------------
dlls/ole32/storage32.h | 19 +++++++++----------
5 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index 4f22207..aa48a9d 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/dlls/ole32/stg_bigblockfile.c
@@ -920,7 +920,7 @@ HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset,
}
HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset,
- void* buffer, const ULONG size, ULONG* bytesRead)
+ const void* buffer, ULONG size, ULONG* bytesRead)
{
if (This->fileBased)
return ImplBIGBLOCKFILE_WriteAt(This,offset,buffer,size,bytesRead);
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index 45c760e..f2c96ee 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -1617,7 +1617,7 @@ end:
}
static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This,
- DWORD propNum, DWORD propid, PROPVARIANT *var, DWORD *sectionOffset)
+ DWORD propNum, DWORD propid, const PROPVARIANT *var, DWORD *sectionOffset)
{
HRESULT hr;
LARGE_INTEGER seek;
@@ -1717,7 +1717,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This,
FILETIME temp;
StorageUtl_WriteULargeInteger((BYTE *)&temp, 0,
- (ULARGE_INTEGER *)&var->u.filetime);
+ (const ULARGE_INTEGER *)&var->u.filetime);
hr = IStream_Write(This->stm, &temp, sizeof(FILETIME), &count);
bytesWritten = count;
break;
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index b2b89ff..febdc12 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -552,7 +552,7 @@ STORAGE_get_small_block(stream_access16 *str,int blocknr,BYTE *sblock) {
* STORAGE_put_small_block [INTERNAL]
*/
static BOOL
-STORAGE_put_small_block(stream_access16 *str,int blocknr,BYTE *sblock) {
+STORAGE_put_small_block(stream_access16 *str,int blocknr,const BYTE *sblock) {
BYTE block[BIGSIZE];
int bigblocknr;
struct storage_pps_entry root;
@@ -654,7 +654,7 @@ STORAGE_get_pps_entry(stream_access16*str,int n,struct storage_pps_entry *pstde)
* STORAGE_put_pps_entry [Internal]
*/
static int
-STORAGE_put_pps_entry(stream_access16*str,int n,struct storage_pps_entry *pstde) {
+STORAGE_put_pps_entry(stream_access16*str,int n,const struct storage_pps_entry *pstde) {
int blocknr;
BYTE block[BIGSIZE];
struct storage_pps_entry *stde = (struct storage_pps_entry*)(((LPBYTE)block)+128*(n&3));
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index bda5bdc..f787faa 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -91,7 +91,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct(StorageImpl* ancestorS
DWORD openFlags, ULONG rootTropertyIndex);
static void StorageImpl_Destroy(StorageBaseImpl* iface);
static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer);
-static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer);
+static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer);
static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock);
static HRESULT StorageImpl_LoadFileHeader(StorageImpl* This);
static void StorageImpl_SaveFileHeader(StorageImpl* This);
@@ -279,7 +279,7 @@ static HRESULT StorageImpl_ReadAt(StorageImpl* This,
static HRESULT StorageImpl_WriteAt(StorageImpl* This,
ULARGE_INTEGER offset,
- void* buffer,
+ const void* buffer,
const ULONG size,
ULONG* bytesWritten)
{
@@ -3373,9 +3373,9 @@ BOOL StorageImpl_ReadProperty(
* Write the specified property into the property chain
*/
BOOL StorageImpl_WriteProperty(
- StorageImpl* This,
- ULONG index,
- StgProperty* buffer)
+ StorageImpl* This,
+ ULONG index,
+ const StgProperty* buffer)
{
BYTE currentProperty[PROPSET_BLOCK_SIZE];
ULARGE_INTEGER offsetInPropSet;
@@ -3492,9 +3492,9 @@ static BOOL StorageImpl_ReadDWordFromBigBlock(
}
static BOOL StorageImpl_WriteBigBlock(
- StorageImpl* This,
- ULONG blockIndex,
- void* buffer)
+ StorageImpl* This,
+ ULONG blockIndex,
+ const void* buffer)
{
ULARGE_INTEGER ulOffset;
DWORD wrote;
@@ -4337,9 +4337,9 @@ void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value)
}
void StorageUtl_CopyPropertyToSTATSTG(
- STATSTG* destination,
- StgProperty* source,
- int statFlags)
+ STATSTG* destination,
+ const StgProperty* source,
+ int statFlags)
{
/*
* The copy of the string occurs only when the flag is not set
@@ -6864,7 +6864,7 @@ static HRESULT OLECONVERT_SaveOLE10(OLECONVERT_OLESTREAM_DATA *pData, LPOLESTREA
*
*
*/
-static void OLECONVERT_GetOLE20FromOLE10(LPSTORAGE pDestStorage, BYTE *pBuffer, DWORD nBufferLength)
+static void OLECONVERT_GetOLE20FromOLE10(LPSTORAGE pDestStorage, const BYTE *pBuffer, DWORD nBufferLength)
{
HRESULT hRes;
HANDLE hFile;
@@ -7414,7 +7414,7 @@ static void OLECONVERT_CreateOlePresStream(LPSTORAGE pStorage, DWORD dwExtentX,
* Might need to verify the data and return appropriate error message
*
*/
-static void OLECONVERT_CreateOle10NativeStream(LPSTORAGE pStorage, BYTE *pData, DWORD dwDataLength)
+static void OLECONVERT_CreateOle10NativeStream(LPSTORAGE pStorage, const BYTE *pData, DWORD dwDataLength)
{
HRESULT hRes;
IStream *pStream;
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 6892996..76db895 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -189,7 +189,7 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize)
HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset,
void* buffer, ULONG size, ULONG* bytesRead);
HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset,
- void* buffer, const ULONG size, ULONG* bytesRead);
+ const void* buffer, ULONG size, ULONG* bytesRead);
/*************************************************************************
* Ole Convert support
@@ -311,14 +311,14 @@ struct StorageImpl
};
BOOL StorageImpl_ReadProperty(
- StorageImpl* This,
- ULONG index,
- StgProperty* buffer);
+ StorageImpl* This,
+ ULONG index,
+ StgProperty* buffer);
BOOL StorageImpl_WriteProperty(
- StorageImpl* This,
- ULONG index,
- StgProperty* buffer);
+ StorageImpl* This,
+ ULONG index,
+ const StgProperty* buffer);
BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
StorageImpl* This,
@@ -423,9 +423,8 @@ void StorageUtl_WriteULargeInteger(BYTE* buffer, ULONG offset,
const ULARGE_INTEGER *value);
void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value);
void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value);
-void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination,
- StgProperty* source,
- int statFlags);
+void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination, const StgProperty* source,
+ int statFlags);
/****************************************************************************
* BlockChainStream definitions.
More information about the wine-cvs
mailing list