avifil32: Constify some variables.
This commit is contained in:
parent
8e2bee8cb1
commit
b01c2c8ae5
|
@ -210,19 +210,19 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size,
|
||||||
static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This);
|
static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This);
|
||||||
static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This);
|
static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This);
|
||||||
static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr,
|
static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr,
|
||||||
LPAVISTREAMINFOW asi);
|
const AVISTREAMINFOW *asi);
|
||||||
static void AVIFILE_DestructAVIStream(IAVIStreamImpl *This);
|
static void AVIFILE_DestructAVIStream(IAVIStreamImpl *This);
|
||||||
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
|
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
|
||||||
static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset);
|
static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset);
|
||||||
static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp,
|
static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp,
|
||||||
LONG count, DWORD pos, BOOL *bAbsolute);
|
LONG count, DWORD pos, BOOL *bAbsolute);
|
||||||
static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start,
|
static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start,
|
||||||
LPVOID buffer, LONG size);
|
LPVOID buffer, LONG size);
|
||||||
static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos,
|
static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos,
|
||||||
LPLONG offset);
|
LPLONG offset);
|
||||||
static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This);
|
static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This);
|
||||||
static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This);
|
static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This);
|
||||||
static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fccType,
|
static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType,
|
||||||
LONG lSkip);
|
LONG lSkip);
|
||||||
static void AVIFILE_UpdateInfo(IAVIFileImpl *This);
|
static void AVIFILE_UpdateInfo(IAVIFileImpl *This);
|
||||||
static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block,
|
static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block,
|
||||||
|
@ -1502,7 +1502,7 @@ static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This)
|
||||||
return dwPos;
|
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;
|
IAVIStreamImpl *pstream;
|
||||||
|
|
||||||
|
@ -1902,7 +1902,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
|
||||||
return AVIERR_OK;
|
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;
|
AVIINDEXENTRY *lp;
|
||||||
DWORD pos, n;
|
DWORD pos, n;
|
||||||
|
@ -1975,7 +1975,7 @@ static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset)
|
||||||
return hr;
|
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)
|
LONG count, DWORD pos, BOOL *bAbsolute)
|
||||||
{
|
{
|
||||||
if (lp == NULL)
|
if (lp == NULL)
|
||||||
|
@ -2064,8 +2064,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos,
|
||||||
return AVIERR_OK;
|
return AVIERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos,
|
static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset)
|
||||||
LPLONG offset)
|
|
||||||
{
|
{
|
||||||
LONG block;
|
LONG block;
|
||||||
|
|
||||||
|
@ -2317,7 +2316,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
|
||||||
return AVIERR_OK;
|
return AVIERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This)
|
static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This)
|
||||||
{
|
{
|
||||||
IAVIStreamImpl *pStream;
|
IAVIStreamImpl *pStream;
|
||||||
AVIINDEXENTRY idx;
|
AVIINDEXENTRY idx;
|
||||||
|
@ -2447,7 +2446,7 @@ static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This)
|
||||||
return AVIERR_OK;
|
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 i;
|
||||||
UINT nStream;
|
UINT nStream;
|
||||||
|
|
|
@ -63,7 +63,7 @@ extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj);
|
||||||
extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj);
|
extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj);
|
||||||
extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream);
|
extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream);
|
||||||
extern PGETFRAME AVIFILE_CreateGetFrame(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);
|
extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName);
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
|
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
|
||||||
|
|
||||||
/* reads a chunk outof the extrachunk-structure */
|
/* 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;
|
LPBYTE lp;
|
||||||
DWORD cb;
|
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 */
|
/* 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;
|
LPDWORD lp;
|
||||||
DWORD cb;
|
DWORD cb;
|
||||||
|
|
|
@ -35,13 +35,13 @@ typedef struct _EXTRACHUNKS {
|
||||||
} EXTRACHUNKS, *LPEXTRACHUNKS;
|
} EXTRACHUNKS, *LPEXTRACHUNKS;
|
||||||
|
|
||||||
/* reads a chunk outof the extrachunk-structure */
|
/* 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 */
|
/* writes a chunk into the extrachunk-structure */
|
||||||
HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size);
|
HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size);
|
||||||
|
|
||||||
/* reads a chunk fomr the HMMIO into the extrachunk-structure */
|
/* 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
|
/* reads all non-junk chunks into the extrachunk-structure until it finds
|
||||||
* the given chunk or the optional parent-chunk is at the end */
|
* the given chunk or the optional parent-chunk is at the end */
|
||||||
|
|
|
@ -71,7 +71,7 @@ typedef struct _ITmpFileImpl {
|
||||||
PAVISTREAM *ppStreams;
|
PAVISTREAM *ppStreams;
|
||||||
} ITmpFileImpl;
|
} ITmpFileImpl;
|
||||||
|
|
||||||
PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, PAVISTREAM *ppStreams) {
|
PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) {
|
||||||
ITmpFileImpl *tmpFile;
|
ITmpFileImpl *tmpFile;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -212,7 +212,7 @@ struct _IAVIFileImpl {
|
||||||
|
|
||||||
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
|
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
|
||||||
static HRESULT AVIFILE_LoadSunFile(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)
|
HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv)
|
||||||
{
|
{
|
||||||
|
@ -1248,7 +1248,7 @@ static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This)
|
||||||
return AVIERR_OK;
|
return AVIERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
|
static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This)
|
||||||
{
|
{
|
||||||
MMCKINFO ckRIFF;
|
MMCKINFO ckRIFF;
|
||||||
MMCKINFO ck;
|
MMCKINFO ck;
|
||||||
|
|
Loading…
Reference in New Issue