[ros-diffs] [akhaldi] 61402: [AVIFIL32] * Improve the GUIDs situation. CORE-7716

Author: akhaldi
Date: Wed Dec 25 13:27:32 2013
New Revision: 61402

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

Added:
    trunk/reactos/dll/win32/avifil32/guid.c   (with props)
Modified:
    trunk/reactos/dll/win32/avifil32/CMakeLists.txt
    trunk/reactos/dll/win32/avifil32/avifile_private.h
    trunk/reactos/dll/win32/avifil32/editstream.c

Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLis...
==============================================================================
--- trunk/reactos/dll/win32/avifil32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/avifil32/CMakeLists.txt	[iso-8859-1] Wed Dec 25 13:27:32 2013
@@ -17,10 +17,11 @@
     icmstream.c
     tmpfile.c
     wavfile.c
+    guid.c
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def)

set_module_type(avifil32 win32dll)
-target_link_libraries(avifil32 uuid wine)
+target_link_libraries(avifil32 wine)
 add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all)

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] Wed Dec 25 13:27:32 2013
@@ -27,8 +27,6 @@
 #define COM_NO_WINDOWS_H

#define COBJMACROS
-
-#include <initguid.h>

#include <windef.h>
 #include <winbase.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] Wed Dec 25 13:27:32 2013
@@ -17,6 +17,8 @@
  */

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

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

Added: 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	(added)
+++ trunk/reactos/dll/win32/avifil32/guid.c	[iso-8859-1] Wed Dec 25 13:27:32 2013
@@ -0,0 +1,19 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <initguid.h>
+#include <vfw.h>
+
+DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0);
+DEFINE_AVIGUID(CLSID_WAVFile,   0x00020003, 0, 0);
+DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0);
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Propchange: trunk/reactos/dll/win32/avifil32/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native