Andrew Talbot : avifil32: Constify some variables.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Apr 3 06:48:25 CDT 2007
Module: wine
Branch: master
Commit: b01c2c8ae524ad04daf90c22a075ade9759b70ef
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01c2c8ae524ad04daf90c22a075ade9759b70ef
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Mon Apr 2 22:50:46 2007 +0100
avifil32: Constify some variables.
---
dlls/avifil32/avifile.c | 25 ++++++++++++-------------
dlls/avifil32/avifile_private.h | 2 +-
dlls/avifil32/extrachunk.c | 4 ++--
dlls/avifil32/extrachunk.h | 4 ++--
dlls/avifil32/tmpfile.c | 2 +-
dlls/avifil32/wavfile.c | 4 ++--
6 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index f989c79..3ed6386 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -210,19 +210,19 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size,
static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This);
static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This);
static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr,
- LPAVISTREAMINFOW asi);
+ const AVISTREAMINFOW *asi);
static void AVIFILE_DestructAVIStream(IAVIStreamImpl *This);
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
-static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset);
-static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp,
+static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset);
+static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp,
LONG count, DWORD pos, BOOL *bAbsolute);
static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start,
LPVOID buffer, LONG size);
-static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos,
+static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos,
LPLONG offset);
static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This);
-static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This);
-static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fccType,
+static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This);
+static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType,
LONG lSkip);
static void AVIFILE_UpdateInfo(IAVIFileImpl *This);
static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block,
@@ -1502,7 +1502,7 @@ static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This)
return dwPos;
}
-static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, LPAVISTREAMINFOW asi)
+static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, const AVISTREAMINFOW *asi)
{
IAVIStreamImpl *pstream;
@@ -1902,7 +1902,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
return AVIERR_OK;
}
-static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset)
+static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset)
{
AVIINDEXENTRY *lp;
DWORD pos, n;
@@ -1975,7 +1975,7 @@ static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset)
return hr;
}
-static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp,
+static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp,
LONG count, DWORD pos, BOOL *bAbsolute)
{
if (lp == NULL)
@@ -2064,8 +2064,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos,
return AVIERR_OK;
}
-static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos,
- LPLONG offset)
+static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset)
{
LONG block;
@@ -2317,7 +2316,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
return AVIERR_OK;
}
-static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This)
+static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This)
{
IAVIStreamImpl *pStream;
AVIINDEXENTRY idx;
@@ -2447,7 +2446,7 @@ static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This)
return AVIERR_OK;
}
-static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fcc, LONG lSkip)
+static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fcc, LONG lSkip)
{
UINT i;
UINT nStream;
diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h
index 8159e04..e4ee963 100644
--- a/dlls/avifil32/avifile_private.h
+++ b/dlls/avifil32/avifile_private.h
@@ -63,7 +63,7 @@ extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj);
extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj);
extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream);
extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream);
-extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams,PAVISTREAM *ppStreams);
+extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams);
extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName);
diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c
index 8fad124..45096e8 100644
--- a/dlls/avifil32/extrachunk.c
+++ b/dlls/avifil32/extrachunk.c
@@ -29,7 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
/* reads a chunk outof the extrachunk-structure */
-HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,LPLONG size)
+HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size)
{
LPBYTE lp;
DWORD cb;
@@ -99,7 +99,7 @@ HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lpData, LONG siz
}
/* reads a chunk fomr the HMMIO into the extrachunk-structure */
-HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck)
+HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck)
{
LPDWORD lp;
DWORD cb;
diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h
index 981f68e..3e097ba 100644
--- a/dlls/avifil32/extrachunk.h
+++ b/dlls/avifil32/extrachunk.h
@@ -35,13 +35,13 @@ typedef struct _EXTRACHUNKS {
} EXTRACHUNKS, *LPEXTRACHUNKS;
/* reads a chunk outof the extrachunk-structure */
-HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size);
+HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size);
/* writes a chunk into the extrachunk-structure */
HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size);
/* reads a chunk fomr the HMMIO into the extrachunk-structure */
-HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck);
+HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck);
/* reads all non-junk chunks into the extrachunk-structure until it finds
* the given chunk or the optional parent-chunk is at the end */
diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c
index 2dfcc95..424990e 100644
--- a/dlls/avifil32/tmpfile.c
+++ b/dlls/avifil32/tmpfile.c
@@ -71,7 +71,7 @@ typedef struct _ITmpFileImpl {
PAVISTREAM *ppStreams;
} ITmpFileImpl;
-PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, PAVISTREAM *ppStreams) {
+PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) {
ITmpFileImpl *tmpFile;
int i;
diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c
index e2f82fe..d3048d6 100644
--- a/dlls/avifil32/wavfile.c
+++ b/dlls/avifil32/wavfile.c
@@ -212,7 +212,7 @@ struct _IAVIFileImpl {
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This);
-static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This);
+static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This);
HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv)
{
@@ -1248,7 +1248,7 @@ static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This)
return AVIERR_OK;
}
-static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
+static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This)
{
MMCKINFO ckRIFF;
MMCKINFO ck;
More information about the wine-cvs
mailing list