[AVIFIL32]

* Improve the GUIDs situation.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61738
This commit is contained in:
Amine Khaldi 2014-01-20 13:18:32 +00:00
parent 3f75b028f8
commit 8fc7ff7770
4 changed files with 9 additions and 15 deletions

View file

@ -33,14 +33,14 @@
#include <wingdi.h> #include <wingdi.h>
#include <vfw.h> #include <vfw.h>
#include <wine/unicode.h>
#include <wine/debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile); #include <wine/unicode.h>
#include "extrachunk.h" #include "extrachunk.h"
#include "resource.h" #include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#ifndef MAX_AVISTREAMS #ifndef MAX_AVISTREAMS
#define MAX_AVISTREAMS 8 #define MAX_AVISTREAMS 8
#endif #endif
@ -71,4 +71,4 @@ extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStr
extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN;
#endif #endif /* __AVIFILE_PRIVATE_H */

View file

@ -18,8 +18,6 @@
#include "avifile_private.h" #include "avifile_private.h"
#include <initguid.h>
/***********************************************************************/ /***********************************************************************/
/* internal interface to get access to table of stream in an editable stream */ /* internal interface to get access to table of stream in an editable stream */

View file

@ -19,14 +19,6 @@
#ifndef __WINE_EXTRACHUNK_H #ifndef __WINE_EXTRACHUNK_H
#define __WINE_EXTRACHUNK_H #define __WINE_EXTRACHUNK_H
#define WIN32_NO_STATUS
#include <stdarg.h>
#include <windef.h>
//#include "winbase.h"
#include <mmsystem.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -54,4 +46,4 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,
} }
#endif #endif
#endif #endif /* __WINE_EXTRACHUNK_H */

View file

@ -12,6 +12,10 @@
#include <initguid.h> #include <initguid.h>
#include <vfw.h> #include <vfw.h>
/* editstream.c */
DEFINE_AVIGUID(IID_IEditStreamInternal, 0x0002000A,0,0);
/* avifile_private.h */
DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0);
DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0);
DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0);