[akhaldi] 61347: [AVIFIL32] * 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...

Author: akhaldi
Date: Mon Dec 23 14:44:50 2013
New Revision: 61347

URL: http://svn.reactos.org/svn/reactos?rev=61347&view=rev
Log:
[AVIFIL32]
* 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

Added:
    trunk/reactos/dll/win32/avifil32/resource.h   (with props)
Modified:
    trunk/reactos/dll/win32/avifil32/acmstream.c
    trunk/reactos/dll/win32/avifil32/api.c
    trunk/reactos/dll/win32/avifil32/avifile.c
    trunk/reactos/dll/win32/avifil32/avifile_private.h
    trunk/reactos/dll/win32/avifil32/editstream.c
    trunk/reactos/dll/win32/avifil32/extrachunk.c
    trunk/reactos/dll/win32/avifil32/factory.c
    trunk/reactos/dll/win32/avifil32/getframe.c
    trunk/reactos/dll/win32/avifil32/icmstream.c
    trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc
    trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc
    trunk/reactos/dll/win32/avifil32/rsrc.rc
    trunk/reactos/dll/win32/avifil32/tmpfile.c
    trunk/reactos/dll/win32/avifil32/wavfile.c

Modified: trunk/reactos/dll/win32/avifil32/acmstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/acmstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/acmstream.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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"
 
 /***********************************************************************/
 

Modified: trunk/reactos/dll/win32/avifil32/api.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/api.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/api.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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 "avifile_private.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);
-
 
 /***********************************************************************
  * for AVIBuildFilterW -- uses fixed size table

Modified: trunk/reactos/dll/win32/avifil32/avifile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/avifile.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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

Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/avifile_private.h	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -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
@@ -35,22 +56,6 @@
 #define DIBPTR(lp)      ((LPBYTE)(lp) + (lp)->biSize + \
                          (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);

Modified: trunk/reactos/dll/win32/avifil32/editstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/editstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/editstream.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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);
 
 /***********************************************************************/
 

Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/extrachunk.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/extrachunk.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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)

Modified: trunk/reactos/dll/win32/avifil32/factory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/factory.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/factory.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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 "avifile_private.h"
+
 #include <rpcproxy.h>
-
-#include <initguid.h>
-#include <vfw.h>
-#include "avifile_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 HMODULE AVIFILE_hModule   = NULL;
 

Modified: trunk/reactos/dll/win32/avifil32/getframe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/getframe.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/getframe.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -16,23 +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 <vfw.h>
-
 #include "avifile_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 #ifndef DIBPTR
 #define DIBPTR(lp)      ((LPBYTE)(lp) + (lp)->biSize + \

Modified: trunk/reactos/dll/win32/avifil32/icmstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/icmstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/icmstream.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -16,26 +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 "avifile_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 #define MAX_FRAMESIZE       (16 * 1024 * 1024)
 #define MAX_FRAMESIZE_DIFF  512

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Bg.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Cs.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Da.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_De.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_En.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Es.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Fr.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_He.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Hu.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_It.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ja.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ko.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Lt.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Nl.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_No.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Pl.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Pt.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ro.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Ru.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Si.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Sv.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Uk.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/lang/avifile_Zh.rc	[iso-8859-1] Mon Dec 23 14:44:50
2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "avifile_private.h"
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 

Added: trunk/reactos/dll/win32/avifil32/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/resourc…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/resource.h	(added)
+++ trunk/reactos/dll/win32/avifil32/resource.h	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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

Propchange: trunk/reactos/dll/win32/avifil32/resource.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/rsrc.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/rsrc.rc	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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 @@
 #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)

Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/tmpfile.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/tmpfile.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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"
 
 /***********************************************************************/
 

Modified: trunk/reactos/dll/win32/avifil32/wavfile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile…
==============================================================================
--- trunk/reactos/dll/win32/avifil32/wavfile.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/wavfile.c	[iso-8859-1] Mon Dec 23 14:44:50 2013
@@ -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);
 
 /***********************************************************************/