March 2020 - Wine-Commits - list.winehq.org

Zhiyi Zhang : d3d9/tests: Fix a test failure with Win10 WARP.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 94c1f89e103211e63b599c958a1aabba66e9ae1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1f89e103211e63b599c95… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:35:04 2020 +0800 d3d9/tests: Fix a test failure with Win10 WARP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 62146d6932..16f42216cf 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -9653,6 +9653,7 @@ out: static void test_update_volumetexture(void) { + D3DADAPTER_IDENTIFIER9 identifier; IDirect3DDevice9 *device; IDirect3D9 *d3d9; HWND window; @@ -9662,6 +9663,7 @@ static void test_update_volumetexture(void) D3DLOCKED_BOX locked_box; ULONG refcount; D3DCAPS9 caps; + BOOL is_warp; static const struct { D3DPOOL src_pool, dst_pool; @@ -9710,6 +9712,9 @@ static void test_update_volumetexture(void) window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); + hr = IDirect3D9_GetAdapterIdentifier(d3d9, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + is_warp = adapter_is_warp(&identifier); if (!(device = create_device(d3d9, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -9780,7 +9785,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || (is_warp && (i == 6 || i == 7)), /* Fails with Win10 WARP driver */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); IDirect3DVolumeTexture9_Release(dst);

1 0

Biswapriyo Nath : include/dxva: Add HEVC and VP8/VP9 structures.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: c43998cb51c53ab9c355c2ff37489d51f9009e2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c43998cb51c53ab9c355c2ff… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Mar 17 22:11:09 2020 +0530 include/dxva: Add HEVC and VP8/VP9 structures. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva.h | 399 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 378 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c43998cb51c53ab9c355…

1 0

Zebediah Figura : hidclass.sys: Don't reset the report count when recording a main item.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 4c1ff566dd22a16f30f978754d6f82ce50fb79ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c1ff566dd22a16f30f97875… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 16 21:18:05 2020 -0500 hidclass.sys: Don't reset the report count when recording a main item. The report count is global and should be preserved. This fixes the Logitech Extreme 3D Pro controller when used with hidraw. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 876369ad70..56e4da4ad1 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -505,7 +505,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l case TAG_MAIN_INPUT: case TAG_MAIN_OUTPUT: case TAG_MAIN_FEATURE: - for (j = 0; caps->ReportCount; j++) + for (j = 0; j < caps->ReportCount; j++) { feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); list_add_tail(&collection->features, &feature->entry); @@ -520,13 +520,13 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->u.NotRange.Usage = usages[j]; feature->caps = *caps; feature->caps.ReportCount = 1; - caps->ReportCount--; feature->collection = collection; if (j+1 >= usages_top) + { + feature->caps.ReportCount += caps->ReportCount - (j + 1); break; + } } - if (caps->ReportCount) - feature->caps.ReportCount += caps->ReportCount; usages_top = 0; new_caps(caps); break;

1 0

Serge Gautherie : advapi32: Fix 3 comments about pdwReserved and dwFlags.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 2df16753f0008099e119f39469badd10e7450bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df16753f0008099e119f394… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Mar 18 16:27:08 2020 +0100 advapi32: Fix 3 comments about pdwReserved and dwFlags. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index c4f69886d0..7199795b47 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -612,7 +612,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, * PARAMS * hProv [I] Handle to the CSP whose reference is being incremented. * pdwReserved [IN] Reserved for future use and must be NULL. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE @@ -735,7 +735,7 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer) * hProv [I] Handle of a CSP. * Algid [I] Identifies the hash algorithm to use. * hKey [I] Key for the hash (if required). - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * phHash [O] Address of the future handle to the new hash object. * * RETURNS @@ -970,7 +970,7 @@ BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey) * * PARAMS * hHash [I] Handle to the hash to be copied. - * pdwReserved [I] Reserved for future use and must be zero. + * pdwReserved [I] Reserved for future use and must be NULL. * dwFlags [I] Reserved for future use and must be zero. * phHash [O] Address of the handle to receive the copy. *

1 0

Matteo Bruni : wined3d: Optimize scanning for changed state in wined3d_stateblock_capture().
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: f4788c4b089e7cfd5ebfa0795e2255d0181b5986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4788c4b089e7cfd5ebfa079… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:21 2020 +0100 wined3d: Optimize scanning for changed state in wined3d_stateblock_capture(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index db0019adbf..6d747f9731 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -852,9 +852,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.streamSource; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (stateblock->stateblock_state.streams[i].stride != state->streams[i].stride || stateblock->stateblock_state.streams[i].offset != state->streams[i].offset @@ -877,9 +877,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.streamFreq; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (stateblock->stateblock_state.streams[i].frequency != state->streams[i].frequency || stateblock->stateblock_state.streams[i].flags != state->streams[i].flags) @@ -893,9 +893,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.clipplane; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (memcmp(&stateblock->stateblock_state.clip_planes[i], &state->clip_planes[i], sizeof(state->clip_planes[i]))) { @@ -929,9 +929,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, /* Samplers */ map = stateblock->changed.textures; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); TRACE("Updating texture %u to %p (was %p).\n", i, state->textures[i], stateblock->stateblock_state.textures[i]);

1 0

Nikolay Sivov : mfplat/tests: Increase wait timeout to help with intermittent test failures.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: af55f88d2a5e5aec846a33962a7e0b5cfb5c430b URL: https://source.winehq.org/git/wine.git/?a=commit;h=af55f88d2a5e5aec846a3396… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:35 2020 +0300 mfplat/tests: Increase wait timeout to help with intermittent test failures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4cb5499f7c..8e9bf8102a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2066,7 +2066,7 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul state = IMFAsyncResult_GetStateNoAddRef(result); if (state && SUCCEEDED(IUnknown_QueryInterface(state, &IID_IMFMediaEventQueue, (void **)&queue))) { - IMFMediaEvent *event; + IMFMediaEvent *event = NULL, *event2; if (is_win8_plus) { @@ -2079,10 +2079,11 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); - hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); + hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event2); ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); - IMFMediaEvent_Release(event); + if (event) + IMFMediaEvent_Release(event); } hr = IMFAsyncResult_GetObject(result, &obj); @@ -2719,7 +2720,7 @@ static void test_event_queue(void) hr = IMFMediaEventQueue_QueueEvent(queue, event); ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); - ret = WaitForSingleObject(callback.event, 100); + ret = WaitForSingleObject(callback.event, 500); ok(ret == WAIT_OBJECT_0, "Unexpected return value %#x.\n", ret); CloseHandle(callback.event);

1 0

Nikolay Sivov : mf: Forward more Audio Session events from the session.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 69885afbed63d1375117732bcdbe658d1dbbc8ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=69885afbed63d1375117732b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:37 2020 +0300 mf: Forward more Audio Session events from the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 69d1fdf569..2204149dca 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2613,6 +2613,14 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_deliver_sample(session, (IMFMediaStream *)event_source, &value); LeaveCriticalSection(&session->cs); + break; + case MEAudioSessionGroupingParamChanged: + case MEAudioSessionIconChanged: + case MEAudioSessionNameChanged: + case MEAudioSessionVolumeChanged: + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + break; case MEAudioSessionDeviceRemoved: case MEAudioSessionDisconnected:

1 0

Nikolay Sivov : mfplat: Add a helper to trace video format name.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: d0a43d1830bfc7de0256c827593b094fcc05a16f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a43d1830bfc7de0256c827… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:36 2020 +0300 mfplat: Add a helper to trace video format name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 5 ++--- dlls/mfplat/mfplat_private.h | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 64ec436a1e..71bae4c42f 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -642,7 +642,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - TRACE("%u, %u, %#x, %d, %p.\n", width, height, fourcc, bottom_up, buffer); + TRACE("%u, %u, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer); return create_2d_buffer(width, height, fourcc, bottom_up, buffer); } diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a5c954161d..ffe9e36d15 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1510,7 +1510,7 @@ HRESULT WINAPI MFShutdown(void) */ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines) { - TRACE("(%p, %d, %p, %d, %u, %u)\n", dest, deststride, src, srcstride, width, lines); + TRACE("%p, %d, %p, %d, %u, %u.\n", dest, deststride, src, srcstride, width, lines); while (lines--) { diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 8c4716e5e1..77753cc499 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -19,7 +19,6 @@ #define COBJMACROS #include "mfplat_private.h" -#include "d3d9types.h" #include "initguid.h" #include "ks.h" @@ -1837,7 +1836,7 @@ HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *s struct uncompressed_video_format *format; GUID subtype; - TRACE("%#x, %u, %p.\n", fourcc, width, stride); + TRACE("%s, %u, %p.\n", debugstr_fourcc(fourcc), width, stride); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; @@ -1902,7 +1901,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si unsigned int stride; GUID subtype; - TRACE("%#x, %u, %u, %p.\n", fourcc, width, height, size); + TRACE("%s, %u, %u, %p.\n", debugstr_fourcc(fourcc), width, height, size); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 0c374f116b..15d81a65b9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -23,6 +23,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "d3d9types.h" #include "wine/heap.h" #include "wine/debug.h" @@ -145,3 +146,39 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {vt %#x}", v, v->vt); } } + +static inline const char *debugstr_fourcc(DWORD format) +{ + static const struct format_name + { + unsigned int format; + const char *name; + } formats[] = + { + { D3DFMT_R8G8B8, "R8G8B8" }, + { D3DFMT_A8R8G8B8, "A8R8G8B8" }, + { D3DFMT_X8R8G8B8, "X8R8G8B8" }, + { D3DFMT_R5G6B5, "R5G6B5" }, + { D3DFMT_X1R5G5B5, "X1R5G6B5" }, + { D3DFMT_A2B10G10R10, "A2B10G10R10" }, + { D3DFMT_P8, "P8" }, + { D3DFMT_L8, "L8" }, + { D3DFMT_D16, "D16" }, + { D3DFMT_L16, "L16" }, + { D3DFMT_A16B16G16R16F, "A16B16G16R16F" }, + }; + int i; + + if ((format & 0xff) == format) + { + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + if (formats[i].format == format) + return wine_dbg_sprintf("%s", wine_dbgstr_an(formats[i].name, -1)); + } + + return wine_dbg_sprintf("%#x", format); + } + + return wine_dbgstr_an((char *)&format, 4); +}

1 0

Zhiyi Zhang : d3d8/tests: Test device caps on multiple adapters.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: e106a460f56a3e9d1d07c4cb169028611fef114f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e106a460f56a3e9d1d07c4cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:14 2020 +0800 d3d8/tests: Test device caps on multiple adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 235 ++++++++++++++++++++++++++++------------------- 1 file changed, 138 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e106a460f56a3e9d1d07…

1 0

Zhiyi Zhang : d3d9/tests: Test device caps on multiple adapters.
by Alexandre Julliard March 18, 2020

March 18, 2020

Module: wine Branch: master Commit: 96f37f7af9cbfa5576d6d12d3b297b6b0b51ebda URL: https://source.winehq.org/git/wine.git/?a=commit;h=96f37f7af9cbfa5576d6d12d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:26 2020 +0800 d3d9/tests: Test device caps on multiple adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 312 +++++++++++++++++++++++++++++------------------ 1 file changed, 192 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96f37f7af9cbfa5576d6…

1 0