diff --git a/patches/11-DXVA2/0001-include-Add-dxva2api.idl.patch b/patches/11-DXVA2/0001-include-Add-dxva2api.idl.patch deleted file mode 100644 index afb6608b..00000000 --- a/patches/11-DXVA2/0001-include-Add-dxva2api.idl.patch +++ /dev/null @@ -1,566 +0,0 @@ -From a527e16eb1a778cef71ba5daa90417e0220bdd1b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Mar 2014 21:09:24 +0100 -Subject: include: Add dxva2api.idl - ---- - include/Makefile.in | 1 + - include/dxva2api.idl | 534 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 535 insertions(+) - create mode 100644 include/dxva2api.idl - -diff --git a/include/Makefile.in b/include/Makefile.in -index ebdc96b..d6997db 100644 ---- a/include/Makefile.in -+++ b/include/Makefile.in -@@ -40,6 +40,7 @@ PUBLIC_IDL_H_SRCS = \ - dwrite_1.idl \ - dxgi.idl \ - dxgi1_2.idl \ -+ dxva2api.idl \ - endpointvolume.idl \ - exdisp.idl \ - fusion.idl \ -diff --git a/include/dxva2api.idl b/include/dxva2api.idl -new file mode 100644 -index 0000000..b858820 ---- /dev/null -+++ b/include/dxva2api.idl -@@ -0,0 +1,534 @@ -+/* -+ * Copyright 2014 Michael Müller for Pipelight -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+cpp_quote("#include ") -+import "unknwn.idl"; -+ -+cpp_quote("#if 0") -+typedef DWORD IDirect3DDevice9; -+typedef DWORD IDirect3DSurface9; -+ -+typedef DWORD D3DFORMAT; -+typedef DWORD D3DPOOL; -+cpp_quote("#endif") -+ -+/* MPEG2 */ -+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_MoComp, 0xe6a9f44b, 0x61b0,0x4563, 0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66);") -+cpp_quote("#define DXVA2_ModeMPEG2_MOCOMP DXVA2_ModeMPEG2_MoComp") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea,0x4690, 0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e);") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28,0x4e65, 0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);") -+ -+/* H264 */ -+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeH264_MoComp_NoFGT DXVA2_ModeH264_A") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeH264_MoComp_FGT DXVA2_ModeH264_B") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeH264_IDCT_NoFGT DXVA2_ModeH264_C") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeH264_IDCT_FGT DXVA2_ModeH264_D") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeH264_VLD_NoFGT DXVA2_ModeH264_E") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeH264_VLD_FGT DXVA2_ModeH264_F") -+ -+/* WMV8 */ -+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeWMV8_PostProc DXVA2_ModeWMV8_A") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeWMV8_MoComp DXVA2_ModeWMV8_B") -+ -+/* WMV9 */ -+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeWMV9_PostProc DXVA2_ModeWMV9_A") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeWMV9_MoComp DXVA2_ModeWMV9_B") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeWMV9_IDCT DXVA2_ModeWMV9_C") -+ -+/* VC1 */ -+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeVC1_PostProc DXVA2_ModeVC1_A") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeVC1_MoComp DXVA2_ModeVC1_B") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeVC1_IDCT DXVA2_ModeVC1_C") -+ -+cpp_quote("DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+cpp_quote("#define DXVA2_ModeVC1_VLD DXVA2_ModeVC1_D") -+ -+/* Encryption */ -+cpp_quote("DEFINE_GUID(DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7,0x11d3, 0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") -+ -+typedef LONGLONG REFERENCE_TIME; -+ -+enum -+{ -+ DXVA2_PictureParametersBufferType = 0, -+ DXVA2_MacroBlockControlBufferType = 1, -+ DXVA2_ResidualDifferenceBufferType = 2, -+ DXVA2_DeblockingControlBufferType = 3, -+ DXVA2_InverseQuantizationMatrixBufferType = 4, -+ DXVA2_SliceControlBufferType = 5, -+ DXVA2_BitStreamDateBufferType = 6, -+ DXVA2_MotionVectorBuffer = 7, -+ DXVA2_FilmGrainBuffer = 8 -+}; -+ -+enum -+{ -+ DXVA2_VideoDecoderRenderTarget = 0, -+ DXVA2_VideoProcessorRenderTarget = 1, -+ DXVA2_VideoSoftwareRenderTarget = 2 -+}; -+ -+typedef struct _DXVA2_ExtendedFormat -+{ -+ union -+ { -+ struct -+ { -+ UINT SampleFormat :8; -+ UINT VideoChromaSubsampling :4; -+ UINT NominalRange :3; -+ UINT VideoTransferMatrix :3; -+ UINT VideoLighting :4; -+ UINT VideoPrimaries :5; -+ UINT VideoTransferFunction :5; -+ }; -+ UINT value; -+ }; -+} DXVA2_ExtendedFormat; -+ -+typedef struct _DXVA2_Frequency -+{ -+ UINT Numerator; -+ UINT Denominator; -+} DXVA2_Frequency; -+ -+typedef struct _DXVA2_ConfigPictureDecode -+{ -+ GUID guidConfigBitstreamEncryption; -+ GUID guidConfigMBcontrolEncryption; -+ GUID guidConfigResidDiffEncryption; -+ UINT ConfigBitstreamRaw; -+ UINT ConfigMBcontrolRasterOrder; -+ UINT ConfigResidDiffHost; -+ UINT ConfigSpatialResid8; -+ UINT ConfigResid8Subtraction; -+ UINT ConfigSpatialHost8or9Clipping; -+ UINT ConfigSpatialResidInterleaved; -+ UINT ConfigIntraResidUnsigned; -+ UINT ConfigResidDiffAccelerator; -+ UINT ConfigHostInverseScan; -+ UINT ConfigSpecificIDCT; -+ UINT Config4GroupedCoefs; -+ UINT ConfigMinRenderTargetBuffCount; -+ USHORT ConfigDecoderSpecific; -+} DXVA2_ConfigPictureDecode; -+ -+typedef struct _DXVA2_VideoDesc -+{ -+ UINT SampleWidth; -+ UINT SampleHeight; -+ DXVA2_ExtendedFormat SampleFormat; -+ D3DFORMAT Format; -+ DXVA2_Frequency InputSampleFreq; -+ DXVA2_Frequency OutputFrameFreq; -+ UINT UABProtectionLevel; -+ UINT Reserved; -+} DXVA2_VideoDesc; -+ -+typedef struct _DXVA2_DecodeBufferDesc -+{ -+ DWORD CompressedBufferType; -+ UINT BufferIndex; -+ UINT DataOffset; -+ UINT DataSize; -+ UINT FirstMBaddress; -+ UINT NumMBsInBuffer; -+ UINT Width; -+ UINT Height; -+ UINT Stride; -+ UINT ReservedBits; -+ PVOID pvPVPState; -+} DXVA2_DecodeBufferDesc; -+ -+typedef struct _DXVA2_DecodeExtensionData -+{ -+ UINT Function; -+ PVOID pPrivateInputData; -+ UINT PrivateInputDataSize; -+ PVOID pPrivateOutputData; -+ UINT PrivateOutputDataSize; -+} DXVA2_DecodeExtensionData; -+ -+typedef struct _DXVA2_DecodeExecuteParams -+{ -+ UINT NumCompBuffers; -+ DXVA2_DecodeBufferDesc* pCompressedBuffers; -+ DXVA2_DecodeExtensionData* pExtensionData; -+} DXVA2_DecodeExecuteParams; -+ -+typedef struct _DXVA2_VideoProcessorCaps -+{ -+ UINT DeviceCaps; -+ D3DPOOL InputPool; -+ UINT NumForwardRefSamples; -+ UINT NumBackwardRefSamples; -+ UINT Reserved; -+ UINT DeinterlaceTechnology; -+ UINT ProcAmpControlCaps; -+ UINT VideoProcessorOperations; -+ UINT NoiseFilterTechnology; -+ UINT DetailFilterTechnology; -+} DXVA2_VideoProcessorCaps; -+ -+typedef struct _DXVA2_Fixed32 -+{ -+ union -+ { -+ struct -+ { -+ USHORT Fraction; -+ SHORT Value; -+ }; -+ LONG ll; -+ }; -+} DXVA2_Fixed32; -+ -+typedef struct _DXVA2_ValueRange -+{ -+ DXVA2_Fixed32 MinValue; -+ DXVA2_Fixed32 MaxValue; -+ DXVA2_Fixed32 DefaultValue; -+ DXVA2_Fixed32 StepSize; -+} DXVA2_ValueRange; -+ -+typedef struct _DXVA2_AYUVSample8 -+{ -+ UCHAR Cr; -+ UCHAR Cb; -+ UCHAR Y; -+ UCHAR Alpha; -+} DXVA2_AYUVSample8; -+ -+typedef struct _DXVA2_AYUVSample16 -+{ -+ USHORT Cr; -+ USHORT Cb; -+ USHORT Y; -+ USHORT Alpha; -+} DXVA2_AYUVSample16; -+ -+typedef struct _DXVA2_ProcAmpValues -+{ -+ DXVA2_Fixed32 Brightness; -+ DXVA2_Fixed32 Contrast; -+ DXVA2_Fixed32 Hue; -+ DXVA2_Fixed32 Saturation; -+} DXVA2_ProcAmpValues; -+ -+typedef struct _DXVA2_FilterValues -+{ -+ DXVA2_Fixed32 Level; -+ DXVA2_Fixed32 Threshold; -+ DXVA2_Fixed32 Radius; -+} DXVA2_FilterValues; -+ -+typedef struct _DXVA2_VideoProcessBltParams -+{ -+ REFERENCE_TIME TargetFrame; -+ RECT TargetRect; -+ SIZE ConstrictionSize; -+ UINT StreamingFlags; -+ DXVA2_AYUVSample16 BackgroundColor; -+ DXVA2_ExtendedFormat DestFormat; -+ DXVA2_ProcAmpValues ProcAmpValues; -+ DXVA2_Fixed32 Alpha; -+ DXVA2_FilterValues NoiseFilterLuma; -+ DXVA2_FilterValues NoiseFilterChroma; -+ DXVA2_FilterValues DetailFilterLuma; -+ DXVA2_FilterValues DetailFilterChroma; -+ DWORD DestData; -+} DXVA2_VideoProcessBltParams; -+ -+typedef struct _DXVA2_VideoSample -+{ -+ REFERENCE_TIME Start; -+ REFERENCE_TIME End; -+ DXVA2_ExtendedFormat SampleFormat; -+ IDirect3DSurface9* SrcSurface; -+ RECT SrcRect; -+ RECT DstRect; -+ DXVA2_AYUVSample8 Pal[16]; -+ DXVA2_Fixed32 PlanarAlpha; -+ DWORD SampleData; -+} DXVA2_VideoSample; -+ -+interface IDirectXVideoDecoder; -+interface IDirectXVideoProcessor; -+ -+/***************************************************************************** -+ * IDirect3DDeviceManager9 interface -+ */ -+[ -+ object, -+ uuid(a0cade0f-06d5-4cf4-a1c7-f3cdd725aa75), -+ helpstring("IDirect3DDeviceManager9 Interface"), -+ local -+] -+interface IDirect3DDeviceManager9 : IUnknown -+{ -+ HRESULT ResetDevice( -+ [in] IDirect3DDevice9* pDevice, -+ [in] UINT resetToken); -+ -+ HRESULT OpenDeviceHandle( -+ [out] HANDLE* phDevice); -+ -+ HRESULT CloseDeviceHandle( -+ [in] HANDLE hDevice); -+ -+ HRESULT TestDevice( -+ [in] HANDLE hDevice); -+ -+ HRESULT LockDevice( -+ [in] HANDLE hDevice, -+ [out] IDirect3DDevice9** ppDevice, -+ [in] BOOL fBlock); -+ -+ HRESULT UnlockDevice( -+ [in] HANDLE hDevice, -+ [in] BOOL fSaveState); -+ -+ HRESULT GetVideoService( -+ [in] HANDLE hDevice, -+ [in] REFIID riid, -+ [out] void** ppService); -+}; -+ -+/***************************************************************************** -+ * IDirectXVideoAccelerationService interface -+ */ -+[ -+ object, -+ uuid(fc51a550-d5e7-11d9-af55-00054e43ff02), -+ helpstring("IDirectXVideoAccelerationService Interface"), -+ local -+] -+interface IDirectXVideoAccelerationService : IUnknown -+{ -+ HRESULT CreateSurface( -+ [in] UINT width, -+ [in] UINT height, -+ [in] UINT backBuffers, -+ [in] D3DFORMAT format, -+ [in] D3DPOOL pool, -+ [in] DWORD usage, -+ [in] DWORD dxvaType, -+ [out] IDirect3DSurface9 **ppSurface, -+ [in, out] HANDLE *pSharedHandle); -+}; -+ -+/***************************************************************************** -+ * IDirectXVideoDecoderService interface -+ */ -+[ -+ object, -+ uuid(fc51a551-d5e7-11d9-af55-00054e43ff02), -+ helpstring("IDirectXVideoDecoderService Interface"), -+ local -+] -+interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService -+{ -+ HRESULT GetDecoderDeviceGuids( -+ [out] UINT *count, -+ [out] GUID **pGuids); -+ -+ HRESULT GetDecoderRenderTargets( -+ [in] REFGUID guid, -+ [out] UINT *pCount, -+ [out] D3DFORMAT **pFormats); -+ -+ HRESULT GetDecoderConfigurations( -+ [in] REFGUID guid, -+ [in] const DXVA2_VideoDesc *pVideoDesc, -+ [in] IUnknown *pReserved, -+ [out] UINT *pCount, -+ [out] DXVA2_ConfigPictureDecode **ppConfigs); -+ -+ HRESULT CreateVideoDecoder( -+ [in] REFGUID guid, -+ [in] const DXVA2_VideoDesc *pVideoDesc, -+ [in] DXVA2_ConfigPictureDecode *pConfig, -+ [in] IDirect3DSurface9 **ppDecoderRenderTargets, -+ [in] UINT NumSurfaces, -+ [out] IDirectXVideoDecoder **ppDecode); -+}; -+ -+/***************************************************************************** -+ * IDirectXVideoDecoder interface -+ */ -+[ -+ object, -+ uuid(f2b0810a-fd00-43c9-918c-df94e2d8ef7d), -+ helpstring("IDirectXVideoDecoder Interface"), -+ local -+] -+interface IDirectXVideoDecoder : IUnknown -+{ -+ HRESULT GetVideoDecoderService( -+ [out] IDirectXVideoDecoderService** ppService); -+ -+ HRESULT GetCreationParameters( -+ [out] GUID* pDeviceGuid, -+ [out] DXVA2_VideoDesc* pVideoDesc, -+ [out] DXVA2_ConfigPictureDecode* pConfig, -+ [out] IDirect3DSurface9*** pDecoderRenderTargets, -+ [out] UINT* pNumSurfaces); -+ -+ HRESULT GetBuffer( -+ [in] UINT BufferType, -+ [out] void** ppBuffer, -+ [out] UINT* pBufferSize); -+ -+ HRESULT ReleaseBuffer( -+ [in] UINT BufferType); -+ -+ HRESULT BeginFrame( -+ [in] IDirect3DSurface9* pRenderTarget, -+ [in] void* pvPVPData); -+ -+ HRESULT EndFrame( -+ [out] HANDLE* pHandleComplete); -+ -+ HRESULT Execute( -+ [in] const DXVA2_DecodeExecuteParams* pExecuteParams); -+}; -+ -+/***************************************************************************** -+ * IDirectXVideoProcessorService interface -+ */ -+[ -+ object, -+ uuid(fc51a551-d5e7-11d9-af55-00054e43ff02), -+ helpstring("IDirectXVideoProcessorService Interface"), -+ local -+] -+interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService -+{ -+ HRESULT RegisterVideoProcessorSoftwareDevice( -+ [in] void* pCallbacks); -+ -+ HRESULT GetVideoProcessorDeviceGuids( -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [out] UINT* pCount, -+ [out] GUID** pGuids); -+ -+ HRESULT GetVideoProcessorRenderTargets( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [out] UINT* pCount, -+ [out] D3DFORMAT** pFormats); -+ -+ HRESULT GetVideoProcessorSubStreamFormats( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [out] UINT* pCount, -+ [out] D3DFORMAT** pFormats); -+ -+ HRESULT GetVideoProcessorCaps( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [out] DXVA2_VideoProcessorCaps* pCaps); -+ -+ HRESULT GetProcAmpRange( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [in] UINT ProcAmpCap, -+ [out] DXVA2_ValueRange* pRange); -+ -+ HRESULT GetFilterPropertyRange( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT renderTargetFormat, -+ [in] UINT FilterSetting, -+ [out] DXVA2_ValueRange* pRange); -+ -+ HRESULT CreateVideoProcessor( -+ [in] REFGUID VideoProcDeviceGuid, -+ [in] const DXVA2_VideoDesc* pVideoDesc, -+ [in] D3DFORMAT RenderTargetFormat, -+ [in] UINT MaxNumSubStreams, -+ [out] IDirectXVideoProcessor** ppVidProcess); -+}; -+ -+/***************************************************************************** -+ * IDirectXVideoProcessor interface -+ */ -+[ -+ object, -+ uuid(8c3a39f0-916e-4690-804f-4c8001355d25), -+ helpstring("IDirectXVideoProcessor Interface"), -+ local -+] -+interface IDirectXVideoProcessor : IUnknown -+{ -+ HRESULT GetVideoProcessorService( -+ [out] IDirectXVideoProcessorService** ppService); -+ -+ HRESULT GetCreationParameters( -+ [out] GUID* pDeviceGuid, -+ [out] DXVA2_VideoDesc* pVideoDesc, -+ [out] D3DFORMAT* pRenderTargetFormat, -+ [out] UINT* pMaxNumSubStreams); -+ -+ HRESULT GetVideoProcessorCaps( -+ [out] DXVA2_VideoProcessorCaps* pCaps); -+ -+ HRESULT GetProcAmpRange( -+ [in] UINT ProcAmpCap, -+ [out] DXVA2_ValueRange* pRange); -+ -+ HRESULT GetFilterPropertyRange( -+ [in] UINT FilterSetting, -+ [out] DXVA2_ValueRange* pRange); -+ -+ HRESULT VideoProcessBlt( -+ [in] IDirect3DSurface9* pRenderTarget, -+ [in] const DXVA2_VideoProcessBltParams* pBltParams, -+ [in] const DXVA2_VideoSample* pSamples, -+ [in] UINT NumSamples, -+ [out] HANDLE* pHandleCompleteIDirect3DDeviceManager9); -+}; --- -1.7.9.5 - diff --git a/patches/11-DXVA2/0002-include-Add-physicalmonitorenumerationapi.h.patch b/patches/11-DXVA2/0002-include-Add-physicalmonitorenumerationapi.h.patch deleted file mode 100644 index f0c84aee..00000000 --- a/patches/11-DXVA2/0002-include-Add-physicalmonitorenumerationapi.h.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 4f8c9effee69055d3bf5a92076cf49185e26624a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Mar 2014 05:20:09 +0100 -Subject: include: Add physicalmonitorenumerationapi.h - ---- - include/Makefile.in | 1 + - include/physicalmonitorenumerationapi.h | 40 +++++++++++++++++++++++++++++++ - 2 files changed, 41 insertions(+) - create mode 100644 include/physicalmonitorenumerationapi.h - -diff --git a/include/Makefile.in b/include/Makefile.in -index d6997db..3aa45cf 100644 ---- a/include/Makefile.in -+++ b/include/Makefile.in -@@ -475,6 +475,7 @@ SRCDIR_INCLUDES = \ - patchapi.h \ - pdh.h \ - pdhmsg.h \ -+ physicalmonitorenumerationapi.h \ - pktdef.h \ - poppack.h \ - powrprof.h \ -diff --git a/include/physicalmonitorenumerationapi.h b/include/physicalmonitorenumerationapi.h -new file mode 100644 -index 0000000..deac267 ---- /dev/null -+++ b/include/physicalmonitorenumerationapi.h -@@ -0,0 +1,40 @@ -+/* -+ * Copyright 2014 Michael Müller for Pipelight -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#ifndef __WINE_PHYSICALMONITORENUMERATIONAPI_H -+#define __WINE_PHYSICALMONITORENUMERATIONAPI_H -+ -+#include -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define PHYSICAL_MONITOR_DESCRIPTION_SIZE 128 -+ -+typedef struct _PHYSICAL_MONITOR -+{ -+ HANDLE hPhysicalMonitor; -+ WCHAR szPhysicalMonitorDescription[PHYSICAL_MONITOR_DESCRIPTION_SIZE]; -+} PHYSICAL_MONITOR, *LPPHYSICAL_MONITOR; -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __WINE_PHYSICALMONITORENUMERATIONAPI_H */ --- -1.7.9.5 - diff --git a/patches/11-DXVA2/0003-include-Add-lowlevelmonitorconfigurationapi.h.patch b/patches/11-DXVA2/0003-include-Add-lowlevelmonitorconfigurationapi.h.patch deleted file mode 100644 index 0d1ec0a1..00000000 --- a/patches/11-DXVA2/0003-include-Add-lowlevelmonitorconfigurationapi.h.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 10738eb0140ae5b623f6949ed7bd109ddb53b3d2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Mar 2014 05:24:03 +0100 -Subject: include: Add lowlevelmonitorconfigurationapi.h - ---- - include/Makefile.in | 1 + - include/lowlevelmonitorconfigurationapi.h | 43 +++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+) - create mode 100644 include/lowlevelmonitorconfigurationapi.h - -diff --git a/include/Makefile.in b/include/Makefile.in -index 3aa45cf..eee809e 100644 ---- a/include/Makefile.in -+++ b/include/Makefile.in -@@ -373,6 +373,7 @@ SRCDIR_INCLUDES = \ - lmuseflg.h \ - lmwksta.h \ - loadperf.h \ -+ lowlevelmonitorconfigurationapi.h \ - lzexpand.h \ - mapi.h \ - mapicode.h \ -diff --git a/include/lowlevelmonitorconfigurationapi.h b/include/lowlevelmonitorconfigurationapi.h -new file mode 100644 -index 0000000..aeedf4b ---- /dev/null -+++ b/include/lowlevelmonitorconfigurationapi.h -@@ -0,0 +1,43 @@ -+/* -+ * Copyright 2014 Michael Müller for Pipelight -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#ifndef __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H -+#define __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+typedef struct _MC_TIMING_REPORT -+{ -+ BYTE bTimingStatusByte; -+ DWORD dwHorizontalFrequencyInHZ; -+ DWORD dwVerticalFrequencyInHZ; -+} MC_TIMING_REPORT, *LPMC_TIMING_REPORT; -+ -+typedef enum _MC_VCP_CODE_TYPE -+{ -+ MC_MOMENTARY, -+ MC_SET_PARAMETER -+} MC_VCP_CODE_TYPE, *LPMC_VCP_CODE_TYPE; -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H */ --- -1.7.9.5 - diff --git a/patches/11-DXVA2/0004-include-Add-highlevelmonitorconfigurationapi.h.patch b/patches/11-DXVA2/0004-include-Add-highlevelmonitorconfigurationapi.h.patch deleted file mode 100644 index 2c5579e0..00000000 --- a/patches/11-DXVA2/0004-include-Add-highlevelmonitorconfigurationapi.h.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 055cb5d80161f8c6f2b6783bac914d99373a8219 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Mar 2014 05:26:25 +0100 -Subject: include: Add highlevelmonitorconfigurationapi.h - ---- - include/Makefile.in | 1 + - include/highlevelmonitorconfigurationapi.h | 82 ++++++++++++++++++++++++++++ - 2 files changed, 83 insertions(+) - create mode 100644 include/highlevelmonitorconfigurationapi.h - -diff --git a/include/Makefile.in b/include/Makefile.in -index eee809e..5c6a1c6 100644 ---- a/include/Makefile.in -+++ b/include/Makefile.in -@@ -330,6 +330,7 @@ SRCDIR_INCLUDES = \ - gdipluspixelformats.h \ - gdiplustypes.h \ - guiddef.h \ -+ highlevelmonitorconfigurationapi.h \ - hlguids.h \ - htmlhelp.h \ - http.h \ -diff --git a/include/highlevelmonitorconfigurationapi.h b/include/highlevelmonitorconfigurationapi.h -new file mode 100644 -index 0000000..9a0547c ---- /dev/null -+++ b/include/highlevelmonitorconfigurationapi.h -@@ -0,0 +1,82 @@ -+/* -+ * Copyright 2014 Michael Müller for Pipelight -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#ifndef __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H -+#define __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+typedef enum _MC_COLOR_TEMPERATURE -+{ -+ MC_COLOR_TEMPERATURE_UNKNOWN, -+ MC_COLOR_TEMPERATURE_4000K, -+ MC_COLOR_TEMPERATURE_5000K, -+ MC_COLOR_TEMPERATURE_6500K, -+ MC_COLOR_TEMPERATURE_7500K, -+ MC_COLOR_TEMPERATURE_8200K, -+ MC_COLOR_TEMPERATURE_9300K, -+ MC_COLOR_TEMPERATURE_10000K, -+ MC_COLOR_TEMPERATURE_11500K -+} MC_COLOR_TEMPERATURE, *LPMC_COLOR_TEMPERATURE; -+ -+typedef enum _MC_POSITION_TYPE -+{ -+ MC_HORIZONTAL_POSITION = 0, -+ MC_VERTICAL_POSITION = 1 -+} MC_POSITION_TYPE; -+ -+typedef enum _MC_SIZE_TYPE -+{ -+ MC_WIDTH = 0, -+ MC_HEIGHT = 1 -+} MC_SIZE_TYPE; -+ -+typedef enum _MC_DRIVE_TYPE -+{ -+ MC_RED_DRIVE = 0, -+ MC_GREEN_DRIVE = 1, -+ MC_BLUE_DRIVE = 2 -+} MC_DRIVE_TYPE; -+ -+typedef enum _MC_GAIN_TYPE -+{ -+ MC_RED_GAIN = 0, -+ MC_GREEN_GAIN = 1, -+ MC_BLUE_GAIN = 2 -+} MC_GAIN_TYPE; -+ -+typedef enum _MC_DISPLAY_TECHNOLOGY_TYPE -+{ -+ MC_SHADOW_MASK_CATHODE_RAY_TUBE, -+ MC_APERTURE_GRILL_CATHODE_RAY_TUBE, -+ MC_THIN_FILM_TRANSISTOR, -+ MC_LIQUID_CRYSTAL_ON_SILICON, -+ MC_PLASMA, -+ MC_ORGANIC_LIGHT_EMITTING_DIODE, -+ MC_ELECTROLUMINESCENT, -+ MC_MICROELECTROMECHANICAL, -+ MC_FIELD_EMISSION_DEVICE -+} MC_DISPLAY_TECHNOLOGY_TYPE, *LPMC_DISPLAY_TECHNOLOGY_TYPE; -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H */ --- -1.7.9.5 - diff --git a/patches/11-DXVA2/0005-dxva2-Add-implementation-for-stub-functions.patch b/patches/11-DXVA2/0005-dxva2-Add-implementation-for-stub-functions.patch deleted file mode 100644 index d6aa8e88..00000000 --- a/patches/11-DXVA2/0005-dxva2-Add-implementation-for-stub-functions.patch +++ /dev/null @@ -1,400 +0,0 @@ -From af2b41c356507cd708a31c7ad918e70f2d0e37b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Mar 2014 05:32:36 +0100 -Subject: dxva2: Add implementation for stub functions - ---- - dlls/dxva2/dxva2.spec | 72 ++++++------ - dlls/dxva2/main.c | 295 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 331 insertions(+), 36 deletions(-) - -diff --git a/dlls/dxva2/dxva2.spec b/dlls/dxva2/dxva2.spec -index da94df3..024a972 100644 ---- a/dlls/dxva2/dxva2.spec -+++ b/dlls/dxva2/dxva2.spec -@@ -1,37 +1,37 @@ --@ stub CapabilitiesRequestAndCapabilitiesReply --@ stub DXVA2CreateDirect3DDeviceManager9 --@ stub DXVA2CreateVideoService --@ stub DegaussMonitor --@ stub DestroyPhysicalMonitor --@ stub DestroyPhysicalMonitors --@ stub GetCapabilitiesStringLength --@ stub GetMonitorBrightness --@ stub GetMonitorCapabilities --@ stub GetMonitorColorTemperature --@ stub GetMonitorContrast --@ stub GetMonitorDisplayAreaPosition --@ stub GetMonitorDisplayAreaSize --@ stub GetMonitorRedGreenOrBlueDrive --@ stub GetMonitorRedGreenOrBlueGain --@ stub GetMonitorTechnologyType --@ stub GetNumberOfPhysicalMonitorsFromHMONITOR --@ stub GetNumberOfPhysicalMonitorsFromIDirect3DDevice9 --@ stub GetPhysicalMonitorsFromHMONITOR --@ stub GetPhysicalMonitorsFromIDirect3DDevice9 --@ stub GetTimingReport --@ stub GetVCPFeatureAndVCPFeatureReply --@ stub OPMGetVideoOutputsFromHMONITOR --@ stub OPMGetVideoOutputsFromIDirect3DDevice9Object --@ stub RestoreMonitorFactoryColorDefaults --@ stub RestoreMonitorFactoryDefaults --@ stub SaveCurrentMonitorSettings --@ stub SaveCurrentSettings --@ stub SetMonitorBrightness --@ stub SetMonitorColorTemperature --@ stub SetMonitorContrast --@ stub SetMonitorDisplayAreaPosition --@ stub SetMonitorDisplayAreaSize --@ stub SetMonitorRedGreenOrBlueDrive --@ stub SetMonitorRedGreenOrBlueGain --@ stub SetVCPFeature -+@ stdcall CapabilitiesRequestAndCapabilitiesReply(ptr ptr long) -+@ stdcall DXVA2CreateDirect3DDeviceManager9(ptr ptr) -+@ stdcall DXVA2CreateVideoService(ptr ptr ptr) -+@ stdcall DegaussMonitor(ptr) -+@ stdcall DestroyPhysicalMonitor(ptr) -+@ stdcall DestroyPhysicalMonitors(long ptr) -+@ stdcall GetCapabilitiesStringLength(ptr ptr) -+@ stdcall GetMonitorBrightness(ptr ptr ptr ptr) -+@ stdcall GetMonitorCapabilities(ptr ptr ptr) -+@ stdcall GetMonitorColorTemperature(ptr ptr) -+@ stdcall GetMonitorContrast(ptr ptr ptr ptr) -+@ stdcall GetMonitorDisplayAreaPosition(ptr long ptr ptr ptr) -+@ stdcall GetMonitorDisplayAreaSize(ptr long ptr ptr ptr) -+@ stdcall GetMonitorRedGreenOrBlueDrive(ptr long ptr ptr ptr) -+@ stdcall GetMonitorRedGreenOrBlueGain(ptr long ptr ptr ptr) -+@ stdcall GetMonitorTechnologyType(ptr ptr) -+@ stdcall GetNumberOfPhysicalMonitorsFromHMONITOR(ptr ptr) -+@ stdcall GetNumberOfPhysicalMonitorsFromIDirect3DDevice9(ptr ptr) -+@ stdcall GetPhysicalMonitorsFromHMONITOR(ptr long ptr) -+@ stdcall GetPhysicalMonitorsFromIDirect3DDevice9(ptr long ptr) -+@ stdcall GetTimingReport(ptr ptr) -+@ stdcall GetVCPFeatureAndVCPFeatureReply(ptr long ptr ptr ptr) -+@ stdcall OPMGetVideoOutputsFromHMONITOR(ptr long ptr ptr) -+@ stdcall OPMGetVideoOutputsFromIDirect3DDevice9Object(ptr long ptr ptr) -+@ stdcall RestoreMonitorFactoryColorDefaults(ptr) -+@ stdcall RestoreMonitorFactoryDefaults(ptr) -+@ stdcall SaveCurrentMonitorSettings(ptr) -+@ stdcall SaveCurrentSettings(ptr) -+@ stdcall SetMonitorBrightness(ptr long) -+@ stdcall SetMonitorColorTemperature(ptr long) -+@ stdcall SetMonitorContrast(ptr long) -+@ stdcall SetMonitorDisplayAreaPosition(ptr long long) -+@ stdcall SetMonitorDisplayAreaSize(ptr long long) -+@ stdcall SetMonitorRedGreenOrBlueDrive(ptr long long) -+@ stdcall SetMonitorRedGreenOrBlueGain(ptr long long) -+@ stdcall SetVCPFeature(ptr long long) - @ stub UABGetCertificate -diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c -index d16320f..051c0fd 100644 ---- a/dlls/dxva2/main.c -+++ b/dlls/dxva2/main.c -@@ -21,9 +21,304 @@ - #include "winbase.h" - - #include "wine/debug.h" -+#include "dxva2api.h" -+#include "physicalmonitorenumerationapi.h" -+#include "lowlevelmonitorconfigurationapi.h" -+#include "highlevelmonitorconfigurationapi.h" - - WINE_DEFAULT_DEBUG_CHANNEL(dxva2); - -+BOOL WINAPI CapabilitiesRequestAndCapabilitiesReply( HMONITOR monitor, LPSTR buffer, DWORD length ) -+{ -+ FIXME("(%p, %p, %d): stub\n", monitor, buffer, length); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9( UINT *resetToken, IDirect3DDeviceManager9 **dxvManager ) -+{ -+ FIXME("(%p, %p): stub\n", resetToken, dxvManager); -+ -+ return E_NOTIMPL; -+} -+ -+HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv ) -+{ -+ FIXME("(%p, %s, %p): stub\n", device, debugstr_guid(riid), ppv); -+ -+ return E_NOTIMPL; -+} -+ -+BOOL WINAPI DegaussMonitor( HMONITOR monitor ) -+{ -+ FIXME("(%p): stub\n", monitor); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI DestroyPhysicalMonitor( HMONITOR monitor ) -+{ -+ FIXME("(%p): stub\n", monitor); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI DestroyPhysicalMonitors( DWORD arraySize, LPPHYSICAL_MONITOR array ) -+{ -+ FIXME("(0x%x, %p): stub\n", arraySize, array); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetCapabilitiesStringLength( HMONITOR monitor, LPDWORD length ) -+{ -+ FIXME("(%p, %p): stub\n", monitor, length); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorBrightness( HMONITOR monitor, LPDWORD minimum, LPDWORD current, LPDWORD maximum ) -+{ -+ FIXME("(%p, %p, %p, %p): stub\n", monitor, minimum, current, maximum); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorCapabilities( HMONITOR monitor, LPDWORD capabilities, LPDWORD temperatures ) -+{ -+ FIXME("(%p, %p, %p): stub\n", monitor, capabilities, temperatures); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+ -+BOOL WINAPI GetMonitorColorTemperature( HMONITOR monitor, LPMC_COLOR_TEMPERATURE temperature ) -+{ -+ FIXME("(%p, %p): stub\n", monitor, temperature); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorContrast( HMONITOR monitor, LPDWORD minimum, LPDWORD current, LPDWORD maximum ) -+{ -+ FIXME("(%p, %p, %p, %p): stub\n", monitor, minimum, current, maximum); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE type, LPDWORD minimum, -+ LPDWORD current, LPDWORD maximum ) -+{ -+ FIXME("(%p, 0x%x, %p, %p, %p): stub\n", monitor, type, minimum, current, maximum); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, LPDWORD minimum, -+ LPDWORD current, LPDWORD maximum ) -+{ -+ FIXME("(%p, 0x%x, %p, %p, %p): stub\n", monitor, type, minimum, current, maximum); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type, LPDWORD minimum, -+ LPDWORD current, LPDWORD maximum ) -+{ -+ FIXME("(%p, 0x%x, %p, %p, %p): stub\n", monitor, type, minimum, current, maximum); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, LPDWORD minimum, -+ LPDWORD current, LPDWORD maximum ) -+{ -+ FIXME("(%p, 0x%x, %p, %p, %p): stub\n", monitor, type, minimum, current, maximum); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetMonitorTechnologyType( HMONITOR monitor, LPMC_DISPLAY_TECHNOLOGY_TYPE type ) -+{ -+ FIXME("(%p, %p): stub\n", monitor, type); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetNumberOfPhysicalMonitorsFromHMONITOR( HMONITOR monitor, LPDWORD number ) -+{ -+ FIXME("(%p, %p): stub\n", monitor, number); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+HRESULT WINAPI GetNumberOfPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 *device, LPDWORD number ) -+{ -+ FIXME("(%p, %p): stub\n", device, number); -+ -+ return E_NOTIMPL; -+} -+ -+BOOL WINAPI GetPhysicalMonitorsFromHMONITOR( HMONITOR monitor, DWORD arraySize, LPPHYSICAL_MONITOR array ) -+{ -+ FIXME("(%p, 0x%x, %p): stub\n", monitor, arraySize, array); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+HRESULT WINAPI GetPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 *device, DWORD arraySize, LPPHYSICAL_MONITOR array ) -+{ -+ FIXME("(%p, 0x%x, %p): stub\n", device, arraySize, array); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetTimingReport( HMONITOR monitor, LPMC_TIMING_REPORT timingReport ) -+{ -+ FIXME("(%p, %p): stub\n", monitor, timingReport); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI GetVCPFeatureAndVCPFeatureReply( HMONITOR monitor, BYTE vcpCode, LPMC_VCP_CODE_TYPE pvct, -+ LPDWORD current, LPDWORD maximum ) -+{ -+ FIXME("(%p, 0x%02x, %p, %p, %p): stub\n", monitor, vcpCode, pvct, current, maximum); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+HRESULT WINAPI OPMGetVideoOutputsFromHMONITOR( HMONITOR monitor, /* OPM_VIDEO_OUTPUT_SEMANTICS */ int vos, -+ ULONG *numVideoOutputs, /* IOPMVideoOutput */ void ***videoOutputs ) -+{ -+ FIXME("(%p, 0x%x, %p, %p): stub\n", monitor, vos, numVideoOutputs, videoOutputs); -+ -+ return E_NOTIMPL; -+} -+ -+HRESULT WINAPI OPMGetVideoOutputsFromIDirect3DDevice9Object( IDirect3DDevice9 *device, /* OPM_VIDEO_OUTPUT_SEMANTICS */ int vos, -+ ULONG *numVideoOutputs, /* IOPMVideoOutput */ void ***videoOutputs ) -+{ -+ FIXME("(%p, 0x%x, %p, %p): stub\n", device, vos, numVideoOutputs, videoOutputs); -+ -+ return E_NOTIMPL; -+} -+ -+BOOL WINAPI RestoreMonitorFactoryColorDefaults( HMONITOR monitor ) -+{ -+ FIXME("(%p): stub\n", monitor); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI RestoreMonitorFactoryDefaults( HMONITOR monitor ) -+{ -+ FIXME("(%p): stub\n", monitor); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SaveCurrentMonitorSettings( HMONITOR monitor ) -+{ -+ FIXME("(%p): stub\n", monitor); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SaveCurrentSettings( HMONITOR monitor ) -+{ -+ FIXME("(%p): stub\n", monitor); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetMonitorBrightness( HMONITOR monitor, DWORD brightness ) -+{ -+ FIXME("(%p, 0x%x): stub\n", monitor, brightness); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetMonitorColorTemperature( HMONITOR monitor, MC_COLOR_TEMPERATURE temperature ) -+{ -+ FIXME("(%p, 0x%x): stub\n", monitor, temperature); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetMonitorContrast( HMONITOR monitor, DWORD contrast ) -+{ -+ FIXME("(%p, 0x%x): stub\n", monitor, contrast); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetMonitorDisplayAreaPosition( HMONITOR monitor, MC_POSITION_TYPE type, DWORD position ) -+{ -+ FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, position); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetMonitorDisplayAreaSize( HMONITOR monitor, MC_SIZE_TYPE type, DWORD size ) -+{ -+ FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, size); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetMonitorRedGreenOrBlueDrive( HMONITOR monitor, MC_DRIVE_TYPE type, DWORD drive ) -+{ -+ FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, drive); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetMonitorRedGreenOrBlueGain( HMONITOR monitor, MC_GAIN_TYPE type, DWORD gain ) -+{ -+ FIXME("(%p, 0x%x, 0x%x): stub\n", monitor, type, gain); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ -+BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value ) -+{ -+ FIXME("(%p, 0x%02x, 0x%x): stub\n", monitor, vcpCode, value); -+ -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return FALSE; -+} -+ - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) - { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); --- -1.7.9.5 - diff --git a/patches/11-DXVA2/39ca2373-65c1-4d01-8ba0-1c2007cbbc59.def b/patches/11-DXVA2/39ca2373-65c1-4d01-8ba0-1c2007cbbc59.def deleted file mode 100644 index 90038a06..00000000 --- a/patches/11-DXVA2/39ca2373-65c1-4d01-8ba0-1c2007cbbc59.def +++ /dev/null @@ -1,3 +0,0 @@ -Revision: 3 -Author: Michael Müller -Title: Added DXVA2 stub implementation. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index 0a56c597..12088d13 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -37,7 +37,7 @@ diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..5fa0cd5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -478,6 +478,39 @@ const char *wine_get_version(void) +@@ -478,6 +478,38 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -57,7 +57,6 @@ index a273502..5fa0cd5 100644 + { "4cd13e94-7f2d-11e3-b5eb-0090f5c75ad5:1", "Erich E. Hoover", "Support for junction points/reparse points." }, + { "5fb1f5c8-7f17-11e3-9b62-0090f5c75ad5:1", "Erich E. Hoover", "Implement TransmitFile." }, + { "3d7c4774-9e7f-11e3-9cfc-0090f5c75ad5:1", "Erich E. Hoover", "Implement missing fonts expected by Silverlight." }, -+ { "39ca2373-65c1-4d01-8ba0-1c2007cbbc59:3", "Michael Müller", "Added DXVA2 stub implementation." }, + { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:1", "Michael Müller", "Decrease minimum SetTimer interval from 15 to 5 ms." }, + { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." }, + { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." },