February 2019 - Wine-devel - list.winehq.org

[PATCH 3/3] [wmvcore] add tests for WMCreateSyncReader
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/tests/wmvcore.c | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index af6d32a78e..ebeab3ff46 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -201,6 +202,91 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } +static void test_wmsyncreader_interfaces(void) +{ + HRESULT hr; + IWMSyncReader *reader; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderTimecode *timecode; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + + hr = WMCreateSyncReader( NULL, 0, &reader ); + todo_wine ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + skip("Failed to create IWMSyncReader\n"); + return; + } + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(profile) + IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + + + IWMSyncReader_Release(reader); +} + + static void test_profile_manager_interfaces(void) { HRESULT hr; @@ -262,6 +348,7 @@ START_TEST(wmvcore) return; test_wmreader_interfaces(); + test_wmsyncreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); -- 2.21.0

1 0

[PATCH 2/2] [include] add missing IWMSyncReader2 interfaces
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/wmsdkidl.idl | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index bb7bfee4f8..1a0b3e4a29 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -209,6 +209,14 @@ typedef struct _WMStreamPrioritizationRecord WORD wStreamNumber; BOOL fMandatory; } WM_STREAM_PRIORITY_RECORD; + +typedef struct _WMT_TIMECODE_EXTENSION_DATA +{ + WORD wRange; + DWORD dwTimecode; + DWORD dwUserbits; + DWORD dwAmFlags; +} WMT_TIMECODE_EXTENSION_DATA; #include <poppack.h> typedef struct _WM_PORT_NUMBER_RANGE @@ -1056,6 +1064,69 @@ interface IWMSyncReader : IUnknown [in] IStream *pStream); } +[ + object, + uuid(9f762fa7-a22e-428d-93c9-ac82f3aafe5a), + pointer_default( unique ), + local +] +interface IWMReaderAllocatorEx : IUnknown +{ + HRESULT AllocateForStreamEx( + [in] WORD wStreamNum, + [in] DWORD cbBuffer, + [out] INSSBuffer **ppBuffer, + [in] DWORD dwFlags, + [in] QWORD cnsSampleTime, + [in] QWORD cnsSampleDuration, + [in] void *pvContext); + + HRESULT AllocateForOutputEx( + [in] WORD wOutputNum, + [in] DWORD cbBuffer, + [out] INSSBuffer **ppBuffer, + [in] DWORD dwFlags, + [in] QWORD cnsSampleTime, + [in] QWORD cnsSampleDuration, + [in] void *pvContext); +} + +[ + object, + uuid(faed3d21-1b6b-4af7-8bc6-3e189bbc187b), + pointer_default( unique ), + local +] +interface IWMSyncReader2 : IWMSyncReader +{ + HRESULT SetRangeByTimecode( + [in] WORD wStreamNum, + [in] WMT_TIMECODE_EXTENSION_DATA *pStart, + [in] WMT_TIMECODE_EXTENSION_DATA *pEnd); + + HRESULT SetRangeByFrameEx( + [in] WORD wStreamNum, + [in] QWORD qwFrameNumber, + [in] LONGLONG cFramesToRead, + [out] QWORD *pcnsStartTime); + + HRESULT SetAllocateForOutput( + [in] DWORD dwOutputNum, + [in] IWMReaderAllocatorEx *pAllocator); + + HRESULT GetAllocateForOutput( + [in] DWORD dwOutputNum, + [out] IWMReaderAllocatorEx **ppAllocator); + + HRESULT SetAllocateForStream( + [in] DWORD dwStreamNum, + [in] IWMReaderAllocatorEx *pAllocator); + + HRESULT GetAllocateForStream( + [in] DWORD dwStreamNum, + [out] IWMReaderAllocatorEx **ppAllocator); +} + [ object, uuid(96406bd5-2b2b-11d3-b36b-00c04f6108ff), @@ -1791,6 +1862,7 @@ cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") +cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") -- 2.21.0

1 0

[PATCH] [include] add missing WMT_RIGHTS enum definition
by Vijay Kiran Kamuju 27 Feb '19

27 Feb '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/drmexternals.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/drmexternals.idl b/include/drmexternals.idl index 88826ad561..b89039423d 100644 --- a/include/drmexternals.idl +++ b/include/drmexternals.idl @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,3 +18,16 @@ */ import "wmdrmsdk.idl"; + +typedef enum WMT_RIGHTS { + WMT_RIGHT_PLAYBACK = 0x00000001, + WMT_RIGHT_COPY_TO_NON_SDMI_DEVICE = 0x00000002, + WMT_RIGHT_COPY_TO_CD = 0x00000008, + WMT_RIGHT_COPY_TO_SDMI_DEVICE = 0x00000010, + WMT_RIGHT_ONE_TIME = 0x00000020, + WMT_RIGHT_SAVE_STREAM_PROTECTED = 0x00000040, + WMT_RIGHT_COPY = 0x00000080, + WMT_RIGHT_COLLABORATIVE_PLAY = 0x00000100, + WMT_RIGHT_SDMI_TRIGGER = 0x00010000, + WMT_RIGHT_SDMI_NOMORECOPIES = 0x00020000 +} WMT_RIGHTS; -- 2.21.0

1 0

The Wine Project has been accepted as a GSoC 2019 mentor organization!
by André Hentschel 27 Feb '19

27 Feb '19

Hi all, I just invited some possible Mentors and think I forgot lots of them compared to recent years, so please check your inbox and if you can't find an invitation, let me know

1 0

[PATCH] msvcrt: Fix buffer overflow in _get_tzname.
by Piotr Caban 27 Feb '19

27 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46481 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 2/2] setupapi: Fix an off by one error.
by Zhiyi Zhang 27 Feb '19

27 Feb '19

