[AVIFIL32]

* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61402

diff --git a/reactos/dll/win32/avifil32/CMakeLists.txt b/reactos/dll/win32/avifil32/CMakeLists.txt
index c85f4ac..e209684 100644 (file)
--- a/reactos/dll/win32/avifil32/CMakeLists.txt
+++ b/reactos/dll/win32/avifil32/CMakeLists.txt
@@ -17,10 +17,11 @@ add_library(avifil32 SHARED
     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)

diff --git a/reactos/dll/win32/avifil32/avifile_private.h b/reactos/dll/win32/avifil32/avifile_private.h
index 0c44b4b..c1ee945 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile_private.h
+++ b/reactos/dll/win32/avifil32/avifile_private.h
@@ -28,8 +28,6 @@
 
 #define COBJMACROS
 
-#include <initguid.h>
-
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>

diff --git a/reactos/dll/win32/avifil32/editstream.c b/reactos/dll/win32/avifil32/editstream.c
index 7ae56fe..023a4d4 100644 (file)
--- a/reactos/dll/win32/avifil32/editstream.c
+++ b/reactos/dll/win32/avifil32/editstream.c
@@ -18,6 +18,8 @@
 
 #include "avifile_private.h"
 
+#include <initguid.h>
+
 /***********************************************************************/
 
 /* internal interface to get access to table of stream in an editable stream */

diff --git a/reactos/dll/win32/avifil32/guid.c b/reactos/dll/win32/avifil32/guid.c
new file mode 100644 (file)
index 0000000..af5aba7
--- /dev/null
+++ b/reactos/dll/win32/avifil32/guid.c
@@ -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 */