[Mingw-w64-public] [PATCH] headers: fix mpeg2data.h methods orders

[Steve L. <ro...@yc...>]

Checked against https://github.com/microsoft/win32metadata/blob/main/generation/WinSDK/RecompiledIdlHeaders/um/mpeg2data.h

This could be generated from a .idl.
---
 mingw-w64-headers/include/mpeg2data.h | 31 +++++++--------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/mingw-w64-headers/include/mpeg2data.h b/mingw-w64-headers/include/mpeg2data.h
index caf985623..e4cb85a9e 100644
--- a/mingw-w64-headers/include/mpeg2data.h
+++ b/mingw-w64-headers/include/mpeg2data.h
@@ -35,11 +35,6 @@ typedef struct IMpeg2Stream IMpeg2Stream;
 
 #undef  INTERFACE
 #define INTERFACE ISectionList
-#ifdef __GNUC__
-#warning COM interfaces layout in this header has not been verified.
-#warning COM interfaces with incorrect layout may not work at all.
-__MINGW_BROKEN_INTERFACE(INTERFACE)
-#endif
 DECLARE_INTERFACE_(ISectionList,IUnknown)
 {
     BEGIN_INTERFACE
@@ -50,13 +45,13 @@ DECLARE_INTERFACE_(ISectionList,IUnknown)
     STDMETHOD_(ULONG, Release)(THIS) PURE;
 
     /* ISectionList methods */
+    STDMETHOD_(HRESULT,Initialize)(THIS_ MPEG_REQUEST_TYPE requestType,IMpeg2Data *pMpeg2Data,PMPEG_CONTEXT pContext,PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD timeout,HANDLE hDoneEvent) PURE;
+    STDMETHOD_(HRESULT,InitializeWithRawSections)(THIS_ PMPEG_PACKET_LIST pmplSections) PURE;
     STDMETHOD_(HRESULT,CancelPendingRequest)(THIS) PURE;
     STDMETHOD_(HRESULT,GetNumberOfSections)(THIS_ WORD *pCount) PURE;
-    STDMETHOD_(HRESULT,GetProgramIdentifier)(THIS_ PID *pPid) PURE;
     STDMETHOD_(HRESULT,GetSectionData)(THIS_ WORD sectionNumber,DWORD *pdwRawPacketLength,PSECTION *ppSection) PURE;
+    STDMETHOD_(HRESULT,GetProgramIdentifier)(THIS_ PID *pPid) PURE;
     STDMETHOD_(HRESULT,GetTableIdentifier)(THIS_ TID *pTableId) PURE;
-    STDMETHOD_(HRESULT,Initialize)(THIS_ MPEG_REQUEST_TYPE requestType,IMpeg2Data *pMpeg2Data,PMPEG_CONTEXT pContext,PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD timeout,HANDLE hDoneEvent) PURE;
-    STDMETHOD_(HRESULT,InitializeWithRawSections)(THIS_ PMPEG_PACKET_LIST pmplSections) PURE;
 
     END_INTERFACE
 };
@@ -64,22 +59,17 @@ DECLARE_INTERFACE_(ISectionList,IUnknown)
 #define ISectionList_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
 #define ISectionList_AddRef(This) (This)->lpVtbl->AddRef(This)
 #define ISectionList_Release(This) (This)->lpVtbl->Release(This)
+#define ISectionList_Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent) (This)->lpVtbl->Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent)
+#define ISectionList_InitializeWithRawSections(This,pmplSections) (This)->lpVtbl->InitializeWithRawSections(This,pmplSections)
 #define ISectionList_CancelPendingRequest() (This)->lpVtbl->CancelPendingRequest(This)
 #define ISectionList_GetNumberOfSections(This,pCount) (This)->lpVtbl->GetNumberOfSections(This,pCount)
-#define ISectionList_GetProgramIdentifier(This,pPid) (This)->lpVtbl->GetProgramIdentifier(This,pPid)
 #define ISectionList_GetSectionData(This,sectionNumber,pdwRawPacketLength,ppSection) (This)->lpVtbl->GetSectionData(This,sectionNumber,pdwRawPacketLength,ppSection)
+#define ISectionList_GetProgramIdentifier(This,pPid) (This)->lpVtbl->GetProgramIdentifier(This,pPid)
 #define ISectionList_GetTableIdentifier(This,pTableId) (This)->lpVtbl->GetTableIdentifier(This,pTableId)
-#define ISectionList_Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent) (This)->lpVtbl->Initialize(This,requestType,pMpeg2Data,pContext,pid,tid,pFilter,timeout,hDoneEvent)
-#define ISectionList_InitializeWithRawSections(This,pmplSections) (This)->lpVtbl->InitializeWithRawSections(This,pmplSections)
 #endif /*COBJMACROS*/
 
 #undef  INTERFACE
 #define INTERFACE IMpeg2Data
-#ifdef __GNUC__
-#warning COM interfaces layout in this header has not been verified.
-#warning COM interfaces with incorrect layout may not work at all.
-__MINGW_BROKEN_INTERFACE(INTERFACE)
-#endif
 DECLARE_INTERFACE_(IMpeg2Data,IUnknown)
 {
     BEGIN_INTERFACE
@@ -91,8 +81,8 @@ DECLARE_INTERFACE_(IMpeg2Data,IUnknown)
 
     /* IMpeg2Data methods */
     STDMETHOD_(HRESULT,GetSection)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD dwTimeout,ISectionList **ppSectionList) PURE;
-    STDMETHOD_(HRESULT,GetStreamOfSections)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,HANDLE hDataReadyEvent,IMpeg2Stream **ppMpegStream) PURE;
     STDMETHOD_(HRESULT,GetTable)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,DWORD dwTimeout,ISectionList **ppSectionList) PURE;
+    STDMETHOD_(HRESULT,GetStreamOfSections)(THIS_ PID pid,TID tid,PMPEG2_FILTER pFilter,HANDLE hDataReadyEvent,IMpeg2Stream **ppMpegStream) PURE;
 
     END_INTERFACE
 };
@@ -101,17 +91,12 @@ DECLARE_INTERFACE_(IMpeg2Data,IUnknown)
 #define IMpeg2Data_AddRef(This) (This)->lpVtbl->AddRef(This)
 #define IMpeg2Data_Release(This) (This)->lpVtbl->Release(This)
 #define IMpeg2Data_GetSection(This,pid,tid,pFilter,dwTimeout,ppSectionList) (This)->lpVtbl->GetSection(This,pid,tid,pFilter,dwTimeout,ppSectionList)
-#define IMpeg2Data_GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream) (This)->lpVtbl->GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream)
 #define IMpeg2Data_GetTable(This,pid,tid,pFilter,dwTimeout,ppSectionList) (This)->lpVtbl->GetTable(This,pid,tid,pFilter,dwTimeout,ppSectionList)
+#define IMpeg2Data_GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream) (This)->lpVtbl->GetStreamOfSections(This,pid,tid,pFilter,hDataReadyEvent,ppMpegStream)
 #endif /*COBJMACROS*/
 
 #undef  INTERFACE
 #define INTERFACE IMpeg2Stream
-#ifdef __GNUC__
-#warning COM interfaces layout in this header has not been verified.
-#warning COM interfaces with incorrect layout may not work at all.
-__MINGW_BROKEN_INTERFACE(INTERFACE)
-#endif
 DECLARE_INTERFACE_(IMpeg2Stream,IUnknown)
 {
     BEGIN_INTERFACE
-- 
2.45.2