- wine-devel - winehq.org

Re: [PATCH] oledlg: Make object name menu item localized
by Alex Henrie 18 May '15

18 May '15

+ WCHAR objectW[50]; /* should be enough*/ In the past I was told to always allocate memory in multiplies of 8 bytes,[1] and I personally have started to prefer powers of 2 in particular. Alexandre seems to prefer allocating at least 64 characters for short strings like this, judging from how he amended a proposed patch of mine several years ago.[2] + if (!LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, objectW, sizeof(objectW)/sizeof(WCHAR))) { + static const WCHAR enobjectW[] = {'&','O','b','j','e','c','t',0}; + strcpyW(objectW, enobjectW); + } Is this really necessary? How could LoadString fail? I recently submitted a very similar patch [3] and didn't have to provide a special fallback. Just to be clear, I do really appreciate you taking the time to make sure that Wine is properly localized :-) I just don't want to see the codebase made unnecessarily complicated or inefficient. -Alex [1] https://www.winehq.org/pipermail/wine-devel/2011-December/093516.html [2] https://source.winehq.org/git/wine.git/commitdiff/6e5bba1b60f97fce34415ea30… [3] https://www.winehq.org/pipermail/wine-patches/2015-May/139132.html

2 1

Re: [PATCH 1/2] kernel32: Implement GetSystemTimePreciseAsFileTime
by Andrew Eikum 18 May '15

18 May '15

On Thu, May 07, 2015 at 11:02:34PM +0300, Martin Storsjo wrote: > +/*********************************************************************** > + * GetSystemTimePreciseAsFileTime (KERNEL32.@) > + * > + * Get the current time in utc format, with <1 us precision. > + * > + * RETURNS > + * Nothing. > + */ > +VOID WINAPI GetSystemTimePreciseAsFileTime( > + LPFILETIME time) /* [out] Destination for the current utc time */ > +{ > + GetSystemTimeAsFileTime(time); > +} I don't know why this one's not getting in. I have a couple small guesses. Personally, I'm opposed to including a bunch of documentation in Wine. I don't think Wine is the right place to document the Windows API. I don't know if others feel this way, or if this is enough for rejection. You're also using VOID, LPJUNK, etc, which I think we're trying to avoid these days. Andrew

3 3

Re: [PATCH] kernel32: Implement a few more classes in GetFileInformationByHandleEx
by Marvin 17 May '15

17 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13414 Your paranoid android. === wvistau64 (32 bit file) === file.c:444: Test failed: attributes of file "testfile.xxx" are 0x0820 === wvistau64 (64 bit file) === file.c:444: Test failed: attributes of file "testfile.xxx" are 0x0820

2 1

Re: oledlg: Partially implement OleUIAddVerbMenuW(), with basic tests
by Marvin 15 May '15

15 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13373 Your paranoid android. === build (build) === Patch failed to apply

2 1

Why WINE renders the text in winecfg and notepad differently?
by John Found 15 May '15

15 May '15

In the attached picture, you can see, how the UI text differs for the simultaneously running WINE applications - notepad and winecfg. They both are running in the same WINEPREFIX and I expected to have the same appearance. Why this happens and how I can make them to look the same? Regards -- http://fresh.flatassembler.net http://asm32.info John Found <johnfound(a)asm32.info>

2 4

Re: mshtml: Initialize output value before passing it to VariantCopy.
by Marvin 14 May '15

14 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13368 Your paranoid android. === wvistau64 (32 bit events) === events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue === w2008s64 (32 bit events) === events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue === w7u (32 bit events) === events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue === w8 (32 bit events) === events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue === wvistau64 (64 bit events) === events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue === w2008s64 (64 bit events) === events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue events.c:1083: Test failed: get_returnValue failed: 80020008 events.c:1084: Test failed: unexpected returnValue

1 0

Re: ntdll/tests: Wait for pending file operations to complete.
by Marvin 14 May '15

14 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13361 Your paranoid android. === w8 (32 bit file) === file.c:407: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

Re: [PATCH 3/3] user32: Fall back to downscaling the big icon for ICON_SMALL2.
by Marvin 14 May '15

14 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13357 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [PATCH] d3d11.idl: add the basic interfaces to enable video decoding
by Stefan Dösinger 13 May '15

13 May '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This patch looks better. Ultimately Henri and Alexandre have to decide if they're happy with it. Henri is on vacation this week, so don't expect much movement until Monday. Am 2015-05-11 um 15:41 schrieb Steve Lhomme: > +interface ID3D11VideoDecoderOutputView : ID3D11View > +{ > + void GetDesc( > + [out] D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc ); > +} There's a space that doesn't match the rest of the patch, but does match what's in the MS headers. Since it is the only case I can spot I think it's a typo in a self-typed header rather than a missed fixup in a copypasted header. You don't have to use the same parameter names in Methods or functions. Instead of "pDesc" you can e.g. use "desc". The rest of the header already uses pCrap though, so I'm ok with the current way. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVUy8wAAoJEN0/YqbEcdMwXHwQAJd+LDxvH03XR5L/+bpxZB/o U6g7cgMmtkklfSeCazZrUe0R5ZZExbmmIN+bBr6GJpbQezVQW3vng9EQj6ihfBjf 6CEKr9BJF/xOhYdHPrhg3yxaD9MZrnsXa9llNFGds6SI0q1L8uCclyAuPxV+AoSO fxgElN7/+LCRTwEM9shdwuxVELrikW52UmVTEajhNematVixplOh6pJMe+8XyPp/ iSn+6p/jBeytKzjb83uUnyGqVaFLOIg9ywR2PPeA43RvNYVnfV9agxeOGJYvO7Zw mKWmv+fG9sIXzvF/G9upnceE69YHf8WoIdEHW+kZsOl2ctRRB4ycBHp0rG4s2IeH f1XpENP55lT+dYIc/Tef8IdpABzmGD7JwtnbLyxRbF4F9Qwfe6x7GP3VtEBp1M/+ 5nePonYZ4N55sShelaU8X7/JxUuZb8onlz1UfEXJkIykopyQJJw49rXkQv7OFm2k xyJAsXCQk5Z9sqXXBuFxUnKkip9P8UaLOwFJ8WFUVgHrkS9UAceiehUKgvpcwYfX vxh48j6gAE4fBEUBVOlXiR4lMV7cDUWIoJdCopUkzxysPMp/hi3BcDk7EdrF9LX9 c01jQc2N+JwzjIyNhSC01Jk23Qp2lOG+pUT1UrKcACesoB1H6Zm3QbNv5hVgUfkz pFuJsryqPWxQFS02SvTu =ToVh -----END PGP SIGNATURE-----

2 1

Re: [PATCH 1/2] user32: Use window class small icon if the window does not have its own.
by Sebastian Lackner 13 May '15

13 May '15

On 13.05.2015 07:36, Alex Henrie wrote: > We were already doing this for ICON_SMALL2, which is supposed to be > almost identical to ICON_SMALL: > https://source.winehq.org/git/wine.git/blob/5f35f1a8dbbc9dc3fa629a7f123e045… > https://msdn.microsoft.com/en-us/library/windows/desktop/ms632625%28v=vs.85… > > This patch is part 1 of the fix for > https://bugs.winehq.org/show_bug.cgi?id=29337 > --- > dlls/user32/defwnd.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c > index bcd6f91..935134d 100644 > --- a/dlls/user32/defwnd.c > +++ b/dlls/user32/defwnd.c > @@ -634,6 +634,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa > { > case ICON_SMALL: > ret = wndPtr->hIconSmall; > + if (!ret) ret = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); > break; > case ICON_BIG: > ret = wndPtr->hIcon; > The patch breaks existing tests (user32/win): win.c:2009: Test failed: wrong small icon 0x3b0058/0

1 0

Re: [PATCH 2/2] kernel32: Implement a few more classes in GetFileInformationByHandleEx
by Martin Storsjö 12 May '15

12 May '15

On Thu, 7 May 2015, Martin Storsjo wrote: > --- > dlls/kernel32/file.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c > index 006db1c..9bf318e 100644 > --- a/dlls/kernel32/file.c > +++ b/dlls/kernel32/file.c > @@ -23,6 +23,7 @@ > #include "config.h" > #include "wine/port.h" > > +#include <assert.h> > #include <stdarg.h> > #include <stdio.h> > #include <errno.h> > @@ -894,11 +895,10 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA > { > NTSTATUS status; > IO_STATUS_BLOCK io; > + FILE_INFORMATION_CLASS nt_class; > > switch (class) > { > - case FileBasicInfo: > - case FileStandardInfo: > case FileRenameInfo: > case FileDispositionInfo: > case FileAllocationInfo: > @@ -919,8 +919,24 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA > SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); > return FALSE; > > + case FileBasicInfo: > + case FileStandardInfo: > case FileNameInfo: > - status = NtQueryInformationFile( handle, &io, info, size, FileNameInformation ); > + switch (class) { > + case FileBasicInfo: > + nt_class = FileBasicInformation; > + break; > + case FileStandardInfo: > + nt_class = FileStandardInformation; > + break; > + case FileNameInfo: > + nt_class = FileNameInformation; > + break; > + default: > + assert(0); > + break; > + } > + status = NtQueryInformationFile( handle, &io, info, size, nt_class ); > if (status != STATUS_SUCCESS) > { > SetLastError( RtlNtStatusToDosError( status ) ); > -- > 1.8.1.2 Is there anything concrete that needs to be fixed in this (and the other kernel32 patch in the same thread) to be acceptable? // Martin

2 2

Re: [PATCH] d3d11.idl: add the basic interfaces to enable video decoding
by Steve Lhomme 11 May '15

11 May '15

