Signed-off-by: Nikolay Sivov <nsi...@codeweavers.com>
---
Duplicates already exist in wmcontainer.idl, which isn't and shouldn't be
imported from any other headers.
mingw-w64-headers/include/mfapi.h | 16 +++++++++
mingw-w64-headers/include/mfidl.idl | 43 ++++-------------------
mingw-w64-headers/include/mfreadwrite.idl | 4 +++
3 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/mingw-w64-headers/include/mfapi.h
b/mingw-w64-headers/include/mfapi.h
index fa41c971..6c49764c 100644
--- a/mingw-w64-headers/include/mfapi.h
+++ b/mingw-w64-headers/include/mfapi.h
@@ -147,6 +147,22 @@ extern "C" {
#endif
#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
+
+ #define MF_1_BYTE_ALIGNMENT 0x00000000
+ #define MF_2_BYTE_ALIGNMENT 0x00000001
+ #define MF_4_BYTE_ALIGNMENT 0x00000003
+ #define MF_8_BYTE_ALIGNMENT 0x00000007
+ #define MF_16_BYTE_ALIGNMENT 0x0000000F
+ #define MF_32_BYTE_ALIGNMENT 0x0000001F
+ #define MF_64_BYTE_ALIGNMENT 0x0000003F
+ #define MF_128_BYTE_ALIGNMENT 0x0000007F
+ #define MF_256_BYTE_ALIGNMENT 0x000000FF
+ #define MF_512_BYTE_ALIGNMENT 0x000001FF
+ #define MF_1024_BYTE_ALIGNMENT 0x000003FF
+ #define MF_2048_BYTE_ALIGNMENT 0x000007FF
+ #define MF_4096_BYTE_ALIGNMENT 0x00000FFF
+ #define MF_8192_BYTE_ALIGNMENT 0x00001FFF
+
STDAPI MFLockDXGIDeviceManager (UINT *pResetToken, IMFDXGIDeviceManager
**ppManager);
STDAPI MFUnlockDXGIDeviceManager (void);
STDAPI MFCreateDXGISurfaceBuffer (REFIID riid, IUnknown *punkSurface, UINT
uSubresourceIndex, WINBOOL fBottomUpWhenLinear, IMFMediaBuffer **ppBuffer);
diff --git a/mingw-w64-headers/include/mfidl.idl
b/mingw-w64-headers/include/mfidl.idl
index 1cfc44f4..9dcf51f4 100644
--- a/mingw-w64-headers/include/mfidl.idl
+++ b/mingw-w64-headers/include/mfidl.idl
@@ -311,11 +311,6 @@ typedef enum _MF_QUALITY_LEVEL
MF_NUM_QUALITY_LEVELS = 0x6
} MF_QUALITY_LEVEL;
-cpp_quote("typedef enum MF_SOURCE_READER_CONTROL_FLAG {")
-cpp_quote(" MF_SOURCE_READER_CONTROLF_DRAIN = 0x00000001")
-cpp_quote("} MF_SOURCE_READER_CONTROL_FLAG;")
-cpp_quote("")
-
typedef enum _MF_TOPOLOGY_RESOLUTION_STATUS_FLAGS
{
MF_TOPOLOGY_RESOLUTION_SUCCEEDED = 0x00000000,
@@ -338,12 +333,13 @@ typedef enum _MF_TOPONODE_FLUSH_MODE
} MF_TOPONODE_FLUSH_MODE;
cpp_quote("#if (WINVER >= 0x0601)")
-cpp_quote("")
-cpp_quote("typedef enum _MF_TRANSCODE_TOPOLOGY_MODE_FLAGS {")
-cpp_quote(" MF_TRANSCODE_TOPOLOGYMODE_SOFTWARE_ONLY = 0,")
-cpp_quote(" MF_TRANSCODE_TOPOLOGYMODE_HARDWARE_ALLOWED = 1")
-cpp_quote("} MF_TRANSCODE_TOPOLOGYMODE_FLAGS;")
-cpp_quote("")
+
+typedef enum _MF_TRANSCODE_TOPOLOGY_MODE_FLAGS
+{
+ MF_TRANSCODE_TOPOLOGYMODE_SOFTWARE_ONLY = 0,
+ MF_TRANSCODE_TOPOLOGYMODE_HARDWARE_ALLOWED = 1
+} MF_TRANSCODE_TOPOLOGYMODE_FLAGS;
+
cpp_quote("#endif")
typedef enum
@@ -353,12 +349,6 @@ typedef enum
MF_LICENSE_URL_TAMPERED
} MF_URL_TRUST_STATUS;
-cpp_quote("typedef enum MFASF_INDEXERFLAGS {")
-cpp_quote(" MFASF_INDEXER_WRITE_NEW_INDEX = 0x00000001,")
-cpp_quote(" MFASF_INDEXER_READ_FOR_REVERSEPLAYBACK = 0x00000004,")
-cpp_quote(" MFASF_INDEXER_WRITE_FOR_LIVEREAD = 0x00000008")
-cpp_quote("} MFASF_INDEXERFLAGS;")
-
typedef enum _MFCLOCK_RELATIONAL_FLAGS
{
MFCLOCK_RELATIONAL_FLAG_JITTER_NEVER_AHEAD = 0x1
@@ -494,14 +484,6 @@ typedef enum _MFSHUTDOWN_STATUS
MFSHUTDOWN_COMPLETED
} MFSHUTDOWN_STATUS;
-cpp_quote("typedef enum _MFSINK_WMDRMACTION {")
-cpp_quote(" MFSINK_WMDRMACTION_UNDEFINED = 0,")
-cpp_quote(" MFSINK_WMDRMACTION_ENCODE = 1,")
-cpp_quote(" MFSINK_WMDRMACTION_TRANSCODE = 2,")
-cpp_quote(" MFSINK_WMDRMACTION_TRANSCRYPT = 3,")
-cpp_quote(" MFSINK_WMDRMACTION_LAST = 3")
-cpp_quote("} MFSINK_WMDRMACTION;")
-
typedef enum MFSTREAMSINK_MARKER_TYPE
{
MFSTREAMSINK_MARKER_DEFAULT,
@@ -594,17 +576,6 @@ typedef struct _MFNetCredentialManagerGetParam
LONG nRetries;
} MFNetCredentialManagerGetParam;
-cpp_quote("#define MF_1_BYTE_ALIGNMENT 0x00000000")
-cpp_quote("#define MF_2_BYTE_ALIGNMENT 0x00000001")
-cpp_quote("#define MF_4_BYTE_ALIGNMENT 0x00000003")
-cpp_quote("#define MF_8_BYTE_ALIGNMENT 0x00000007")
-cpp_quote("#define MF_16_BYTE_ALIGNMENT 0x0000000F")
-cpp_quote("#define MF_32_BYTE_ALIGNMENT 0x0000001F")
-cpp_quote("#define MF_64_BYTE_ALIGNMENT 0x0000003F")
-cpp_quote("#define MF_128_BYTE_ALIGNMENT 0x0000007F")
-cpp_quote("#define MF_256_BYTE_ALIGNMENT 0x000000FF")
-cpp_quote("#define MF_512_BYTE_ALIGNMENT 0x000001FF")
-cpp_quote("")
cpp_quote("#define MEDIASINK_FIXED_STREAMS 0x00000001")
cpp_quote("#define MEDIASINK_CANNOT_MATCH_CLOCK 0x00000002")
cpp_quote("#define MEDIASINK_RATELESS 0x00000004")
diff --git a/mingw-w64-headers/include/mfreadwrite.idl
b/mingw-w64-headers/include/mfreadwrite.idl
index 163178ad..25b6d93e 100644
--- a/mingw-w64-headers/include/mfreadwrite.idl
+++ b/mingw-w64-headers/include/mfreadwrite.idl
@@ -14,6 +14,10 @@
cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8,
cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING,
0xfb394f3d,0xccf1,0x42ee,0xbb,0xb3,0xf9,0xb8,0x45,0xd5,0x68,0x1d);" )
cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN,
0x56b67165,0x219e,0x456d,0xa2,0x2e,0x2d,0x30,0x04,0xc7,0xfe,0x56);" )
+typedef [v1_enum] enum MF_SOURCE_READER_CONTROL_FLAG {
+ MF_SOURCE_READER_CONTROLF_DRAIN = 0x00000001,
+} MF_SOURCE_READER_CONTROL_FLAG;
+
typedef [v1_enum] enum MF_SOURCE_READER_FLAG {
MF_SOURCE_READERF_ERROR = 0x00000001,
MF_SOURCE_READERF_ENDOFSTREAM = 0x00000002,
--
2.25.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
