[akhaldi] 61738: [AVIFIL32] * Improve the GUIDs situation. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Jan 20 13:18:32 2014
New Revision: 61738

URL: http://svn.reactos.org/svn/reactos?rev=61738&view=rev
Log:
[AVIFIL32]
* Improve the GUIDs situation.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/win32/avifil32/avifile_private.h
    trunk/reactos/dll/win32/avifil32/editstream.c
    trunk/reactos/dll/win32/avifil32/extrachunk.h
    trunk/reactos/dll/win32/avifil32/guid.c

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 Jan 20 13:18:32 2014
@@ -33,13 +33,13 @@
 #include <wingdi.h>
 #include <vfw.h>

+#include <wine/debug.h>
 #include <wine/unicode.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);

#include "extrachunk.h"
 #include "resource.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);

#ifndef MAX_AVISTREAMS
 #define MAX_AVISTREAMS 8
@@ -71,4 +71,4 @@

extern LPCWSTR  AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN;

-#endif
+#endif /* __AVIFILE_PRIVATE_H */

Modified: trunk/reactos/dll/win32/avifil32/editstream.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstre...
==============================================================================
--- trunk/reactos/dll/win32/avifil32/editstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/editstream.c	[iso-8859-1] Mon Jan 20 13:18:32 2014
@@ -17,8 +17,6 @@
  */

#include "avifile_private.h"
-
-#include <initguid.h>

/***********************************************************************/

Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrachu...
==============================================================================
--- trunk/reactos/dll/win32/avifil32/extrachunk.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/extrachunk.h	[iso-8859-1] Mon Jan 20 13:18:32 2014
@@ -18,14 +18,6 @@

#ifndef __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
 extern "C" {
@@ -54,4 +46,4 @@
 }
 #endif

-#endif
+#endif /* __WINE_EXTRACHUNK_H */

Modified: trunk/reactos/dll/win32/avifil32/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/guid.c?r...
==============================================================================
--- trunk/reactos/dll/win32/avifil32/guid.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/guid.c	[iso-8859-1] Mon Jan 20 13:18:32 2014
@@ -12,6 +12,10 @@
 #include <initguid.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_WAVFile,   0x00020003, 0, 0);
 DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0);