mfobjects.idl: Added new file.

include/Makefile.in

@@ -65,6 +65,7 @@ PUBLIC_IDL_H_SRCS = \
 	inspectable.idl \
 	mediaobj.idl \
 	metahost.idl \
+	mfobjects.idl \
 	mimeinfo.idl \
 	mimeole.idl \
 	mlang.idl \

include/mfapi.h

@@ -19,15 +19,14 @@
 #ifndef __WINE_MFAPI_H
 #define __WINE_MFAPI_H
 
+#include <mfobjects.h>
+#include <mmreg.h>
+#include <avrt.h>
+
 #define MFSTARTUP_NOSOCKET 0x1
 #define MFSTARTUP_LITE     (MFSTARTUP_NOSOCKET)
 #define MFSTARTUP_FULL     0
 
-typedef struct _MFT_REGISTER_TYPE_INFO {
-  GUID guidMajorType;
-  GUID guidSubtype;
-} MFT_REGISTER_TYPE_INFO;
-
 typedef unsigned __int64 MFWORKITEM_KEY;
 
 HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key);
@@ -36,5 +35,6 @@ HRESULT WINAPI MFLockPlatform(void);
 HRESULT WINAPI MFShutdown(void);
 HRESULT WINAPI MFStartup(ULONG version, DWORD flags);
 HRESULT WINAPI MFUnlockPlatform(void);
+HRESULT WINAPI MFGetPluginControl(IMFPluginControl**);
 
 #endif /* __WINE_MFAPI_H */

include/mmreg.h

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WIDL__
+
 #ifndef __WINE_MMREG_H
 #define __WINE_MMREG_H
 
@@ -509,3 +511,37 @@ typedef struct tagEXBMINFOHEADER {
 #endif
 
 #endif /* __WINE_MMREG_H */
+
+#else /* __WIDL__ */
+
+cpp_quote("#if 0")
+#pragma pack(push, 1)
+
+typedef struct tWAVEFORMATEX {
+    WORD wFormatTag;
+    WORD nChannels;
+    DWORD nSamplesPerSec;
+    DWORD nAvgBytesPerSec;
+    WORD nBlockAlign;
+    WORD wBitsPerSample;
+    WORD cbSize;
+    [size_is(cbSize)] BYTE pExtraBytes[];
+} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
+
+typedef struct {
+    WORD wFormatTag;
+    WORD nChannels;
+    DWORD nSamplesPerSec;
+    DWORD nAvgBytesPerSec;
+    WORD nBlockAlign;
+    WORD wBitsPerSample;
+    WORD cbSize;
+    WORD wValidBitsPerSample;
+    DWORD dwChannelMask;
+    GUID SubFormat;
+} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
+
+#pragma pack(pop)
+cpp_quote("#endif")
+
+#endif /* __WIDL__ */