Michael Stefaniuc : avifil32: Move the IAVIStream vtbl to avoid forward declarations.
Alexandre Julliard
julliard at winehq.org
Tue Sep 3 13:38:03 CDT 2013
Module: wine
Branch: master
Commit: 11b21f70ab9032dd9990227f413292cadb39189d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b21f70ab9032dd9990227f413292cadb39189d
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Sep 2 22:22:50 2013 +0200
avifil32: Move the IAVIStream vtbl to avoid forward declarations.
---
dlls/avifil32/avifile.c | 50 ++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 854d490..2711ba4 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -55,38 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#define IDX_PER_BLOCK 2730
#endif
-static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj);
-static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface);
-static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface);
-static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2);
-static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size);
-static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags);
-static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize);
-static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize);
-static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread);
-static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten);
-static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples);
-static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread);
-static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size);
-static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen);
-
-static const struct IAVIStreamVtbl avist_vt = {
- IAVIStream_fnQueryInterface,
- IAVIStream_fnAddRef,
- IAVIStream_fnRelease,
- IAVIStream_fnCreate,
- IAVIStream_fnInfo,
- IAVIStream_fnFindSample,
- IAVIStream_fnReadFormat,
- IAVIStream_fnSetFormat,
- IAVIStream_fnRead,
- IAVIStream_fnWrite,
- IAVIStream_fnDelete,
- IAVIStream_fnReadData,
- IAVIStream_fnWriteData,
- IAVIStream_fnSetInfo
-};
-
typedef struct _IAVIFileImpl IAVIFileImpl;
typedef struct _IAVIStreamImpl {
@@ -1346,7 +1314,23 @@ static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, AVISTREAMINFOW *in
return E_FAIL;
}
-/***********************************************************************/
+static const struct IAVIStreamVtbl avist_vt = {
+ IAVIStream_fnQueryInterface,
+ IAVIStream_fnAddRef,
+ IAVIStream_fnRelease,
+ IAVIStream_fnCreate,
+ IAVIStream_fnInfo,
+ IAVIStream_fnFindSample,
+ IAVIStream_fnReadFormat,
+ IAVIStream_fnSetFormat,
+ IAVIStream_fnRead,
+ IAVIStream_fnWrite,
+ IAVIStream_fnDelete,
+ IAVIStream_fnReadData,
+ IAVIStream_fnWriteData,
+ IAVIStream_fnSetInfo
+};
+
static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DWORD offset, DWORD flags)
{
More information about the wine-cvs
mailing list