Arf, sorry for all the noise. This patch compiles but doesn't run fine. I'll investigate. On Mon, May 11, 2015 at 2:02 PM, Steve Lhomme <robux4(a)videolabs.io> wrote: > --- > include/d3d11.idl | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 168 insertions(+) > > diff --git a/include/d3d11.idl b/include/d3d11.idl > index 3726d32..79db53f 100644 > --- a/include/d3d11.idl > +++ b/include/d3d11.idl > @@ -2125,6 +2125,174 @@ interface ID3D11Device : IUnknown > UINT GetExceptionMode(); > } > > +typedef enum D3D11_VDOV_DIMENSION > +{ > + D3D11_VDOV_DIMENSION_UNKNOWN = 0, > + D3D11_VDOV_DIMENSION_TEXTURE2D > +} D3D11_VDOV_DIMENSION; > + > +typedef struct D3D11_TEX2D_VDOV > +{ > + UINT ArraySlice; > +} D3D11_TEX2D_VDOV; > + > +typedef struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC > +{ > + GUID DecodeProfile; > + D3D11_VDOV_DIMENSION ViewDimension; > + > + union > + { > + D3D11_TEX2D_VDOV Texture2D; > + }; > +} D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC; > + > +[ > + object, > + local, > + uuid(c2931aea-2a85-4f20-860f-fba1fd256e18) > +] > +interface ID3D11VideoDecoderOutputView : ID3D11View > +{ > + void GetDesc( [out] D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc); > +} > + > +[ > + object, > + local, > + uuid(3c9c5b51-995d-48d1-9b8d-fa5caeded65c) > +] > +interface ID3D11VideoDecoder : ID3D11DeviceChild > +{ > +} > + > +typedef enum D3D11_VIDEO_DECODER_BUFFER_TYPE > +{ > + D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0, > + D3D11_VIDEO_DECODER_BUFFER_MACROBLOCK_CONTROL, > + D3D11_VIDEO_DECODER_BUFFER_RESIDUAL_DIFFERENCE, > + D3D11_VIDEO_DECODER_BUFFER_DEBLOCKING_CONTROL, > + D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX, > + D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL, > + D3D11_VIDEO_DECODER_BUFFER_BITSTREAM, > + D3D11_VIDEO_DECODER_BUFFER_MOTION_VECTOR, > + D3D11_VIDEO_DECODER_BUFFER_FILM_GRAIN > +} D3D11_VIDEO_DECODER_BUFFER_TYPE; > + > +typedef struct D3D11_ENCRYPTED_BLOCK_INFO > +{ > + UINT NumEncryptedBytesAtBeginning; > + UINT NumBytesInSkipPattern; > + UINT NumBytesInEncryptPattern; > +} D3D11_ENCRYPTED_BLOCK_INFO; > + > +typedef struct D3D11_VIDEO_DECODER_BUFFER_DESC > +{ > + D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType; > + UINT BufferIndex; > + UINT DataOffset; > + UINT DataSize; > + UINT FirstMBaddress; > + UINT NumMBsInBuffer; > + UINT Width; > + UINT Height; > + UINT Stride; > + UINT ReservedBits; > + void *pIV; > + UINT IVSize; > + BOOL PartialEncryption; > + D3D11_ENCRYPTED_BLOCK_INFO EncryptedBlockInfo; > +} D3D11_VIDEO_DECODER_BUFFER_DESC; > + > +[ > + object, > + local, > + uuid(61f21c45-3c0e-4a74-9cea-67100d9ad5e4) > +] > +interface ID3D11VideoContext : ID3D11DeviceChild > +{ > + HRESULT GetDecoderBuffer( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType, > + [out] UINT *pBufferSize, > + [out] void **ppBuffer); > + HRESULT ReleaseDecoderBuffer( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType); > + HRESULT DecoderBeginFrame( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] ID3D11VideoDecoderOutputView *pVideoDecoderOutputView, > + [in] UINT ContentKeySize, > + [in] const void *pContentKey); > + HRESULT DecoderEndFrame( > + [in] ID3D11VideoDecoder *pDecoder); > + HRESULT SubmitDecoderBuffers( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] UINT NumBuffers, > + [in] const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc); > +} > + > +typedef struct D3D11_VIDEO_DECODER_DESC > +{ > + GUID Guid; > + UINT SampleWidth; > + UINT SampleHeight; > + DXGI_FORMAT OutputFormat; > +} D3D11_VIDEO_DECODER_DESC; > + > +typedef struct D3D11_VIDEO_DECODER_CONFIG > +{ > + 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; > + USHORT ConfigMinRenderTargetBuffCount; > + USHORT ConfigDecoderSpecific; > +} D3D11_VIDEO_DECODER_CONFIG; > + > +[ > + object, > + local, > + uuid(10ec4d5b-975a-4689-b9e4-d0aac30fe333) > +] > +interface ID3D11VideoDevice : IUnknown > +{ > + HRESULT CreateVideoDecoder( > + [in] const D3D11_VIDEO_DECODER_DESC *pVideoDesc, > + [in] const D3D11_VIDEO_DECODER_CONFIG *pConfig, > + [out] ID3D11VideoDecoder **ppVideoDecoder); > + UINT GetVideoDecoderProfileCount(void); > + HRESULT GetVideoDecoderProfile( > + [in] UINT Index, > + [out] GUID *pDecoderProfile); > + HRESULT CheckVideoDecoderFormat( > + [in] const GUID *pDecoderProfile, > + [in] DXGI_FORMAT Format, > + [out] BOOL *pSupported); > + HRESULT CreateVideoDecoderOutputView( > + [in] ID3D11Resource *pResource, > + [in] const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc, > + [out] ID3D11VideoDecoderOutputView **ppVideoDecoderOutputView); > + HRESULT GetVideoDecoderConfigCount( > + [in] const D3D11_VIDEO_DECODER_DESC *pDesc, > + [out] UINT *pCount); > + HRESULT GetVideoDecoderConfig( > + [in] const D3D11_VIDEO_DECODER_DESC *pDesc, > + [in] UINT Index, > + [out] D3D11_VIDEO_DECODER_CONFIG *pConfig); > +} > + > typedef enum D3D11_CREATE_DEVICE_FLAG { > D3D11_CREATE_DEVICE_SINGLETHREADED = 0x0001, > D3D11_CREATE_DEVICE_DEBUG = 0x0002, > -- > 2.4.0 > > >

1 0

Re: [PATCH] d3d11.idl: add the interfaces necessary to use the D3D11 video decoder
by Stefan Dösinger 11 May '15

11 May '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-05-11 um 11:53 schrieb Steve Lhomme: > On Mon, May 11, 2015 at 11:10 AM, Stefan Dösinger >> This patch still shows plenty of signs that it was copypasted >> from Microsoft's headers. > > Care to elaborate ? Suspicious trailing whitespaces at exactly the same place where Microsoft's code has them. There are more telling signs that I don't want to point out since I want a cleanly written header, not one that has a few problematic symptoms fixed. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVUIP5AAoJEN0/YqbEcdMw2IEQAIagS0sWyxW/HtEyztMgpfQZ gzzQkC0Uwlf+PGdFTAM4kyJVljqlHdgu/ZMqmABeNnqW3jsHQmCvIVv3ahvSa1Y8 rl9cWWxoYl31BLFPy6F+QN8QUsvX4Hnz96bYxy2M733XWLodSWMlCAzvFpdLPfa3 bZ9BOAsRfkLKxEzdz0adjJtwxdPwwF/CwGwjucrHGiBVW4RCB01gYSagUK9LZxVH VMsFFWi0YbfzforISKGSGC4tF0iDUwGzQ7V5QAMZmnDiVpZXz47shzFXiOP1jaM/ kEnMQXkPH1vMqKwXK7HqbsN0qALxzN5DiMgMxtVUTyelAKlOT+c4Fyd0PSFpyi1r uvSM1M2gxh3NjZ/BSNh5GSwZgkAwCe5PaN0xDVWZ8c4GPm7e6n61XKvdm/NEtvjM modJb6WUx5iWkWY58sBbi4VG5Zl3eu+cqNKtZd3mo0m/LefF061DrAgMO+bSYiza JwHYyqfWVOyzGpuks7k1k7aub+YemJrGXT84LWoDlshf+xWUk0duszWySAFtBKSG XgJILPLSzRir1OQa39orFmAqCiMJwVh1pwuie1cQ9zq2GmyezilAD9Co1Qns9dSi an0MQlh1SpTnoWE1wduk2mcU1Q7GdanVgyATSWl7Any4FAn4Gru+nlW85dPDcIhp lM8l59NlJaTcdAnGPQEp =5XCl -----END PGP SIGNATURE-----

1 0

Re: [PATCH] d3d11.idl: add the interfaces necessary to use the D3D11 video decoder
by Stefan Dösinger 11 May '15

11 May '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch still shows plenty of signs that it was copypasted from Microsoft's headers. Am 2015-05-11 um 11:00 schrieb Steve Lhomme: > From: Steve Lhomme <slhomme(a)matroska.org> > > --- > include/d3d11.idl | 878 +++++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 870 insertions(+), 8 deletions(-) > > diff --git a/include/d3d11.idl b/include/d3d11.idl > index 3726d32..70afbd5 100644 > --- a/include/d3d11.idl > +++ b/include/d3d11.idl > @@ -2125,16 +2125,878 @@ interface ID3D11Device : IUnknown > UINT GetExceptionMode(); > } > > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_MOCOMP_NOFGT, 0x1b81be64, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_MOCOMP_FGT, 0x1b81be65, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_IDCT_NOFGT, 0x1b81be66, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_IDCT_FGT, 0x1b81be67, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_NOFGT, 0x1b81be68, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_FGT, 0x1b81be69, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_WITHFMOASO_NOFGT, 0xd5f04ff9, 0x3418, 0x45d8, 0x95, 0x61, 0x32, 0xa7, 0x6a, 0xae, 0x2d, 0xdd);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_STEREO_PROGRESSIVE_NOFGT, 0xd79be8da, 0x0cf1, 0x4c81, 0xb8, 0x2a, 0x69, 0xa4, 0xe2, 0x36, 0xf4, 0x3d);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_STEREO_NOFGT, 0xf9aaccbb, 0xc2b6, 0x4cfc, 0x87, 0x79, 0x57, 0x07, 0xb1, 0x76, 0x05, 0x52);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_MULTIVIEW_NOFGT, 0x705b9d82, 0x76cf, 0x49d6, 0xb7, 0xe6, 0xac, 0x88, 0x72, 0xdb, 0x01, 0x3c);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV8_POSTPROC, 0x1b81be80, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV8_MOCOMP, 0x1b81be81, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV9_POSTPROC, 0x1b81be90, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV9_MOCOMP, 0x1b81be91, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV9_IDCT, 0x1b81be94, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_POSTPROC, 0x1b81beA0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_MOCOMP, 0x1b81beA1, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_IDCT, 0x1b81beA2, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_VLD, 0x1b81beA3, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_D2010, 0x1b81beA4, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_SIMPLE, 0xefd64d74, 0xc9e8, 0x41d7, 0xa5, 0xe9, 0xe9, 0xb0, 0xe3, 0x9f, 0xa3, 0x19);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_NOGMC, 0xed418a9f, 0x010d, 0x4eda, 0x9a, 0xe3, 0x9a, 0x65, 0x35, 0x8d, 0x8d, 0x2e);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_GMC, 0xab998b5b, 0x4258, 0x44a9, 0x9f, 0xeb, 0x94, 0xe5, 0x97, 0xa6, 0xba, 0xae);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN, 0x5b11d51b, 0x2f4c, 0x4452, 0xbc, 0xc3, 0x09, 0xf2, 0xa1, 0x16, 0x0c, 0xc0);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10, 0x107af0e0, 0xef1a, 0x4d19, 0xab, 0xa8, 0x67, 0xa1, 0x63, 0x07, 0x3d, 0x13);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2_MOCOMP, 0xe6a9f44b, 0x61b0, 0x4563, 0x9e, 0xa4, 0x63, 0xd2, 0xa3, 0xc6, 0xfe, 0x66);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2_IDCT, 0xbf22ad00, 0x03ea, 0x4690, 0x80, 0x77, 0x47, 0x33, 0x46, 0x20, 0x9b, 0x7e);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2_VLD, 0xee27417f, 0x5e28, 0x4e65, 0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG1_VLD, 0x6f3ec719, 0x3735, 0x42cc, 0x80, 0x63, 0x65, 0xcc, 0x3c, 0xb3, 0x66, 0x16);") > +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2and1_VLD, 0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60);") > + > +typedef struct D3D11_VIDEO_DECODER_DESC > +{ > + GUID Guid; > + UINT SampleWidth; > + UINT SampleHeight; > + DXGI_FORMAT OutputFormat; > +} D3D11_VIDEO_DECODER_DESC; > + > +typedef struct D3D11_VIDEO_DECODER_CONFIG > +{ > + 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; > + USHORT ConfigMinRenderTargetBuffCount; > + USHORT ConfigDecoderSpecific; > +} D3D11_VIDEO_DECODER_CONFIG; > + > +typedef enum D3D11_VIDEO_DECODER_BUFFER_TYPE > +{ > + D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0, > + D3D11_VIDEO_DECODER_BUFFER_MACROBLOCK_CONTROL = 1, > + D3D11_VIDEO_DECODER_BUFFER_RESIDUAL_DIFFERENCE = 2, > + D3D11_VIDEO_DECODER_BUFFER_DEBLOCKING_CONTROL = 3, > + D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX = 4, > + D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL = 5, > + D3D11_VIDEO_DECODER_BUFFER_BITSTREAM = 6, > + D3D11_VIDEO_DECODER_BUFFER_MOTION_VECTOR = 7, > + D3D11_VIDEO_DECODER_BUFFER_FILM_GRAIN = 8 > +} D3D11_VIDEO_DECODER_BUFFER_TYPE; > + > +typedef struct D3D11_ENCRYPTED_BLOCK_INFO > +{ > + UINT NumEncryptedBytesAtBeginning; > + UINT NumBytesInSkipPattern; > + UINT NumBytesInEncryptPattern; > +} D3D11_ENCRYPTED_BLOCK_INFO; > + > +typedef struct D3D11_VIDEO_DECODER_BUFFER_DESC > +{ > + D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType; > + UINT BufferIndex; > + UINT DataOffset; > + UINT DataSize; > + UINT FirstMBaddress; > + UINT NumMBsInBuffer; > + UINT Width; > + UINT Height; > + UINT Stride; > + UINT ReservedBits; > + void *pIV; > + UINT IVSize; > + BOOL PartialEncryption; > + D3D11_ENCRYPTED_BLOCK_INFO EncryptedBlockInfo; > +} D3D11_VIDEO_DECODER_BUFFER_DESC; > + > +typedef struct D3D11_VIDEO_DECODER_EXTENSION > +{ > + UINT Function; > + void *pPrivateInputData; > + UINT PrivateInputDataSize; > + void *pPrivateOutputData; > + UINT PrivateOutputDataSize; > + UINT ResourceCount; > + ID3D11Resource **ppResourceList; > +} D3D11_VIDEO_DECODER_EXTENSION; > + > +typedef enum D3D11_VIDEO_FRAME_FORMAT > +{ > + D3D11_VIDEO_FRAME_FORMAT_PROGRESSIVE = 0, > + D3D11_VIDEO_FRAME_FORMAT_INTERLACED_TOP_FIELD_FIRST = 1, > + D3D11_VIDEO_FRAME_FORMAT_INTERLACED_BOTTOM_FIELD_FIRST = 2 > +} D3D11_VIDEO_FRAME_FORMAT; > + > +typedef enum D3D11_VIDEO_USAGE > +{ > + D3D11_VIDEO_USAGE_PLAYBACK_NORMAL = 0, > + D3D11_VIDEO_USAGE_OPTIMAL_SPEED = 1, > + D3D11_VIDEO_USAGE_OPTIMAL_QUALITY = 2 > +} D3D11_VIDEO_USAGE; > + > +typedef struct D3D11_VIDEO_PROCESSOR_CONTENT_DESC > +{ > + D3D11_VIDEO_FRAME_FORMAT InputFrameFormat; > + DXGI_RATIONAL InputFrameRate; > + UINT InputWidth; > + UINT InputHeight; > + DXGI_RATIONAL OutputFrameRate; > + UINT OutputWidth; > + UINT OutputHeight; > + D3D11_VIDEO_USAGE Usage; > +} D3D11_VIDEO_PROCESSOR_CONTENT_DESC; > + > +typedef struct D3D11_VIDEO_PROCESSOR_CAPS > +{ > + UINT DeviceCaps; > + UINT FeatureCaps; > + UINT FilterCaps; > + UINT InputFormatCaps; > + UINT AutoStreamCaps; > + UINT StereoCaps; > + UINT RateConversionCapsCount; > + UINT MaxInputStreams; > + UINT MaxStreamStates; > +} D3D11_VIDEO_PROCESSOR_CAPS; > + > +typedef struct D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS > +{ > + UINT PastFrames; > + UINT FutureFrames; > + UINT ProcessorCaps; > + UINT ITelecineCaps; > + UINT CustomRateCount; > +} D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS; > + > +typedef struct D3D11_VIDEO_PROCESSOR_CUSTOM_RATE > +{ > + DXGI_RATIONAL CustomRate; > + UINT OutputFrames; > + BOOL InputInterlaced; > + UINT InputFramesOrFields; > +} D3D11_VIDEO_PROCESSOR_CUSTOM_RATE; > + > +typedef enum D3D11_VIDEO_PROCESSOR_FILTER > +{ > + D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS = 0, > + D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST = 1, > + D3D11_VIDEO_PROCESSOR_FILTER_HUE = 2, > + D3D11_VIDEO_PROCESSOR_FILTER_SATURATION = 3, > + D3D11_VIDEO_PROCESSOR_FILTER_NOISE_REDUCTION = 4, > + D3D11_VIDEO_PROCESSOR_FILTER_EDGE_ENHANCEMENT = 5, > + D3D11_VIDEO_PROCESSOR_FILTER_ANAMORPHIC_SCALING = 6, > + D3D11_VIDEO_PROCESSOR_FILTER_STEREO_ADJUSTMENT = 7 > +} D3D11_VIDEO_PROCESSOR_FILTER; > + > +typedef struct D3D11_VIDEO_CONTENT_PROTECTION_CAPS > +{ > + UINT Caps; > + UINT KeyExchangeTypeCount; > + UINT BlockAlignmentSize; > + ULONGLONG ProtectedMemorySize; > +} D3D11_VIDEO_CONTENT_PROTECTION_CAPS; > + > +typedef struct D3D11_VIDEO_PROCESSOR_FILTER_RANGE > +{ > + int Minimum; > + int Maximum; > + int Default; > + float Multiplier; > +} D3D11_VIDEO_PROCESSOR_FILTER_RANGE; > + > +typedef struct D3D11_VIDEO_COLOR_RGBA > +{ > + float R; > + float G; > + float B; > + float A; > +} D3D11_VIDEO_COLOR_RGBA; > + > +typedef struct D3D11_VIDEO_COLOR_YCbCrA > +{ > + float Y; > + float Cb; > + float Cr; > + float A; > +} D3D11_VIDEO_COLOR_YCbCrA; > + > +typedef struct D3D11_VIDEO_COLOR > +{ > + union > + { > + D3D11_VIDEO_COLOR_YCbCrA YCbCr; > + D3D11_VIDEO_COLOR_RGBA RGBA; > + }; > +} D3D11_VIDEO_COLOR; > + > +typedef struct D3D11_VIDEO_PROCESSOR_COLOR_SPACE > +{ > + UINT Usage :1; > + UINT RGB_Range :1; > + UINT YCbCr_Matrix :1; > + UINT YCbCr_xvYCC :1; > + UINT Nominal_Range :2; > + UINT Reserved : 26; > +} D3D11_VIDEO_PROCESSOR_COLOR_SPACE; > + > +typedef enum D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE > +{ > + D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_OPAQUE = 0, > + D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_BACKGROUND = 1, > + D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_DESTINATION = 2, > + D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_SOURCE_STREAM = 3 > +} D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE; > + > +typedef enum D3D11_VIDEO_PROCESSOR_OUTPUT_RATE > +{ > + D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_NORMAL = 0, > + D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_HALF = 1, > + D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_CUSTOM = 2 > +} D3D11_VIDEO_PROCESSOR_OUTPUT_RATE; > + > +typedef enum D3D11_VIDEO_PROCESSOR_STEREO_FORMAT > +{ > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_MONO = 0, > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_HORIZONTAL = 1, > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_VERTICAL = 2, > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_SEPARATE = 3, > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_MONO_OFFSET = 4, > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_ROW_INTERLEAVED = 5, > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_COLUMN_INTERLEAVED = 6, > + D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_CHECKERBOARD = 7 > +} D3D11_VIDEO_PROCESSOR_STEREO_FORMAT; > + > +typedef enum D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE > +{ > + D3D11_VIDEO_PROCESSOR_STEREO_FLIP_NONE = 0, > + D3D11_VIDEO_PROCESSOR_STEREO_FLIP_FRAME0 = 1, > + D3D11_VIDEO_PROCESSOR_STEREO_FLIP_FRAME1 = 2 > +} D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE; > + > +typedef enum D3D11_VIDEO_PROCESSOR_ROTATION > +{ > + D3D11_VIDEO_PROCESSOR_ROTATION_IDENTITY = 0, > + D3D11_VIDEO_PROCESSOR_ROTATION_90 = 1, > + D3D11_VIDEO_PROCESSOR_ROTATION_180 = 2, > + D3D11_VIDEO_PROCESSOR_ROTATION_270 = 3 > +} D3D11_VIDEO_PROCESSOR_ROTATION; > + > +[ > + object, > + local, > + uuid(3c9c5b51-995d-48d1-9b8d-fa5caeded65c) > +] > +interface ID3D11VideoDecoder : ID3D11DeviceChild > +{ > + HRESULT GetCreationParameters( > + [out] D3D11_VIDEO_DECODER_DESC *pVideoDesc, > + [out] D3D11_VIDEO_DECODER_CONFIG *pConfig); > + HRESULT GetDriverHandle( > + [out] HANDLE *pDriverHandle); > +} > + > +[ > + object, > + local, > + uuid(1d7b0652-185f-41c6-85ce-0c5be3d4ae6c) > +] > +interface ID3D11VideoProcessor : ID3D11DeviceChild > +{ > + void GetContentDesc( > + [out] D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pDesc); > + void GetRateConversionCaps( > + [out] D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps); > +} > + > +typedef enum D3D11_VPOV_DIMENSION > +{ > + D3D11_VPOV_DIMENSION_UNKNOWN = 0, > + D3D11_VPOV_DIMENSION_TEXTURE2D = 1, > + D3D11_VPOV_DIMENSION_TEXTURE2DARRAY = 2 > +} D3D11_VPOV_DIMENSION; > + > +typedef struct D3D11_TEX2D_VPOV > +{ > + UINT MipSlice; > +} D3D11_TEX2D_VPOV; > + > +typedef struct D3D11_TEX2D_ARRAY_VPOV > +{ > + UINT MipSlice; > + UINT FirstArraySlice; > + UINT ArraySize; > +} D3D11_TEX2D_ARRAY_VPOV; > + > +typedef struct D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC > +{ > + D3D11_VPOV_DIMENSION ViewDimension; > + > + union > + { > + D3D11_TEX2D_VPOV Texture2D; > + D3D11_TEX2D_ARRAY_VPOV Texture2DArray; > + }; > +} D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC; > + > +[ > + object, > + local, > + uuid(a048285e-25a9-4527-bd93-d68b68c44254) > +] > +interface ID3D11VideoProcessorOutputView : ID3D11View > +{ > + void GetDesc( [out] D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC *pDesc); > +} > + > +[ > + object, > + local, > + uuid(9b32f9ad-bdcc-40a6-a39d-d5c865845720) > +] > +interface ID3D11CryptoSession : ID3D11DeviceChild > +{ > + void GetCryptoType( > + [out] GUID *pCryptoType); > + void GetDecoderProfile( > + [out] GUID *pDecoderProfile); > + HRESULT GetCertificateSize( > + [out] UINT *pCertificateSize); > + HRESULT GetCertificate( > + [in] UINT CertificateSize, > + [out] BYTE *pCertificate); > + void GetCryptoSessionHandle( > + [out] HANDLE *pCryptoSessionHandle); > +} > + > +#define D3D11_OMAC_SIZE 16 > + > +typedef struct D3D11_OMAC > +{ > + BYTE Omac[D3D11_OMAC_SIZE]; > +} D3D11_OMAC; > + > +typedef enum D3D11_AUTHENTICATED_CHANNEL_TYPE > +{ > + D3D11_AUTHENTICATED_CHANNEL_D3D11 = 1, > + D3D11_AUTHENTICATED_CHANNEL_DRIVER_SOFTWARE = 2, > + D3D11_AUTHENTICATED_CHANNEL_DRIVER_HARDWARE = 3 > +} D3D11_AUTHENTICATED_CHANNEL_TYPE; > + > +typedef struct D3D11_AUTHENTICATED_CONFIGURE_OUTPUT > +{ > + D3D11_OMAC omac; > + GUID ConfigureType; > + HANDLE hChannel; > + UINT SequenceNumber; > + HRESULT ReturnCode; > +} D3D11_AUTHENTICATED_CONFIGURE_OUTPUT; > + > +[ > + object, > + local, > + uuid(3015a308-dcbd-47aa-a747-192486d14d4a) > +] > +interface ID3D11AuthenticatedChannel : ID3D11DeviceChild > +{ > + HRESULT GetCertificateSize( > + [out] UINT *pCertificateSize); > + HRESULT GetCertificate( > + [in] UINT CertificateSize, > + [out] BYTE *pCertificate); > + void GetChannelHandle( > + [out] HANDLE *pChannelHandle); > +} > + > +typedef enum D3D11_VPIV_DIMENSION > +{ > + D3D11_VPIV_DIMENSION_UNKNOWN = 0, > + D3D11_VPIV_DIMENSION_TEXTURE2D = 1 > +} D3D11_VPIV_DIMENSION; > + > +typedef struct D3D11_TEX2D_VPIV > +{ > + UINT MipSlice; > + UINT ArraySlice; > +} D3D11_TEX2D_VPIV; > + > +typedef struct D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC > +{ > + UINT FourCC; > + D3D11_VPIV_DIMENSION ViewDimension; > + > + union > + { > + D3D11_TEX2D_VPIV Texture2D; > + }; > +} D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC; > + > +[ > + object, > + local, > + uuid(11ec5a5f-51dc-4945-ab34-6e8c21300ea5) > +] > +interface ID3D11VideoProcessorInputView : ID3D11View > +{ > + void GetDesc( [out] D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC *pDesc); > +} > + > +typedef enum D3D11_VDOV_DIMENSION > +{ > + D3D11_VDOV_DIMENSION_UNKNOWN = 0, > + D3D11_VDOV_DIMENSION_TEXTURE2D = 1 > +} D3D11_VDOV_DIMENSION; > + > +typedef struct D3D11_TEX2D_VDOV > +{ > + UINT ArraySlice; > +} D3D11_TEX2D_VDOV; > + > +typedef struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC > +{ > + GUID DecodeProfile; > + D3D11_VDOV_DIMENSION ViewDimension; > + > + union > + { > + D3D11_TEX2D_VDOV Texture2D; > + }; > +} D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC; > + > +[ > + object, > + local, > + uuid(c2931aea-2a85-4f20-860f-fba1fd256e18) > +] > +interface ID3D11VideoDecoderOutputView : ID3D11View > +{ > + void GetDesc( [out] D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc); > +} > + > +typedef struct D3D11_VIDEO_PROCESSOR_STREAM > +{ > + BOOL Enable; > + UINT OutputIndex; > + UINT InputFrameOrField; > + UINT PastFrames; > + UINT FutureFrames; > + ID3D11VideoProcessorInputView **ppPastSurfaces; > + ID3D11VideoProcessorInputView *pInputSurface; > + ID3D11VideoProcessorInputView **ppFutureSurfaces; > + ID3D11VideoProcessorInputView **ppPastSurfacesRight; > + ID3D11VideoProcessorInputView *pInputSurfaceRight; > + ID3D11VideoProcessorInputView **ppFutureSurfacesRight; > +} D3D11_VIDEO_PROCESSOR_STREAM; > + > +[ > + object, > + local, > + uuid(61f21c45-3c0e-4a74-9cea-67100d9ad5e4) > +] > +interface ID3D11VideoContext : ID3D11DeviceChild > +{ > + HRESULT GetDecoderBuffer( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] D3D11_VIDEO_DECODER_BUFFER_TYPE Type, > + [out] UINT *pBufferSize, > + [out] void **ppBuffer); > + HRESULT ReleaseDecoderBuffer( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] D3D11_VIDEO_DECODER_BUFFER_TYPE Type); > + HRESULT DecoderBeginFrame( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] ID3D11VideoDecoderOutputView *pView, > + [in] UINT ContentKeySize, > + [in] const void *pContentKey); > + HRESULT DecoderEndFrame( > + [in] ID3D11VideoDecoder *pDecoder); > + HRESULT SubmitDecoderBuffers( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] UINT NumBuffers, > + [in] const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc); > + HRESULT DecoderExtension( > + [in] ID3D11VideoDecoder *pDecoder, > + [in] const D3D11_VIDEO_DECODER_EXTENSION *pExtensionData); > + void VideoProcessorSetOutputTargetRect( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] BOOL Enable, > + [in] const RECT *pRect); > + void VideoProcessorSetOutputBackgroundColor( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] BOOL YCbCr, > + [in] const D3D11_VIDEO_COLOR *pColor); > + void VideoProcessorSetOutputColorSpace( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); > + void VideoProcessorSetOutputAlphaFillMode( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE AlphaFillMode, > + [in] UINT StreamIndex); > + void VideoProcessorSetOutputConstriction( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] BOOL Enable, > + [in] SIZE Size); > + void VideoProcessorSetOutputStereoMode( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] BOOL Enable); > + HRESULT VideoProcessorSetOutputExtension( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] const GUID *pExtensionGuid, > + [in] UINT DataSize, > + [in] void *pData); > + void VideoProcessorGetOutputTargetRect( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [out] BOOL *Enabled, > + [out] RECT *pRect); > + void VideoProcessorGetOutputBackgroundColor( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [out] BOOL *pYCbCr, > + [out] D3D11_VIDEO_COLOR *pColor); > + void VideoProcessorGetOutputColorSpace( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [out] D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); > + void VideoProcessorGetOutputAlphaFillMode( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [out] D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE *pAlphaFillMode, > + [out] UINT *pStreamIndex); > + void VideoProcessorGetOutputConstriction( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [out] BOOL *pEnabled, > + [out] SIZE *pSize); > + void VideoProcessorGetOutputStereoMode( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [out] BOOL *pEnabled); > + HRESULT VideoProcessorGetOutputExtension( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] const GUID *pExtensionGuid, > + [in] UINT DataSize, > + [out] void *pData); > + void VideoProcessorSetStreamFrameFormat( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] D3D11_VIDEO_FRAME_FORMAT FrameFormat); > + void VideoProcessorSetStreamColorSpace( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); > + void VideoProcessorSetStreamOutputRate( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] D3D11_VIDEO_PROCESSOR_OUTPUT_RATE OutputRate, > + [in] BOOL RepeatFrame, > + [in] const DXGI_RATIONAL *pCustomRate); > + void VideoProcessorSetStreamSourceRect( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable, > + [in] const RECT *pRect); > + void VideoProcessorSetStreamDestRect( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable, > + [in] const RECT *pRect); > + void VideoProcessorSetStreamAlpha( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable, > + [in] FLOAT Alpha); > + void VideoProcessorSetStreamPalette( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] UINT Count, > + [in] const UINT *pEntries); > + void VideoProcessorSetStreamPixelAspectRatio( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable, > + [in] const DXGI_RATIONAL *pSourceAspectRatio, > + [in] const DXGI_RATIONAL *pDestinationAspectRatio); > + void VideoProcessorSetStreamLumaKey( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable, > + [in] FLOAT Lower, > + [in] FLOAT Upper); > + void VideoProcessorSetStreamStereoFormat( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable, > + [in] D3D11_VIDEO_PROCESSOR_STEREO_FORMAT Format, > + [in] BOOL LeftViewFrame0, > + [in] BOOL BaseViewFrame0, > + [in] D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE FlipMode, > + [in] int MonoOffset); > + void VideoProcessorSetStreamAutoProcessingMode( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable); > + void VideoProcessorSetStreamFilter( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] D3D11_VIDEO_PROCESSOR_FILTER Filter, > + [in] BOOL Enable, > + [in] int Level); > + HRESULT VideoProcessorSetStreamExtension( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] const GUID *pExtensionGuid, > + [in] UINT DataSize, > + [in] void *pData); > + void VideoProcessorGetStreamFrameFormat( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] D3D11_VIDEO_FRAME_FORMAT *pFrameFormat); > + void VideoProcessorGetStreamColorSpace( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); > + void VideoProcessorGetStreamOutputRate( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] D3D11_VIDEO_PROCESSOR_OUTPUT_RATE *pOutputRate, > + [out] BOOL *pRepeatFrame, > + [out] DXGI_RATIONAL *pCustomRate); > + void VideoProcessorGetStreamSourceRect( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnabled, > + [out] RECT *pRect); > + void VideoProcessorGetStreamDestRect( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnabled, > + [out] RECT *pRect); > + void VideoProcessorGetStreamAlpha( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnabled, > + [out] FLOAT *pAlpha); > + void VideoProcessorGetStreamPalette( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] UINT Count, > + [out] UINT *pEntries); > + void VideoProcessorGetStreamPixelAspectRatio( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnabled, > + [out] DXGI_RATIONAL *pSourceAspectRatio, > + [out] DXGI_RATIONAL *pDestinationAspectRatio); > + void VideoProcessorGetStreamLumaKey( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnabled, > + [out] FLOAT *pLower, > + [out] FLOAT *pUpper); > + void VideoProcessorGetStreamStereoFormat( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnable, > + [out] D3D11_VIDEO_PROCESSOR_STEREO_FORMAT *pFormat, > + [out] BOOL *pLeftViewFrame0, > + [out] BOOL *pBaseViewFrame0, > + [out] D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE *pFlipMode, > + [out] int *MonoOffset); > + void VideoProcessorGetStreamAutoProcessingMode( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnabled); > + void VideoProcessorGetStreamFilter( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] D3D11_VIDEO_PROCESSOR_FILTER Filter, > + [out] BOOL *pEnabled, > + [out] int *pLevel); > + HRESULT VideoProcessorGetStreamExtension( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] const GUID *pExtensionGuid, > + [in] UINT DataSize, > + [out] void *pData); > + HRESULT VideoProcessorBlt( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] ID3D11VideoProcessorOutputView *pView, > + [in] UINT OutputFrame, > + [in] UINT StreamCount, > + [in] const D3D11_VIDEO_PROCESSOR_STREAM *pStreams); > + HRESULT NegotiateCryptoSessionKeyExchange( > + [in] ID3D11CryptoSession *pCryptoSession, > + [in] UINT DataSize, > + [in,out] void *pData); > + void EncryptionBlt( > + [in] ID3D11CryptoSession *pCryptoSession, > + [in] ID3D11Texture2D *pSrcSurface, > + [in] ID3D11Texture2D *pDstSurface, > + [in] UINT IVSize, > + [in,out] void *pIV); > + void DecryptionBlt( > + [in] ID3D11CryptoSession *pCryptoSession, > + [in] ID3D11Texture2D *pSrcSurface, > + [in] ID3D11Texture2D *pDstSurface, > + [in] D3D11_ENCRYPTED_BLOCK_INFO *pEncryptedBlockInfo, > + [in] UINT ContentKeySize, > + [in] const void *pContentKey, > + [in] UINT IVSize, > + [in,out] void *pIV); > + void StartSessionKeyRefresh( > + [in] ID3D11CryptoSession *pCryptoSession, > + [in] UINT RandomNumberSize, > + [out] void *pRandomNumber); > + void FinishSessionKeyRefresh( > + [in] ID3D11CryptoSession *pCryptoSession); > + HRESULT GetEncryptionBltKey( > + [in] ID3D11CryptoSession *pCryptoSession, > + [in] UINT KeySize, > + [out] void *pReadbackKey); > + HRESULT NegotiateAuthenticatedChannelKeyExchange( > + [in] ID3D11AuthenticatedChannel *pChannel, > + [in] UINT DataSize, > + [in,out] void *pData); > + HRESULT QueryAuthenticatedChannel( > + [in] ID3D11AuthenticatedChannel *pChannel, > + [in] UINT InputSize, > + [in] const void *pInput, > + [in] UINT OutputSize, > + [out] void *pOutput); > + HRESULT ConfigureAuthenticatedChannel( > + [in] ID3D11AuthenticatedChannel *pChannel, > + [in] UINT InputSize, > + [in] const void *pInput, > + [out] D3D11_AUTHENTICATED_CONFIGURE_OUTPUT *pOutput); > + void VideoProcessorSetStreamRotation( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [in] BOOL Enable, > + [in] D3D11_VIDEO_PROCESSOR_ROTATION Rotation); > + void VideoProcessorGetStreamRotation( > + [in] ID3D11VideoProcessor *pVideoProcessor, > + [in] UINT StreamIndex, > + [out] BOOL *pEnable, > + [out] D3D11_VIDEO_PROCESSOR_ROTATION *pRotation); > +} > + > +[ > + object, > + local, > + uuid(31627037-53ab-4200-9061-05faa9ab45f9) > +] > +interface ID3D11VideoProcessorEnumerator : ID3D11DeviceChild > +{ > + HRESULT GetVideoProcessorContentDesc( > + [out] D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pContentDesc); > + HRESULT CheckVideoProcessorFormat( > + [in] DXGI_FORMAT Format, > + [out] UINT *pFlags); > + HRESULT GetVideoProcessorCaps( > + [out] D3D11_VIDEO_PROCESSOR_CAPS *pCaps); > + HRESULT GetVideoProcessorRateConversionCaps( > + [in] UINT TypeIndex, > + [out] D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps); > + HRESULT GetVideoProcessorCustomRate( > + [in] UINT TypeIndex, > + [in] UINT CustomRateIndex, > + [out] D3D11_VIDEO_PROCESSOR_CUSTOM_RATE *pRate); > + HRESULT GetVideoProcessorFilterRange( > + [in] D3D11_VIDEO_PROCESSOR_FILTER Filter, > + [out] D3D11_VIDEO_PROCESSOR_FILTER_RANGE *pRange); > +} > + > +[ > + object, > + local, > + uuid(10ec4d5b-975a-4689-b9e4-d0aac30fe333) > +] > +interface ID3D11VideoDevice : IUnknown > +{ > + HRESULT CreateVideoDecoder( > + [in] const D3D11_VIDEO_DECODER_DESC *pVideoDesc, > + [in] const D3D11_VIDEO_DECODER_CONFIG *pConfig, > + [out] ID3D11VideoDecoder **ppDecoder); > + HRESULT CreateVideoProcessor( > + [in] ID3D11VideoProcessorEnumerator *pEnum, > + [in] UINT RateConversionIndex, > + [out] ID3D11VideoProcessor **ppVideoProcessor); > + HRESULT CreateAuthenticatedChannel( > + [in] D3D11_AUTHENTICATED_CHANNEL_TYPE ChannelType, > + [out] ID3D11AuthenticatedChannel **ppAuthenticatedChannel); > + HRESULT CreateCryptoSession( > + [in] const GUID *pCryptoType, > + [in] const GUID *pDecoderProfile, > + [in] const GUID *pKeyExchangeType, > + [out] ID3D11CryptoSession **ppCryptoSession); > + HRESULT CreateVideoDecoderOutputView( > + [in] ID3D11Resource *pResource, > + [in] const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc, > + [out] ID3D11VideoDecoderOutputView **ppVDOVView); > + HRESULT CreateVideoProcessorInputView( > + [in] ID3D11Resource *pResource, > + [in] ID3D11VideoProcessorEnumerator *pEnum, > + [in] const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC *pDesc, > + [out] ID3D11VideoProcessorInputView **ppVPIView); > + HRESULT CreateVideoProcessorOutputView( > + [in] ID3D11Resource *pResource, > + [in] ID3D11VideoProcessorEnumerator *pEnum, > + [in] const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC *pDesc, > + [out] ID3D11VideoProcessorOutputView **ppVPOView); > + HRESULT CreateVideoProcessorEnumerator( > + [in] const D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pDesc, > + [out] ID3D11VideoProcessorEnumerator **ppEnum); > + UINT GetVideoDecoderProfileCount(void); > + HRESULT GetVideoDecoderProfile( > + [in] UINT Index, > + [out] GUID *pDecoderProfile); > + HRESULT CheckVideoDecoderFormat( > + [in] const GUID *pDecoderProfile, > + [in] DXGI_FORMAT Format, > + [out] BOOL *pSupported); > + HRESULT GetVideoDecoderConfigCount( > + [in] const D3D11_VIDEO_DECODER_DESC *pDesc, > + [out] UINT *pCount); > + HRESULT GetVideoDecoderConfig( > + [in] const D3D11_VIDEO_DECODER_DESC *pDesc, > + [in] UINT Index, > + [out] D3D11_VIDEO_DECODER_CONFIG *pConfig); > + HRESULT GetContentProtectionCaps( > + [in] const GUID *pCryptoType, > + [in] const GUID *pDecoderProfile, > + [out] D3D11_VIDEO_CONTENT_PROTECTION_CAPS *pCaps); > + HRESULT CheckCryptoKeyExchange( > + [in] const GUID *pCryptoType, > + [in] const GUID *pDecoderProfile, > + [in] UINT Index, > + [out] GUID *pKeyExchangeType); > + HRESULT SetPrivateData( > + [in] REFGUID guid, > + [in] UINT DataSize, > + [in] const void *pData); > + HRESULT SetPrivateDataInterface( > + [in] REFGUID guid, > + [in] const IUnknown *pData); > +} > + > typedef enum D3D11_CREATE_DEVICE_FLAG { > - D3D11_CREATE_DEVICE_SINGLETHREADED = 0x0001, > - D3D11_CREATE_DEVICE_DEBUG = 0x0002, > - D3D11_CREATE_DEVICE_SWITCH_TO_REF = 0x0004, > - D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x0008, > - D3D11_CREATE_DEVICE_BGRA_SUPPORT = 0x0020, > - D3D11_CREATE_DEVICE_DEBUGGABLE = 0x0040, > + D3D11_CREATE_DEVICE_SINGLETHREADED = 0x0001, > + D3D11_CREATE_DEVICE_DEBUG = 0x0002, > + D3D11_CREATE_DEVICE_SWITCH_TO_REF = 0x0004, > + D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x0008, > + D3D11_CREATE_DEVICE_BGRA_SUPPORT = 0x0020, > + D3D11_CREATE_DEVICE_DEBUGGABLE = 0x0040, > D3D11_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY = 0x0080, > - D3D11_CREATE_DEVICE_DISABLE_GPU_TIMEOUT = 0x0100, > - D3D11_CREATE_DEVICE_VIDEO_SUPPORT = 0x0800 > + D3D11_CREATE_DEVICE_DISABLE_GPU_TIMEOUT = 0x0100, > + D3D11_CREATE_DEVICE_VIDEO_SUPPORT = 0x0800 > } D3D11_CREATE_DEVICE_FLAG; > > const UINT D3D11_SDK_VERSION = 7; > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVUHHsAAoJEN0/YqbEcdMwt5IP/RQUorEad9xeKijd+ylUAZNH k9W6EpbcMUcwd8bWEE95XQadiG+NQ/IpQDrVAanqX8yW5rA9ldfVZmX5AzgQDY1b 2+z6DZ41S8AqUQFkjakJmlAJu9KAEh+jbDFEl5742ZRu0XARF1cQkJ8tDuNKOmUY dPetkbiPVNoP3wbfTr5PaQD5Ti4IgzkoPXP2ZEnLw//BGbqvj8zODN3KEEPrXW4X Vx9lGihijOiSbCs225sBCA9gV5qGdtAZaDRaYBhcBhssL79/zfe+IhRgSlFDfN9G DVu7MhCbJpC4ZhMiJq7XwywBFDFmRKRJ6ppOi5luUHOuowooG1OV71j+zkiTcId0 xkKiwz7hvRn634rbP8MO7jShVGJczYJRCECNYa8UcIz1IFJm/jas1lj3fNt0mZlw DWzOv5MxvNVyI61IgQs2kgJhOjKmya62Wsz1f7W4TFWazMg2/QKN4K97P2GH3B4L sypDv7Zgszds4kZDnihVzbJY115XlrbEEjyC2/wTzLr07ThwaFQGs1xlOkIYFiJY GrRdouYJlfGmg1vCV7BOgNkeQrOdEXWOgmD9lw3cDWqnBMvabVBPYWPUGk62yzNQ F9o0hktsMOAN+eHqD1kH5EcZX5qICIb+ys0SWWpROAkfnS3cbJfdBHeNYiRAFMfZ TVNEg78wDgXDA8MmxhAQ =efTb -----END PGP SIGNATURE-----

