The ifdefs (that aren't within cpp_quote()) in the idl file aren't brought along as such, but are evaluated when widl interprets the file, which means the enclosed declarations are left out, and the ifdefs don't make it into the final header.
Signed-off-by: Martin Storsjö <[email protected]> --- mingw-w64-headers/include/mfobjects.h | 33 ++++++++++++++++++------- mingw-w64-headers/include/mfobjects.idl | 6 ----- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/mingw-w64-headers/include/mfobjects.h b/mingw-w64-headers/include/mfobjects.h index f11afc136..e77b626a8 100644 --- a/mingw-w64-headers/include/mfobjects.h +++ b/mingw-w64-headers/include/mfobjects.h @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 4.12.1 from include/mfobjects.idl - Do not edit ***/ +/*** Autogenerated by WIDL 5.0-rc1 from include/mfobjects.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -245,7 +245,7 @@ typedef struct tWAVEFORMATEX { typedef struct tWAVEFORMATEX *PWAVEFORMATEX; typedef struct tWAVEFORMATEX *NPWAVEFORMATEX; typedef struct tWAVEFORMATEX *LPWAVEFORMATEX; -typedef struct __WIDL_mfobjects_generated_name_00000013 { +typedef struct __WIDL_mfobjects_generated_name_00000027 { WORD wFormatTag; WORD nChannels; DWORD nSamplesPerSec; @@ -257,7 +257,7 @@ typedef struct __WIDL_mfobjects_generated_name_00000013 { DWORD dwChannelMask; GUID SubFormat; } WAVEFORMATEXTENSIBLE; -typedef struct __WIDL_mfobjects_generated_name_00000013 *PWAVEFORMATEXTENSIBLE; +typedef struct __WIDL_mfobjects_generated_name_00000027 *PWAVEFORMATEXTENSIBLE; #endif #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) @@ -2620,7 +2620,7 @@ static FORCEINLINE const WAVEFORMATEX * IMFAudioMediaType_GetAudioFormat(IMFAudi #ifndef _WINGDI_ typedef DWORD RGBQUAD; -typedef struct __WIDL_mfobjects_generated_name_00000014 { +typedef struct __WIDL_mfobjects_generated_name_00000028 { DWORD biSize; LONG biWidth; LONG biHeight; @@ -2634,13 +2634,13 @@ typedef struct __WIDL_mfobjects_generated_name_00000014 { DWORD biClrImportant; } BITMAPINFOHEADER; -typedef struct __WIDL_mfobjects_generated_name_00000015 { +typedef struct __WIDL_mfobjects_generated_name_00000029 { BITMAPINFOHEADER bmiHeader; RGBQUAD bmiColors[1]; } BITMAPINFO; #endif -typedef struct __WIDL_mfobjects_generated_name_00000016 { +typedef struct __WIDL_mfobjects_generated_name_0000002A { GUID guidMajorType; GUID guidSubtype; } MFT_REGISTER_TYPE_INFO; @@ -3696,6 +3696,13 @@ enum { MEAudioSessionDisconnected = 320, MEAudioSessionExclusiveModeOverride = 321, MESinkV1Anchor = MEAudioSessionExclusiveModeOverride, + MECaptureAudioSessionVolumeChanged = 322, + MECaptureAudioSessionDeviceRemoved = 323, + MECaptureAudioSessionFormatChanged = 324, + MECaptureAudioSessionDisconnected = 325, + MECaptureAudioSessionExclusiveModeOverride = 326, + MECaptureAudioSessionServerShutdown = 327, + MESinkV2Anchor = MECaptureAudioSessionServerShutdown, METrustUnknown = 400, MEPolicyChanged = 401, MEContentProtectionMessage = 402, @@ -3712,6 +3719,14 @@ enum { MEWMDRMLicenseStoreCleaned = 515, MEWMDRMRevocationDownloadCompleted = 516, MEWMDRMV1Anchor = MEWMDRMRevocationDownloadCompleted, + METransformUnknown = 600, + METransformNeedInput = 601, + METransformHaveOutput = 602, + METransformDrainComplete = 603, + METransformMarker = 604, + MEByteStreamCharacteristicsChanged = 700, + MEVideoCaptureDeviceRemoved = 800, + MEVideoCaptureDevicePreempted = 801, MEReservedMax = 10000 }; @@ -4814,13 +4829,13 @@ static FORCEINLINE HRESULT IMFByteStreamProxyClassFactory_CreateByteStreamProxy( #endif /* __IMFByteStreamProxyClassFactory_INTERFACE_DEFINED__ */ -typedef enum __WIDL_mfobjects_generated_name_00000017 { +typedef enum __WIDL_mfobjects_generated_name_0000002B { MF_ACCESSMODE_READ = 1, MF_ACCESSMODE_WRITE = 2, MF_ACCESSMODE_READWRITE = 3 } MF_FILE_ACCESSMODE; -typedef enum __WIDL_mfobjects_generated_name_00000018 { +typedef enum __WIDL_mfobjects_generated_name_0000002C { MF_OPENMODE_FAIL_IF_NOT_EXIST = 0, MF_OPENMODE_FAIL_IF_EXIST = 1, MF_OPENMODE_RESET_IF_EXIST = 2, @@ -4828,7 +4843,7 @@ typedef enum __WIDL_mfobjects_generated_name_00000018 { MF_OPENMODE_DELETE_IF_EXIST = 4 } MF_FILE_OPENMODE; -typedef enum __WIDL_mfobjects_generated_name_00000019 { +typedef enum __WIDL_mfobjects_generated_name_0000002D { MF_FILEFLAGS_NONE = 0x0, MF_FILEFLAGS_NOBUFFERING = 0x1 } MF_FILE_FLAGS; diff --git a/mingw-w64-headers/include/mfobjects.idl b/mingw-w64-headers/include/mfobjects.idl index 82462ff4c..29caf1944 100644 --- a/mingw-w64-headers/include/mfobjects.idl +++ b/mingw-w64-headers/include/mfobjects.idl @@ -582,7 +582,6 @@ enum { MEAudioSessionDisconnected = 320, MEAudioSessionExclusiveModeOverride = 321, MESinkV1Anchor = MEAudioSessionExclusiveModeOverride, -#if WINVER >= 0x0602 MECaptureAudioSessionVolumeChanged = 322, MECaptureAudioSessionDeviceRemoved = 323, MECaptureAudioSessionFormatChanged = 324, @@ -590,7 +589,6 @@ enum { MECaptureAudioSessionExclusiveModeOverride = 326, MECaptureAudioSessionServerShutdown = 327, MESinkV2Anchor = MECaptureAudioSessionServerShutdown, -#endif METrustUnknown = 400, MEPolicyChanged = 401, MEContentProtectionMessage = 402, @@ -607,18 +605,14 @@ enum { MEWMDRMLicenseStoreCleaned = 515, MEWMDRMRevocationDownloadCompleted = 516, MEWMDRMV1Anchor = MEWMDRMRevocationDownloadCompleted, -#if WINVER >= 0x0601 METransformUnknown = 600, METransformNeedInput, METransformHaveOutput, METransformDrainComplete, METransformMarker, -#endif -#if WINVER >= 0x0602 MEByteStreamCharacteristicsChanged = 700, MEVideoCaptureDeviceRemoved = 800, MEVideoCaptureDevicePreempted = 801, -#endif MEReservedMax = 10000 }; -- 2.17.1 _______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