Although RegSetValueExW will add a NULL character if it's missing, better do it right. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 46987c8eb9..cc21839049 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1583,7 +1583,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const if (description) { SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_DEVICEDESC, - (const BYTE *)description, lstrlenW(description) * sizeof(WCHAR)); + (const BYTE *)description, (lstrlenW(description) + 1) * sizeof(WCHAR)); } if (device_data) -- 2.20.1

2 2

[PATCH 1/2] setupapi: Fix typos.
by Zhiyi Zhang 27 Feb '19

27 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 537b335176..46987c8eb9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -77,8 +77,8 @@ static const WCHAR Enum[] = {'S','y','s','t','e','m','\\', static const WCHAR DeviceDesc[] = {'D','e','v','i','c','e','D','e','s','c',0}; static const WCHAR DeviceInstance[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; static const WCHAR DeviceParameters[] = {'D','e','v','i','c','e',' ','P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR HardwareId[] = {'H','a','r','d','w','a','r','e','I','D',0}; -static const WCHAR CompatibleIDs[] = {'C','o','m','p','a','t','i','b','l','e','I','d','s',0}; +static const WCHAR HardwareID[] = {'H','a','r','d','w','a','r','e','I','D',0}; +static const WCHAR CompatibleIDs[] = {'C','o','m','p','a','t','i','b','l','e','I','D','s',0}; static const WCHAR Service[] = {'S','e','r','v','i','c','e',0}; static const WCHAR Driver[] = {'D','r','i','v','e','r',0}; static const WCHAR ConfigFlags[] = {'C','o','n','f','i','g','F','l','a','g','s',0}; @@ -607,7 +607,7 @@ struct PropertyMapEntry static const struct PropertyMapEntry PropertyMap[] = { { REG_SZ, "DeviceDesc", DeviceDesc }, - { REG_MULTI_SZ, "HardwareId", HardwareId }, + { REG_MULTI_SZ, "HardwareID", HardwareID }, { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs }, { 0, NULL, NULL }, /* SPDRP_UNUSED0 */ { REG_SZ, "Service", Service }, -- 2.20.1

2 2

[PATCH 09/10] d3d12/tests: Add test for backbuffer index after changing sync interval.
by Józef Kucia 27 Feb '19

27 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 67e72405d89f..dec7cf855839 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -1009,6 +1009,82 @@ static void test_swapchain_size_mismatch(void) destroy_test_context(&context); } +static void test_swapchain_backbuffer_index(void) +{ + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + unsigned int previous_index, expected_index, index, i; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *backbuffers[2]; + struct test_context_desc desc; + struct test_context context; + unsigned int sync_interval; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + desc.no_pipeline = TRUE; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(queue, window, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + { + hr = IDXGISwapChain3_GetBuffer(swapchain, i, &IID_ID3D12Resource, (void **)&backbuffers[i]); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", i, hr); + } + + previous_index = 1; + for (i = 0; i < 20; ++i) + { + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + ID3D12Device_CreateRenderTargetView(device, backbuffers[index], NULL, context.rtv); + + expected_index = (previous_index + 1) % 2; + ok(index == expected_index, "Test %u: Got index %u, expected %u.\n", i, index, expected_index); + + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, green, 0, NULL); + transition_sub_resource_state(command_list, backbuffers[index], 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + + if (i <= 4 || (8 <= i && i <= 14)) + sync_interval = 1; + else + sync_interval = 0; + + hr = IDXGISwapChain3_Present(swapchain, sync_interval, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + reset_command_list(command_list, context.allocator); + + previous_index = index; + } + + for (i = 0; i < ARRAY_SIZE(backbuffers); ++i) + ID3D12Resource_Release(backbuffers[i]); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + START_TEST(d3d12) { BOOL enable_debug_layer = FALSE; @@ -1039,4 +1115,5 @@ START_TEST(d3d12) test_draw(); test_swapchain_draw(); test_swapchain_size_mismatch(); + test_swapchain_backbuffer_index(); } -- 2.19.2

2 1

[PATCH] mfplat: Add MFCreateMFByteStreamOnStreamEx() stub.
by Jactry Zeng 27 Feb '19

27 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 1 + include/mfidl.idl | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a38c03b4d1..219817f677 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4142,3 +4142,13 @@ void WINAPI MFHeapFree(void *p) TRACE("%p\n", p); HeapFree(GetProcessHeap(), 0, p); } + +/*********************************************************************** + * MFCreateMFByteStreamOnStreamEx (mfplat.@) + */ +HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream) +{ + FIXME("(%p, %p): stub\n", stream, bytestream); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c4e0b2abfa..e1da5445a5 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -46,6 +46,7 @@ @ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) +@ stdcall MFCreateMFByteStreamOnStreamEx(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stdcall MFCreateMediaEvent(long ptr long ptr ptr) diff --git a/include/mfidl.idl b/include/mfidl.idl index c8f011bb77..01e86efc51 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -318,6 +318,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") -- 2.20.1

1 0

[PATCH 2/2 v2] ntdll: Track copy-on-write memory state on i386 and x86_64 architectures.
by Piotr Caban 27 Feb '19

27 Feb '19

Based on patch by Michael Müller. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - added credit for Michael dlls/kernel32/tests/virtual.c | 12 +++----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 8 +++++ dlls/ntdll/signal_arm64.c | 8 +++++ dlls/ntdll/signal_i386.c | 51 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_powerpc.c | 8 +++++ dlls/ntdll/signal_x86_64.c | 45 +++++++++++++++++++++++++++ dlls/ntdll/thread.c | 1 + dlls/ntdll/virtual.c | 57 +++++++++++++++++++++++++++-------- 9 files changed, 170 insertions(+), 21 deletions(-)

3 5