[Mingw-w64-public] [PATCH] opmapi.h fixes.

[Jacek Caban]

---
 mingw-w64-headers/include/opmapi.h | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)



diff --git a/mingw-w64-headers/include/opmapi.h b/mingw-w64-headers/include/opmapi.h
index 085896f..4addf11 100644
--- a/mingw-w64-headers/include/opmapi.h
+++ b/mingw-w64-headers/include/opmapi.h
@@ -8,8 +8,6 @@
 
 #include <dxva2api.h>
 
-#if (_WIN32_WINNT >= 0x0600)
-
 #define OPM_OMAC_SIZE                                16
 #define OPM_CONFIGURE_SETTING_DATA_SIZE              4056
 #define OPM_REQUESTED_INFORMATION_SIZE               4076
@@ -225,11 +223,11 @@ DECLARE_INTERFACE_(IOPMVideoOutput,IUnknown)
     STDMETHOD_(ULONG, Release)(THIS) PURE;
 
     /* IOPMVideoOutput methods */
-    STDMETHOD_(HRESULT,Configure)(THIS_ const OPM_CONFIGURE_PARAMETERS *pParameters,ULONG ulAdditionalParametersSize,const BYTE *pbAdditionalParameters) PURE;
-    STDMETHOD_(HRESULT,COPPCompatibleGetInformation)(THIS_ const OPM_COPP_COMPATIBLE_GET_INFO_PARAMETERS *pParameters,OPM_REQUESTED_INFORMATION *pRequestedInformation) PURE;
+    STDMETHOD_(HRESULT,StartInitialization)(THIS_ OPM_RANDOM_NUMBER *prnRandomNumber,BYTE **ppbCertificate,ULONG *pulCertificateLength) PURE;
     STDMETHOD_(HRESULT,FinishInitialization)(THIS_ const OPM_ENCRYPTED_INITIALIZATION_PARAMETERS *pParameters) PURE;
     STDMETHOD_(HRESULT,GetInformation)(THIS_ const OPM_GET_INFO_PARAMETERS *pParameters,OPM_REQUESTED_INFORMATION *pRequestedInformation) PURE;
-    STDMETHOD_(HRESULT,StartInitialization)(THIS_ OPM_RANDOM_NUMBER *prnRandomNumber,BYTE **ppbCertificate,ULONG *pulCertificateLength) PURE;
+    STDMETHOD_(HRESULT,COPPCompatibleGetInformation)(THIS_ const OPM_COPP_COMPATIBLE_GET_INFO_PARAMETERS *pParameters,OPM_REQUESTED_INFORMATION *pRequestedInformation) PURE;
+    STDMETHOD_(HRESULT,Configure)(THIS_ const OPM_CONFIGURE_PARAMETERS *pParameters,ULONG ulAdditionalParametersSize,const BYTE *pbAdditionalParameters) PURE;
 
     END_INTERFACE
 };
@@ -262,7 +260,6 @@ HRESULT WINAPI OPMGetVideoOutputsFromIDirect3DDevice9Object(
   IOPMVideoOutput ***pppOPMVideoOutputArray
 );
 
-#if (_WIN32_WINNT >= 0x0601)
 typedef struct _OPM_GET_CODEC_INFO_INFORMATION {
   OPM_RANDOM_NUMBER rnRandomNumber;
   DWORD             Merit;
@@ -273,13 +270,9 @@ typedef struct _OPM_GET_CODEC_INFO_PARAMETERS {
   BYTE  Verifier[OPM_GET_INFORMATION_PARAMETERS_SIZE - 4];
 } OPM_GET_CODEC_INFO_PARAMETERS;
 
-#endif /*(_WIN32_WINNT >= 0x0601)*/
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*(_WIN32_WINNT >= 0x0600)*/
-
 #endif /*_INC_OPMAPI*/
 


------------------------------------------------------------------------------

_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public