Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 14:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=26494
This commit is contained in:
The Wine Synchronizer 2007-04-25 08:20:24 +00:00
parent a601165253
commit 66c1fabe11
13 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/avifil32/acmstream.c
View file

@ -23,7 +23,6 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "vfw.h" #include "vfw.h"

1
reactos/dll/win32/avifil32/api.c
View file

@ -17,7 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS

25
reactos/dll/win32/avifil32/avifile.c
View file

@ -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;

2
reactos/dll/win32/avifil32/avifile_private.h
View file

@ -67,7 +67,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);

1
reactos/dll/win32/avifil32/editstream.c
View file

@ -23,7 +23,6 @@
#include "winbase.h" #include "winbase.h"
#include "winuser.h" #include "winuser.h"
#include "wingdi.h" #include "wingdi.h"
#include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "vfw.h" #include "vfw.h"

4
reactos/dll/win32/avifil32/extrachunk.c
View file

@ -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;

4
reactos/dll/win32/avifil32/extrachunk.h
View file

@ -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 */

2
reactos/dll/win32/avifil32/factory.c
View file

@ -16,7 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
@ -25,7 +24,6 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "ole2.h" #include "ole2.h"

2
reactos/dll/win32/avifil32/getframe.c
View file

@ -16,12 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "vfw.h" #include "vfw.h"

2
reactos/dll/win32/avifil32/icmstream.c
View file

@ -23,11 +23,9 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "vfw.h" #include "vfw.h"
#include "msacm.h"
#include "avifile_private.h" #include "avifile_private.h"

1
reactos/dll/win32/avifil32/regsvr.c
View file

@ -28,7 +28,6 @@
#include "winreg.h" #include "winreg.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h"
#include "vfw.h" #include "vfw.h"
#include "avifile_private.h" #include "avifile_private.h"

5
reactos/dll/win32/avifil32/tmpfile.c
View file

@ -16,16 +16,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winnls.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h"
#include "vfw.h" #include "vfw.h"
#include "avifile_private.h" #include "avifile_private.h"
@ -71,7 +68,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;

4
reactos/dll/win32/avifil32/wavfile.c
View file

@ -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;