Use widl to generate some of direct-x IDL-based headers git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4887 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
index a76c6e2..fc8dfd4 100644
--- a/mingw-w64-headers/Makefile.am
+++ b/mingw-w64-headers/Makefile.am

@@ -62,12 +62,19 @@
   include/shtypes.idl \
   include/textstor.idl \
   include/unknwn.idl \
-  include/wtypes.idl
+  include/wtypes.idl \
+  direct-x/include/amvideo.idl \
+  direct-x/include/austream.idl \
+  direct-x/include/ddstream.idl \
+  direct-x/include/dmodshow.idl \
+  direct-x/include/mediaobj.idl \
+  direct-x/include/mmstream.idl \
+  direct-x/include/vmr9.idl
 
 BUILT_SOURCES += $(IDL_SRCS:.idl=.h)
 
 .idl.h: crt/_mingw.h
-	$(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -Icrt -I$(srcdir)/crt -h -o $(srcdir)/$@ $<
+	$(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -I$(srcdir)/direct-x/include -Icrt -I$(srcdir)/crt -h -o $(srcdir)/$@ $<
 
 endif
 

diff --git a/mingw-w64-headers/Makefile.in b/mingw-w64-headers/Makefile.in
index 91e63ca..0f347ca 100644
--- a/mingw-w64-headers/Makefile.in
+++ b/mingw-w64-headers/Makefile.in

@@ -251,7 +251,14 @@
 @HAVE_WIDL_TRUE@  include/shtypes.idl \
 @HAVE_WIDL_TRUE@  include/textstor.idl \
 @HAVE_WIDL_TRUE@  include/unknwn.idl \
-@HAVE_WIDL_TRUE@  include/wtypes.idl
+@HAVE_WIDL_TRUE@  include/wtypes.idl \
+@HAVE_WIDL_TRUE@  direct-x/include/amvideo.idl \
+@HAVE_WIDL_TRUE@  direct-x/include/austream.idl \
+@HAVE_WIDL_TRUE@  direct-x/include/ddstream.idl \
+@HAVE_WIDL_TRUE@  direct-x/include/dmodshow.idl \
+@HAVE_WIDL_TRUE@  direct-x/include/mediaobj.idl \
+@HAVE_WIDL_TRUE@  direct-x/include/mmstream.idl \
+@HAVE_WIDL_TRUE@  direct-x/include/vmr9.idl
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -874,7 +881,7 @@
 
 
 @HAVE_WIDL_TRUE@.idl.h: crt/_mingw.h
-@HAVE_WIDL_TRUE@	$(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -Icrt -I$(srcdir)/crt -h -o $(srcdir)/$@ $<
+@HAVE_WIDL_TRUE@	$(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -I$(srcdir)/direct-x/include -Icrt -I$(srcdir)/crt -h -o $(srcdir)/$@ $<
 
 _mingw_directx.h: $(srcdir)/crt/sdks/_mingw_directx.h.in
 	$(SED) s/MINGW_HAS_DX$$/@MINGW_HAS_DX@/ $< > $@

diff --git a/mingw-w64-headers/direct-x/include/amvideo.h b/mingw-w64-headers/direct-x/include/amvideo.h
index 2b2c490..c0e463d 100644
--- a/mingw-w64-headers/direct-x/include/amvideo.h
+++ b/mingw-w64-headers/direct-x/include/amvideo.h

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL from amvideo.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from direct-x/include/amvideo.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475

diff --git a/mingw-w64-headers/direct-x/include/austream.h b/mingw-w64-headers/direct-x/include/austream.h
index 272210f..b1e0835 100644
--- a/mingw-w64-headers/direct-x/include/austream.h
+++ b/mingw-w64-headers/direct-x/include/austream.h

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL from austream.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from direct-x/include/austream.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475

diff --git a/mingw-w64-headers/direct-x/include/ddstream.h b/mingw-w64-headers/direct-x/include/ddstream.h
index cb906f1..94a8971 100644
--- a/mingw-w64-headers/direct-x/include/ddstream.h
+++ b/mingw-w64-headers/direct-x/include/ddstream.h

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL from ddstream.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from direct-x/include/ddstream.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475

diff --git a/mingw-w64-headers/direct-x/include/dmodshow.h b/mingw-w64-headers/direct-x/include/dmodshow.h
index e1a399e..58f81c0 100644
--- a/mingw-w64-headers/direct-x/include/dmodshow.h
+++ b/mingw-w64-headers/direct-x/include/dmodshow.h

@@ -1,18 +1,19 @@
-/*** Autogenerated by WIDL 1.1.44 from dmodshow.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from direct-x/include/dmodshow.idl - Do not edit ***/
+
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif
 
 #include <rpc.h>
 #include <rpcndr.h>
 
-#ifndef __WIDL_DMODSHOW_H
-#define __WIDL_DMODSHOW_H
-
-#ifdef __cplusplus
-extern "C" {
+#ifndef COM_NO_WINDOWS_H
+#include <windows.h>
+#include <ole2.h>
 #endif
 
-/* Headers for imported files */
-
-#include <unknwn.h>
+#ifndef __WIDL_DMODSHOW_H
+#define __WIDL_DMODSHOW_H
 
 /* Forward declarations */
 
@@ -21,6 +22,13 @@
 typedef interface IDMOWrapperFilter IDMOWrapperFilter;
 #endif
 
+/* Headers for imported files */
+
+#include <unknwn.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 DEFINE_GUID(CLSID_DMOWrapperFilter,  0x94297043, 0xbd82, 0x4dfd, 0xb0, 0xde, 0x81, 0x77, 0x73, 0x9c, 0x6d, 0x20);
 /*****************************************************************************
@@ -31,13 +39,17 @@
 
 DEFINE_GUID(IID_IDMOWrapperFilter, 0x52d6f586, 0x9f0f, 0x4824, 0x8f,0xc8, 0xe3,0x2c,0xa0,0x49,0x30,0xc2);
 #if defined(__cplusplus) && !defined(CINTERFACE)
-interface IDMOWrapperFilter : public IUnknown
+MIDL_INTERFACE("52d6f586-9f0f-4824-8fc8-e32ca04930c2")
+IDMOWrapperFilter : public IUnknown
 {
     virtual HRESULT STDMETHODCALLTYPE Init(
         REFCLSID clsidDMO,
         REFCLSID catDMO) = 0;
 
 };
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IDMOWrapperFilter, 0x52d6f586, 0x9f0f, 0x4824, 0x8f,0xc8, 0xe3,0x2c,0xa0,0x49,0x30,0xc2)
+#endif
 #else
 typedef struct IDMOWrapperFilterVtbl {
     BEGIN_INTERFACE

diff --git a/mingw-w64-headers/direct-x/include/mediaobj.h b/mingw-w64-headers/direct-x/include/mediaobj.h
index 7f111b9..ea689b9 100644
--- a/mingw-w64-headers/direct-x/include/mediaobj.h
+++ b/mingw-w64-headers/direct-x/include/mediaobj.h

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL from mediaobj.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from direct-x/include/mediaobj.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475

diff --git a/mingw-w64-headers/direct-x/include/mmstream.h b/mingw-w64-headers/direct-x/include/mmstream.h
index 926061d..f630647 100644
--- a/mingw-w64-headers/direct-x/include/mmstream.h
+++ b/mingw-w64-headers/direct-x/include/mmstream.h

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL from mmstream.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from direct-x/include/mmstream.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475

diff --git a/mingw-w64-headers/direct-x/include/vmr9.h b/mingw-w64-headers/direct-x/include/vmr9.h
index e2fe787..b920594 100644
--- a/mingw-w64-headers/direct-x/include/vmr9.h
+++ b/mingw-w64-headers/direct-x/include/vmr9.h

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL from vmr9.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from direct-x/include/vmr9.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475