Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 18:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AVIFIL32]

Browse source 
* Move some inclusions to the main header.
* Extract the resource related definitions into resource.h and include it in both the main header and the resource file.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61347
This commit is contained in:
Amine Khaldi 2013-12-23 14:44:50 +00:00
parent bd5811d13b
commit 90c20950e8
37 changed files with 47 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,27 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <assert.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
//#include "winerror.h"
//#include "mmsystem.h"
#include <vfw.h>
//#include "msacm.h"
//#include "avifile_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#include "avifile_private.h"
/***********************************************************************/

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

@ -17,35 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winnls.h"
#include <wingdi.h>
//#include "winuser.h"
#include <winreg.h>
//#include "winerror.h"
//#include "ole2.h"
//#include "shellapi.h"
//#include "shlobj.h"
#include <vfw.h>
//#include "msacm.h"
#include "avifile_private.h"
#include <wine/debug.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#include <winreg.h>
/***********************************************************************
* for AVIBuildFilterW -- uses fixed size table

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

@ -30,30 +30,7 @@
* When index is missing it works, but index seems to be okay.
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <assert.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
//#include "winnls.h"
//#include "winerror.h"
//#include "mmsystem.h"
#include <vfw.h>
#include "avifile_private.h"
#include "extrachunk.h"
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#ifndef IDX_PER_BLOCK
#define IDX_PER_BLOCK 2730

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

@ -19,8 +19,29 @@
#ifndef __AVIFILE_PRIVATE_H
#define __AVIFILE_PRIVATE_H
//#include "windef.h"
//#include "winuser.h"
#include <assert.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <initguid.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <vfw.h>
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#include "extrachunk.h"
#include "resource.h"
#ifndef MAX_AVISTREAMS
#define MAX_AVISTREAMS 8
@ -36,22 +57,6 @@
(lp)->biClrUsed * sizeof(RGBQUAD))
#endif
#define IDD_SAVEOPTIONS 0x0100
#define IDC_INTERLEAVE 0x0110
#define IDC_INTERLEAVEEVERY 0x0111
#define IDC_STREAM 0x0112
#define IDC_OPTIONS 0x0113
#define IDC_FORMATTEXT 0x0114
#define IDS_WAVESTREAMFORMAT 0x0100
#define IDS_WAVEFILETYPE 0x0101
#define IDS_ALLMULTIMEDIA 0x0184
#define IDS_ALLFILES 0x0185
#define IDS_VIDEO 0x0189
#define IDS_AUDIO 0x0190
#define IDS_AVIFILETYPE 0x0192
#define IDS_UNCOMPRESSED 0x0193
DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0);
DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0);
DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0);

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

@ -16,28 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <assert.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <wingdi.h>
//#include "winerror.h"
//#include "mmsystem.h"
#include <vfw.h>
#include "avifile_private.h"
//#include "extrachunk.h"
#include <wine/debug.h>
#include <initguid.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
/***********************************************************************/

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

@ -16,21 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <assert.h>
#include "extrachunk.h"
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
#include <vfw.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#include "avifile_private.h"
/* reads a chunk out of the extrachunk-structure */
HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size)

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

@ -16,29 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
//#include "winerror.h"
#include <ole2.h>
#include <rpcproxy.h>
#include <initguid.h>
#include <vfw.h>
#include "avifile_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#include <rpcproxy.h>
HMODULE AVIFILE_hModule = NULL;

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

@ -16,24 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
#include <vfw.h>
#include "avifile_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#ifndef DIBPTR
#define DIBPTR(lp) ((LPBYTE)(lp) + (lp)->biSize + \
(lp)->biClrUsed * sizeof(RGBQUAD))

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

@ -16,27 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <assert.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
//#include "winerror.h"
//#include "mmsystem.h"
#include <vfw.h>
#include "avifile_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#define MAX_FRAMESIZE (16 * 1024 * 1024)
#define MAX_FRAMESIZE_DIFF 512

2
reactos/dll/win32/avifil32/lang/avifile_Bg.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Cs.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Da.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_De.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_En.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Es.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Fr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_He.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Hu.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_It.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Ja.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Ko.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Lt.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Nl.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_No.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Pl.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Pt.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Ro.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Ru.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Si.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Sv.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Tr.rc
View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Uk.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/avifil32/lang/avifile_Zh.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "avifile_private.h"
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
STRINGTABLE

17
reactos/dll/win32/avifil32/resource.h Normal file
View file

@ -0,0 +1,17 @@
#pragma once
#define IDD_SAVEOPTIONS 0x0100
#define IDC_INTERLEAVE 0x0110
#define IDC_INTERLEAVEEVERY 0x0111
#define IDC_STREAM 0x0112
#define IDC_OPTIONS 0x0113
#define IDC_FORMATTEXT 0x0114
#define IDS_WAVESTREAMFORMAT 0x0100
#define IDS_WAVEFILETYPE 0x0101
#define IDS_ALLMULTIMEDIA 0x0184
#define IDS_ALLFILES 0x0185
#define IDS_VIDEO 0x0189
#define IDS_AUDIO 0x0190
#define IDS_AVIFILETYPE 0x0192
#define IDS_UNCOMPRESSED 0x0193

5
reactos/dll/win32/avifil32/rsrc.rc
View file

@ -21,7 +21,7 @@
#include <windef.h>
#include <winuser.h>
//#include "avifile_private.h"
#include "resource.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@ -36,8 +36,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#define WINE_FILEVERSION_STR "4.03.1998"
#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
#include "wine/wine_common_ver.rc"
//#include "avifile_private.h"
#include <wine/wine_common_ver.rc>
/* UTF-8 */
#pragma code_page(65001)

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

@ -16,25 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
//#include "winerror.h"
#include <vfw.h>
//#include "avifile_private.h"
//#include "extrachunk.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#include "avifile_private.h"
/***********************************************************************/

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

@ -16,30 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <assert.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
//#include "winuser.h"
//#include "winnls.h"
//#include "winerror.h"
//#include "mmsystem.h"
#include <vfw.h>
//#include "msacm.h"
#include "avifile_private.h"
#include "extrachunk.h"
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
/***********************************************************************/