2 1

Re: [PATCH] add the interfaces necessary to use the D3D11 video decoder
by Matteo Bruni 11 May '15

11 May '15

2015-05-08 9:03 GMT+02:00 Steve Lhomme <robux4(a)videolabs.io>: > Anyone has anything to say about this ? > > Thanks > > On Tue, May 5, 2015 at 1:52 PM, Steve Lhomme <robux4(a)videolabs.io> wrote: >> This is needed by VLC. Hi Steve, some parts of the patch are clearly copypasted from the MS idl, which is a deal breaker. While rewriting those parts try to use the wined3d style, like putting the '*' next to the variable instead of the type. Another potential issue (noticed by Henri) is that D3D11_VIDEO_PROCESSOR_COLOR_SPACE uses bitfields which aren't generally portable. I don't know if their implementation on Windows is compatible with the one used by the OSs and architectures we support. If that's not the case then we have a problem...

2 1

Re: [PATCH 5/5] shell32: Implement FolderItemVerbs::Item()
by Marvin 10 May '15

10 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13306 Your paranoid android. === wxppro (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\winetest\\Local Settings\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7CB87106 === w2003std (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\Administrator\\Local Settings\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7CAA259F === wvistau64 (32 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 75C4B510 === w2008s64 (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7522B578 === w7u (32 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 76C263C4 === wvistau64 (64 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 000007FEFEA52BD9 === w2008s64 (64 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 000007FEFE352A7D

1 0

Re: [PATCH 3/5] shell32: Implement FolderItemVerbs_get_Count()
by Marvin 10 May '15

10 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13305 Your paranoid android. === wxppro (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\winetest\\Local Settings\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7CB87106 === w2003std (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\Administrator\\Local Settings\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7CAA259F === wvistau64 (32 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 75C4B510 === w2008s64 (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7522B578 === w7u (32 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 76C263C4 === wvistau64 (64 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 000007FEFEA52BD9 === w2008s64 (64 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 000007FEFE352A7D

1 0

Re: [PATCH 2/5] shell32: Added FolderItemVerbs stub
by Marvin 10 May '15

10 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13304 Your paranoid android. === wxppro (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\winetest\\Local Settings\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7CB87106 === w2003std (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\Administrator\\Local Settings\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7CAA259F === wvistau64 (32 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 75C4B510 === w2008s64 (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 7522B578 === w7u (32 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 76C263C4 === wvistau64 (64 bit shelldispatch) === shelldispatch: unhandled exception c0000005 at 000007FEFEA52BD9 === w2008s64 (64 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra" shelldispatch: unhandled exception c0000005 at 000007FEFE352A7D

1 0

Re: [PATCH 1/5] shell32: Implement ParseName()
by Marvin 10 May '15

10 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13303 Your paranoid android. === wxppro (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\winetest\\Local Settings\\Temp\\cadabra" === w2003std (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Documents and Settings\\Administrator\\Local Settings\\Temp\\cadabra" === w2008s64 (32 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra" === w2008s64 (64 bit shelldispatch) === shelldispatch.c:737: Test failed: path L"C:\\Users\\Administrator\\AppData\\Local\\Temp\\cadabra"

1 0

WineTest log size
by Francois Gouget 08 May '15

08 May '15

TL;DR: The todo below generates more than 90 KB of test report data. It would be really nice to fix it. storage32.c:3401: todo_wine ok(failed == expect_failed, "open with byte %x locked, mode %x %s but should %s\n", Some of my WineTest reports went over the 1.5MB limit again and while the issue was not what I initially thought, I wrote a script (see attachment) to slice and dice them to figure out who contributes what. Lines Bytes Category 1530 114848 9 traces generating >= 5120 bytes each 1842 106511 33 traces generating 2048 - 5119 bytes each 7020 358649 2221 traces generating < 2048 bytes each 2071 180266 9 todos generating >= 5120 bytes each 842 67746 20 todos generating 2048 - 5119 bytes each 4622 329705 2894 todos generating < 2048 bytes each 170 15372 Test failed 2787 144801 Others -------------------- 20884 1317898 Total Traces are easy to deal with so I've sent some patches. We'll see how it goes. The todos are much harder as they require fixing Wine. Still, if we manage to fix the top 9 we'll save around 180 KB. The next 66 KB require fixing 20 more todos, which is still somewhat plausible, but it gets hopeless after that. The 'Others' category corresponds to the report header with the dlls list, and to the per test summaries. So we're looking at minimum report size of 813 KB, but in practice we're unlikely to get below 1 MB. Here are the top 20 traces and todos: $ dupcount --traces *.report | head -n 20 Lines Chars Match 296 31777 font.c:3711: # Patch pending 339 20378 protocol.c:765: # Patch pending 143 14471 ddrawmodes.c:369: # Patch pending 171 9576 loader.c:1414: # Patch pending 226 9121 clipboard.c:154: # Patch pending 90 9050 ddrawmodes.c:340: # Patch pending 105 7875 istream.c:486: # Patch pending 82 7444 win.c:82: 78 5156 button.c:588: 85 5015 shlview.c:59: 145 4785 locale.c:3296: # Patch pending 131 4716 protocol.c:583: # Patch pending 54 4539 http.c:428: 56 4300 metafile.c:1736: 75 4050 locale.c:3215: # Patch pending 145 3936 locale.c:3190: # Patch pending 57 3846 msg.c:11475: 98 3626 clipboard.c:132: # Patch pending 48 3574 metafile.c:504: $ dupcount -e '^[^:]*:[0-9]*: Test marked todo*:' *.report | head -n 20 Lines Chars Match 902 93357 storage32.c:3401: Test marked todo: 296 21312 sock.c:2741: Test marked todo: 256 18176 virtual.c:3350: Test marked todo: 256 14592 ebrowser.c:1742: Test marked todo: 110 8405 shlexec.c:1472: Test marked todo: 22 6530 shlexec.c:1462: Test marked todo: 74 6395 font.c:3789: Test marked todo: 92 6074 propvariant.c:169: Test marked todo: 63 5425 font.c:3781: Test marked todo: 63 4788 file.c:4209: Test marked todo: 63 4714 file.c:4207: Test marked todo: 29 4569 dib.c:1322: Test marked todo: 64 4504 graphics.c:3686: Test marked todo: 64 4432 graphics.c:3657: Test marked todo: 64 4432 graphics.c:3674: Test marked todo: 54 4042 saxreader.c:2393: Test marked todo: 42 3982 qcap.c:337: Test marked todo: 38 3834 saxreader.c:2489: Test marked todo: 25 3764 batch.c:312: Test marked todo: -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Indifference will certainly be the downfall of mankind, but who cares?

2 1

Re: gdi32/tests: Silence some font traces that generate too many lines.
by Marvin 08 May '15

08 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13293 Your paranoid android. === wvistau64 (32 bit font) === The test timed out

1 0

Re: [PATCH] add the interfaces necessary to use the D3D11 video decoder
by Qian Hong 08 May '15

08 May '15

Hi Steve, On Fri, May 8, 2015 at 3:03 PM, Steve Lhomme <robux4(a)videolabs.io> wrote: > Anyone has anything to say about this ? Thanks for your contribution, glad to see VLC people! I'm not the right person to ack your patch, but I can help to point out a few tiny formatting issues: - The patch title could be rename to "include: Add D3D11 video decoder interfaces" Here is an example of this stile of patch title: `git show e35f82665cfdb40231c2e0a8a41c81642273160d` - There are a couple of trailing spaces in the code which should be removed, for example: 94 + UINT NumEncryptedBytesAtBeginning;<spaces> 176 +typedef struct D3D11_VIDEO_PROCESSOR_CUSTOM_RATE<space> and about 90+ more lines with trailing spaces. Could you fix that and resubmit? Thanks! -- Regards, Qian Hong - http://www.winehq.org

1 0

[PATCH 1/2] cmd/tests: Add tests for console InsertMode
by Hugh McMaster 07 May '15

07 May '15

Alexandre, What changes to you want to see for my InsertMode tests to be committed? http://source.winehq.org/patches/data/111149 Thanks, Hugh -- Hugh McMaster

1 0

Re: winecfg: add all Windows versions and accompanying error message (try 5)
by Jason Overland 06 May '15

06 May '15

Is there anything I can do to improve this patch? Thanks, Jason On 04/30/2015 01:56 PM, Jason Overland wrote: > This supercedes winecfg: add all Windows versions and accompanying error message (try 4). > > Changes since try 4: > > Windows versions that are unavailable in 64 bit prefixes now have a different text in the combobox saying as such. They still display an error dialog if the user tries to select them.

1 0

Re: user32: After handling an internal message give a chance to real message to arrive.
by Alexandre Julliard 06 May '15

06 May '15

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -2931,7 +2931,10 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags > else > peek_message( msg, info.msg.hwnd, info.msg.message, > info.msg.message, flags | PM_REMOVE, changed_mask ); > - continue; > + > + /* give a chance to real message to arrive */ > + HeapFree( GetProcessHeap(), 0, buffer ); > + return FALSE; Why do you need to leave the function instead of checking for further messages? What is the issue you are seeing? -- Alexandre Julliard julliard(a)winehq.org

2 17

Wine Joysticks, seeking a plan
by Aric Stewart 06 May '15

06 May '15

Hi all, Ok I sat down with Ken (the benefits of being in the same office) and after a lengthy discussion I have come to terms with how it may not be the most ideal plan to put the joystick driver into the graphics driver. However I am still of the strong opinion that we need some sort of better joystick architecture and I know Alexandre is also of the like mindset. This was discussed back on 2005 and I know there was also recent discussion around BSD that also involves this. I also have an itch to start to poke at xinput, but I have no interest in poking at xinput with the current way joysticks are handled. When I was working on this driver thing Alexandre expressed he was pretty opposed to having a whole new set of platform specific wine drivers. (winejoystick_mac, winejoystick_linux, etc...) But if we at least did that we would reduce code duplication by not having the platform specific code duplicated in 2 (with xinput it would become 3) places and have it collected in one place. Now completely unresearched but it may be possible to make a single joystick driver, maybe replacing winejoystick.drv that would build only the platform code that is relevant. but before I do another big chunk of work I am seeking some community buy-in and not just discuss with with Alexandre. I understand if the USB driver path gets actually fleshed out and we try to support Joysticks via that then all this separate driver work would fall away and be replaced. We of course need to make sure we come up with a plan that Alexandre will approve of. Would a replacement winejoystick.drv that holds all the platform specific code be acceptable? Is there a case where we would want that driver to be able to build multiple platform code? Maybe Linux and Linux Input? I will admit I am pretty ignorant of the Linux side of this whole situation. Ideas? Comments? thanks! -aric

7 9

Re: [PATCH 1/2] shell32: Implement Application property of IShellFolderViewDual
by Marvin 06 May '15

06 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13252 Your paranoid android. === wxppro (32 bit shelldispatch) === shelldispatch.c:389: Test failed: unexpected type guid {efd84b2d-4bcf-4298-be25-eb542a59fbda} === w2003std (32 bit shelldispatch) === shelldispatch.c:389: Test failed: unexpected type guid {efd84b2d-4bcf-4298-be25-eb542a59fbda}

1 0

Re: (resend) server: fixup input windows on thread_detach
by Alexandre Julliard 05 May '15

05 May '15

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -637,7 +637,7 @@ DECL_HANDLER(set_thread_desktop) > if (!current->process->desktop) > set_process_default_desktop( current->process, new_desktop, req->handle ); > > - if (old_desktop != new_desktop && current->queue) detach_thread_input( current ); > + if (old_desktop != new_desktop && current->queue) detach_thread_input( current, NULL ); You should also update the thread input in that case. There's no reason to require a specific thread for this. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/5] ddraw/tests: Add a ddraw2 specular lighting test.
by Marvin 04 May '15

04 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13219 Your paranoid android. === build (build) === Make failed

2 1

Re: [PATCH 2/4] wined3d: Keep track of renderbuffer capabilities.
by Henri Verbeet 04 May '15

04 May '15

On 30 April 2015 at 00:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 36be539..ad9b496 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -4095,7 +4095,7 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in > BYTE redSize, greenSize, blueSize, alphaSize, colorBits; > > /* Float formats need FBOs. If FBOs are used this function isn't called */ > - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) > + if (format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_FLOAT) That's not wrong as such, but it is pretty arbitrary. WINED3DFMT_FLAG_FLOAT is a basic property of the format, like e.g. the component masks and sizes, it shouldn't depend on the resource type. Once we'll get proper integer types for d3d10, it will probably make sense to keep track of the type (INT/UINT/FLOAT/UNORM/SNORM) as an enumeration instead, perhaps even per-component. > @@ -4178,8 +4178,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, > ds_format = wined3d_get_format(&adapter->gl_info, depth_stencil_format_id); > if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) > { > - if ((rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET) > - && (ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) > + if ((rt_format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_RENDERTARGET) > + && (ds_format->flags[WINED3D_GL_RES_TYPE_RB] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) This is actually wrong. At least, as long as we don't allow (plain) renderbuffers to be used for FBO attachments. There's nothing in the spec that says formats that can be used for color rendering with renderbuffers have to be available for color rendering with textures as well, and in fact that's much of the reason for this patch set. > @@ -998,9 +998,9 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined > break; > > case WINED3D_BLIT_OP_DEPTH_BLIT: > - if (!(src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) > + if (!(src_format->flags[WINED3D_GL_RES_TYPE_RB] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) Similar to WINED3DFMT_FLAG_FLOAT, these are basic properties of the format.

2 4

Re: server: fixup input windows on thread_detach
by Alexandre Julliard 04 May '15

04 May '15

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -1075,6 +1075,27 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) > return ret; > } > > +/* ensure the input data is correct for the thread after detach */ > +void correct_thread_input( struct thread *thread_from ) > +{ > + if (thread_from->queue) > + { > + struct thread *thread; > + if (thread_from->queue->input->focus) > + { > + thread = get_window_thread( thread_from->queue->input->focus ); > + if (thread != thread_from) thread_from->queue->input->focus = 0; > + release_object( thread ); > + } > + if (thread_from->queue->input->active) > + { > + thread = get_window_thread( thread_from->queue->input->active ); > + if (thread != thread_from) thread_from->queue->input->active = 0; > + release_object( thread ); > + } > + } > +} This needs to be done inside detach_thread_input so that it happens for all callers. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: ws2_32: Properly handle closing sockets during a select call.
by Marvin 04 May '15

04 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13205 Your paranoid android. === wxppro (32 bit sock) === sock: unhandled exception c0000005 at C0000241

1 0

Re: [2/3] ntdll: Introduce a helper function to check for existance of server handles.
by Alexandre Julliard 04 May '15

04 May '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -1417,6 +1417,7 @@ > # Server interface > @ cdecl -norelay wine_server_call(ptr) > @ cdecl wine_server_fd_to_handle(long long long ptr) > +@ cdecl wine_server_handle_exists(long long) > @ cdecl wine_server_handle_to_fd(long long ptr ptr) > @ cdecl wine_server_release_fd(long long) > @ cdecl wine_server_send_fd(long) Why do you need a new export for this? Is it just to avoid a dup() call or is there another reason? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: jscript: Date.parse: long date with '/' or '-' (try2)
by Marvin 04 May '15

04 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13202 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

libwine
by Theodore Dubois 04 May '15

04 May '15

Hi, I’ve been looking at the wine code, and wondering why all the initialization code is in libwine.so. I would think it would make more sense to put it in the wine executable itself. Any explanations? ~Theodore

1 0

Re: jscript: Date.parse: long date with '/' or '-' (try2)
by Marvin 03 May '15

03 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13201 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

2 1

Re: [PATCH 5/5] shell32: Better handle creation/destruction of shellview window
by Marvin 03 May '15

03 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13190 Your paranoid android. === wxppro (32 bit shlview) === shlview.c:573: Test failed: unexpected shlview.c:579: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:605: Test failed: unexpected === w2003std (32 bit shlview) === shlview.c:573: Test failed: unexpected shlview.c:579: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:605: Test failed: unexpected === wvistau64 (32 bit shlview) === shlview.c:573: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:605: Test failed: unexpected shlview.c:579: Test failed: unexpected shlview.c:579: Test failed: unexpected === w2008s64 (32 bit shlview) === shlview.c:573: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:605: Test failed: unexpected shlview.c:579: Test failed: unexpected shlview.c:579: Test failed: unexpected === wvistau64 (64 bit shlview) === shlview.c:573: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:605: Test failed: unexpected shlview.c:579: Test failed: unexpected shlview.c:579: Test failed: unexpected === w2008s64 (64 bit shlview) === shlview.c:573: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:586: Test failed: unexpected shlview.c:605: Test failed: unexpected shlview.c:579: Test failed: unexpected shlview.c:579: Test failed: unexpected

1 0

Re: [PATCH 4/5] explorer: Return IShellBrowser in response to SID_STopLevelBrowser
by Marvin 03 May '15

03 May '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13189 Your paranoid android. === wvistau64 (64 bit shelldispatch) === The test timed out

1 0

Re: [2/3] user32: Add some tests for EndDialog called from other thread.
by Marvin 30 Apr '15

30 Apr '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13148 Your paranoid android. === w7u (32 bit msg) === msg.c:12230: Test failed: unexpected hwnd 0014013C msg.c:12252: Test failed: bad time 314e6/314f6

1 0

Re: [1/3] user32/tests: Add a test for calling SetWindowPos for other thread window. Resend.
by Marvin 30 Apr '15

30 Apr '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13147 Your paranoid android. === w7u (32 bit msg) === msg.c:12230: Test failed: unexpected hwnd 0014013C msg.c:12252: Test failed: bad time 30ece/30ede

1 0

Re: [PATCH 2/5] d3d9/tests: Add a test for UpdateTexture. (v2, resend)
by Alexandre Julliard 30 Apr '15

30 Apr '15

Matteo Bruni <mbruni(a)codeweavers.com> writes: > v2: Make tests pass on the testbot, add a couple more test cases, some > small cleanups. It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M d3d9.dll -p d3d9_test.exe.so visual && touch visual.ok visual.c:12925: Tests skipped: No NVDB (depth bounds test) support, skipping tests. visual.c:16373: Tests skipped: DXT5 volume textures are not supported, skipping test. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 0, 1. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 0, 2. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 0, 3. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 0, 4. visual.c:18582: Test failed: Got unexpected color 0x0036c800, case 1, 1. visual.c:18582: Test failed: Got unexpected color 0x0036c800, case 1, 2. visual.c:18582: Test failed: Got unexpected color 0x0036c800, case 1, 3. visual.c:18582: Test failed: Got unexpected color 0x0036c800, case 1, 4. visual.c:18409: Tests skipped: Volume ATI2N textures are not supported, skipping some tests. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 2, 1. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 2, 2. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 2, 3. visual.c:18582: Test failed: Got unexpected color 0x0000ff00, case 2, 4. make: *** [visual.ok] Error 12 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/4] wined3d: Don't use depth textures without ARB_depth_texture.
by Henri Verbeet 30 Apr '15

30 Apr '15

On 30 April 2015 at 00:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + if (!gl_info->supported[ARB_DEPTH_TEXTURE]) > + { > + static const unsigned int depth_flags = WINED3DFMT_FLAG_SHADOW | WINED3DFMT_FLAG_DEPTH > + | WINED3DFMT_FLAG_STENCIL; > + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~depth_flags; > + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~depth_flags; > + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~depth_flags; > + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~depth_flags; > + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~depth_flags; > + } This is wrong for the reasons mentioned in patch 2/4, but it should also be unnecessary. WINED3DFMT_FLAG_TEXTURE is supposed to indicate if you can use a format for texturing or not.

1 0

Re: [PATCH 3/4] wined3d: Use renderbuffers if the resource type is RB.
by Henri Verbeet 30 Apr '15

30 Apr '15

On 30 April 2015 at 00:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -341,6 +341,8 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) > resource->draw_binding = WINED3D_LOCATION_DRAWABLE; > else if (resource->multisample_type) > resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; > + else if (resource->gl_type == WINED3D_GL_RES_TYPE_RB) > + resource->draw_binding = WINED3D_LOCATION_RB_RESOLVED; I haven't looked much into what actually happens now, but the last time I looked at using renderbuffers for FBO attachments, one of the issues that came up was the initial surface contents. Right now we handle that by clearing WINED3D_LOCATION_SYSMEM and marking it current, but that won't work so well for renderbuffers. Somewhat related, does WINED3DFMT_D16_LOCKABLE need special handling?

1 0

Re: [PATCH 1/4] wined3d: Allow specifying a different depth stencil location.
by Henri Verbeet 30 Apr '15

30 Apr '15

On 30 April 2015 at 00:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -2342,12 +2352,14 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win > ++i; > } > context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, > - wined3d_rendertarget_view_get_surface(fb->depth_stencil), > - rt_count ? rts[0]->resource->draw_binding : WINED3D_LOCATION_TEXTURE_RGB); > + wined3d_rendertarget_view_get_surface(dsv), > + rt_count ? rts[0]->resource->draw_binding : WINED3D_LOCATION_TEXTURE_RGB, > + dsv ? dsv->resource->draw_binding : WINED3D_LOCATION_TEXTURE_RGB); > } This works because we mostly just care that the color location isn't WINED3D_LOCATION_DRAWABLE if there's no attachment. (In particular for the case where the application is doing depth only rendering.) Strictly speaking though, it's probably more correct to use the color location if there's no depth/stencil attachment, to avoid silliness like the color attachment being in WINED3D_LOCATION_DRAWABLE and the depth/stencil attachment in WINED3D_LOCATION_TEXTURE_RGB. In fact, now that the color and depth/stencil locations are separate, you can probably just pass 0.

1 0

Re: [PATCH 5/5] wined3d: Don't use the same va_list multiple times in shader_vaddline().
by Henri Verbeet 30 Apr '15

30 Apr '15

On 29 April 2015 at 23:34, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > -static void string_buffer_vsprintf(struct wined3d_string_buffer *buffer, const char *format, va_list args) > +static int string_buffer_vsprintf(struct wined3d_string_buffer *buffer, const char *format, va_list args) > { > if (!buffer) > - return; > + return 0; > string_buffer_clear(buffer); > - shader_vaddline(buffer, format, args); > + return shader_vaddline(buffer, format, args); > } > You could perhaps just merge this into string_buffer_sprintf(), but I don't care that much.

1 0

Re: d3drm: Fix refcounting for IDirect3DRM{1-3}
by Stefan Dösinger 30 Apr '15

30 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-04-29 um 23:47 schrieb Aaryaman Vasishta: > - if (!refcount) > + if (!refcount && !InterlockedDecrement(&d3drm->numIfaces)) > HeapFree(GetProcessHeap(), 0, d3drm); This works, but this way you have the code that destroys the object 3 times. Not much of an issue as long as it is just a HeapFree, but I think it would be nicer to have a separate function. Either add a d3drm_destroy function or a pair of d3drm_add_iface and d3drm_release_iface functions that also take care of InterlockedIncrement / Decrement for iface_count) > - { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, > - { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, > + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, FALSE }, > + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, FALSE }, Afaics all the TODOs are gone, so you can remove this field from the table and the todo_wine code from test_qi(). Either in the same patch or a separate one. > - LONG ref; > + LONG ref1, ref2, ref3, numIfaces; > }; Please use iface_count. Yeah, it's just a plain style thing, but d3drm is nicely consistent so far in not using CamelCase (except in cases where Microsoft determined the name). (Yesterday on IRC I said num_ifaces. Henri says xxx_count is the way he prefers.) > + if (refcount == 1) InterlockedIncrement(&d3drm->numIfaces); Another minor style issue: Please put the statement on a separate line, in consistency with the existing code. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVQdzBAAoJEN0/YqbEcdMw5WAP/0H52sqgEXMdSmh6sXH/dZMQ nTZY9uRhElUbb3r6D6HG0ylit994pPaq887t9BSl8F4vbjsPXLjruDbVSwoScCfp rIDKy9xET+ek4p5TSFC9cX1BFAiC2VKN7YYWmr/wHKVPZc+aFudU9ykac02bi9p2 Oe+9wMBcFbwv33UhNL+2dugA4+0yj6egfPJWmju9C6ff6CPGqgXH70rHsrSf1AYs VkNPRhGpfI9BxojBChVtgc0zwPM1HnfOwfmKWCW75YNgNg9lL0o+bdoy2wCcxiLq FYwLLT2o9K+RnPQqRDhdJBKWwY8VrJI/fHZEURRau7RW1ia26j4UrrsAdXTQwhPs Iy8A63pYOxyZsphq5KJ8cwGABYIlBPUG0lXZQRgKh1Jw8f39HIR5cfnu1at/fPSc Cw6tfL/t+g4KeHaZDWZnROwyp704kIZGgvSaPuJjwkPtHh2MN14cp9KQj389kCUM 4KfV6FxsAByRuJ8ur1HSaV2OeIOKOJkaDTzaiiMqc581A0awOeCy5SuAUSrQu4IE 4gAIjryIJXd+kTDw46y6OW5UNXHdNJKGWAMiih25yLBi0BLBfUiW0U7qW5Lcerls e7zefeUYNT+Umj3WU4sDu6B8B6auSZgKrLu9JAwYH2RUhKX9R+z3uTY25VUbJkoP 9WJfJJuosIA5zqLbjxu+ =/BI/ -----END PGP SIGNATURE-----

2 1

Re: kernel32/tests: Add tests for deleting readonly files with NtCreateFile.
by Marvin 30 Apr '15

30 Apr '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13137 Your paranoid android. === wvistau64 (32 bit file) === file.c:444: Test failed: attributes of file "testfile.xxx" are 0x0820 === w7u (32 bit file) === file.c:4052: Test failed: SetFileValidData failed 87 file.c:4055: Test failed: SetFileValidData failed 87 === wvistau64 (64 bit file) === file.c:444: Test failed: attributes of file "testfile.xxx" are 0x0820

1 0

Re: [3/3] ws2_32: Properly handle closing sockets during a select call.
by Marvin 30 Apr '15

30 Apr '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13135 Your paranoid android. === w2008s64 (64 bit sock) === No test summary line found

1 0

Re: shell32: Add caption to run dialog (resend)
by Alex Henrie 30 Apr '15

30 Apr '15

Thanks for your interest in developing Wine! A few pointers: You are supposed to use your name when submitting patches. I don't think Alexandre will accept just your initials. Also, you should avoid putting all that HTML garbage into the patch by using `git format-patch` and `git send-email`. If you cannot use git send-email, send the patch as an attachment. Please read http://wiki.winehq.org/SubmittingPatches Finally, your patch is more likely to be accepted if you can give an example of a Windows program that demonstrates the problem you're trying to fix. -Alex

1 0

Re: [PATCH 2/5] ddraw: Release the surface clipper (if any) in ddraw_surface_wined3d_object_destroyed() (Valgrind).
by Marvin 29 Apr '15

29 Apr '15

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=13125 Your paranoid android. === w8 (32 bit ddraw1) === ddraw1.c:1373: Test failed: Expected color 0x00ff0000 for test 0, got 0x0000ff00. ddraw1.c:1392: Test failed: Expected color 0x000000ff for test 0, got 0x0000ff00. ddraw1.c:6666: Test failed: Got unexpected color 0x000000ff. ddraw1.c:6670: Test failed: Got unexpected color 0x00000080.

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel