April 2020 - Wine-commits - list.winehq.org

Zhiyi Zhang : dxgi/tests: Test cursor clipping.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: f47f7c66cca82e40db03224cc093adf9e34ba9f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f47f7c66cca82e40db03224c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 8 18:01:26 2020 +0800 dxgi/tests: Test cursor clipping. 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/dxgi/tests/dxgi.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 0fc0dc5d13..6e01961a0c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -121,6 +121,14 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +static void get_virtual_rect(RECT *rect) +{ + rect->left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rect->top = GetSystemMetrics(SM_YVIRTUALSCREEN); + rect->right = rect->left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); +} + #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) @@ -5994,6 +6002,156 @@ done: ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); } +static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) +{ + unsigned int adapter_idx, output_idx, mode_idx, mode_count; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_OUTPUT_DESC output_desc; + IDXGIAdapter *adapter = NULL; + RECT virtual_rect, clip_rect; + unsigned int width, height; + IDXGISwapChain *swapchain; + DXGI_MODE_DESC *modes; + IDXGIFactory *factory; + IDXGIOutput *output; + ULONG refcount; + HRESULT hr; + + get_factory(device, is_d3d12, &factory); + + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; + + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) + { + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) + { + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, + NULL); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 TestBots */ + "Adapter %u output %u: GetDisplayModeList failed, hr %#x.\n", adapter_idx, + output_idx, hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + win_skip("Adapter %u output %u: GetDisplayModeList() not supported.\n", adapter_idx, + output_idx); + IDXGIOutput_Release(output); + continue; + } + + modes = heap_calloc(mode_count, sizeof(*modes)); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, + modes); + ok(hr == S_OK, "Adapter %u output %u: GetDisplayModeList failed, hr %#x.\n", + adapter_idx, output_idx, hr); + + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); + width = output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left; + height = output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top; + for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) + { + if (modes[mode_idx].Width != width && modes[mode_idx].Height != height) + break; + } + ok(modes[mode_idx].Width != width && modes[mode_idx].Height != height, + "Adapter %u output %u: Failed to find a different mode than %ux%u.\n", + adapter_idx, output_idx, width, height); + + ok(ClipCursor(NULL), "Adapter %u output %u: ClipCursor failed, error %#x.\n", + adapter_idx, output_idx, GetLastError()); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), + "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + ok(EqualRect(&clip_rect, &virtual_rect), + "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + swapchain_desc.BufferDesc.Width = modes[mode_idx].Width; + swapchain_desc.BufferDesc.Height = modes[mode_idx].Height; + swapchain_desc.BufferDesc.RefreshRate = modes[mode_idx].RefreshRate; + swapchain_desc.BufferDesc.Format = modes[mode_idx].Format; + swapchain_desc.BufferDesc.ScanlineOrdering = modes[mode_idx].ScanlineOrdering; + swapchain_desc.BufferDesc.Scaling = modes[mode_idx].Scaling; + swapchain_desc.OutputWindow = create_window(); + heap_free(modes); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, + &swapchain); + ok(hr == S_OK, "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", + adapter_idx, output_idx, hr); + + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), + "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + ok(EqualRect(&clip_rect, &virtual_rect), + "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || + broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", adapter_idx, + output_idx, hr); + if (FAILED(hr)) + { + skip("Adapter %u output %u: Could not change fullscreen state, hr %#x.\n", + adapter_idx, output_idx, hr); + IDXGISwapChain_Release(swapchain); + IDXGIOutput_Release(output); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), + "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), + "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_idx, + output_idx, hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + adapter_idx, output_idx, refcount); + refcount = IDXGIOutput_Release(output); + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), + "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), + "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + } + + IDXGIAdapter_Release(adapter); + } + + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -6105,6 +6263,7 @@ START_TEST(dxgi) run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); run_on_d3d10(test_output_ownership); + run_on_d3d10(test_cursor_clipping); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -6128,6 +6287,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_backbuffer_index); run_on_d3d12(test_swapchain_formats); run_on_d3d12(test_output_ownership); + run_on_d3d12(test_cursor_clipping); FreeLibrary(d3d12_module); }

1 0

Chip Davis : wined3d: Introduce compare_uint().
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: e463fa29ef7729106f02a4d4122a1b2a335df4c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e463fa29ef7729106f02a4d4… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 19:18:07 2020 +0430 wined3d: Introduce compare_uint(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7b08851fbf..211160ad4d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3262,16 +3262,19 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win return TRUE; } -static BOOL color_match(DWORD c1, DWORD c2, BYTE max_diff) -{ - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; - return TRUE; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + +static BOOL compare_colour(DWORD c1, DWORD c2, BYTE max_diff) +{ + return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) + && compare_uint((c1 >> 8) & 0xff, (c2 >> 8) & 0xff, max_diff) + && compare_uint((c1 >> 16) & 0xff, (c2 >> 16) & 0xff, max_diff) + && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } /* A context is provided by the caller */ @@ -3345,8 +3348,8 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, buffer); memset(readback, 0x7f, sizeof(readback)); gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); - if (color_match(readback[6], 0xffffffff, 5) || color_match(readback[6], 0x00000000, 5) - || color_match(readback[9], 0xffffffff, 5) || color_match(readback[9], 0x00000000, 5)) + if (compare_colour(readback[6], 0xffffffff, 5) || compare_colour(readback[6], 0x00000000, 5) + || compare_colour(readback[9], 0xffffffff, 5) || compare_colour(readback[9], 0x00000000, 5)) { TRACE("Read back colors 0x%08x and 0x%08x close to unfiltered color, assuming no filtering\n", readback[6], readback[9]);

1 0

Chip Davis : d3d9: Remove an unneeded conversion.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: ee6b0831736e7426549b1713fb1bf23bca40e3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee6b0831736e7426549b1713… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 19:18:08 2020 +0430 d3d9: Remove an unneeded conversion. That parameter is already the correct type. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ad32146947..61aee971a1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1571,7 +1571,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, unsigned i if (user_mem) wined3d_texture_update_desc(texture, width, height, desc.format, - wined3d_multisample_type_from_d3d(multisample_type), multisample_quality, user_mem, 0); + multisample_type, multisample_quality, user_mem, 0); wined3d_texture_decref(texture);

1 0

Nikolay Sivov : mf: Add support to get/set presentation clock for SAR.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: 0507ba6aab66c8ec38e375d949052f728ff64f27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0507ba6aab66c8ec38e375d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:22 2020 +0300 mf: Add support to get/set presentation clock for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mf/tests/mf.c | 54 ++++++++++++++++++++++ 2 files changed, 181 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0507ba6aab66c8ec38e3…

1 0

Nikolay Sivov : mfplat: Add SAR attribute traces.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: f553c2b14f1062b49708e0802a6032c536e1430f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f553c2b14f1062b49708e080… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:23 2020 +0300 mfplat: Add SAR attribute traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 +++++ include/mfidl.idl | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 37ea744313..923905399b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1647,6 +1647,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES), X(MF_MT_VIDEO_NO_FRAME_ORDERING), X(MF_MT_VIDEO_CHROMA_SITING), + X(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY), X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), X(MF_MT_MPEG2_LEVEL), @@ -1749,6 +1750,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_SPATIAL_AUDIO_OBJECT_METADATA_FORMAT_ID), X(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK), X(MF_MT_PAN_SCAN_ENABLED), + X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID), X(MF_MT_DV_VAUX_CTRL_PACK), X(MFSampleExtension_ForwardedDecodeUnitType), X(MF_MT_AUDIO_AVG_BYTES_PER_SECOND), @@ -1782,6 +1784,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_RESOLUTION_STATUS), X(MF_MT_ORIGINAL_4CC), X(MF_PD_AUDIO_ISVARIABLEBITRATE), + X(MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS), + X(MF_AUDIO_RENDERER_ATTRIBUTE_SESSION_ID), X(MF_MT_MPEG2_CONTENT_PACKET), X(MFT_PROCESS_LOCAL_Attribute), X(MFT_PROCESS_LOCAL_Attribute), @@ -1830,6 +1834,7 @@ const char *debugstr_attr(const GUID *guid) X(MFT_FIELDOFUSE_UNLOCK_Attribute), X(MF_TOPONODE_ERROR_SUBTYPE), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE), + X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE), X(MF_MT_VIDEO_3D_LEFT_IS_BASE), X(MF_TOPONODE_WORKQUEUE_MMCSS_TASKID), #undef X diff --git a/include/mfidl.idl b/include/mfidl.idl index a5fb8bc0bd..5a7398f290 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -967,6 +967,10 @@ cpp_quote(" return attributes->SetUINT64(key, ((UINT64)numerator << 32) | den cpp_quote("}") cpp_quote("#endif") +cpp_quote("#define MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_CROSSPROCESS 0x00000001") +cpp_quote("#define MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_NOPERSIST 0x00000002") +cpp_quote("#define MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_DONT_ALLOW_FORMAT_CHANGES 0x00000004") + cpp_quote("EXTERN_GUID(MF_ACTIVATE_MFT_LOCKED, 0xc1f6093c, 0x7f65, 0x4fbd, 0x9e, 0x39, 0x5f, 0xae, 0xc3, 0xc4, 0xfb, 0xd7);") cpp_quote("EXTERN_GUID(MF_SD_LANGUAGE, 0x00af2180, 0xbdc2, 0x423c, 0xab, 0xca, 0xf5, 0x03, 0x59, 0x3b, 0xc1, 0x21);") @@ -1065,4 +1069,10 @@ cpp_quote("EXTERN_GUID(MF_SESSION_REMOTE_SOURCE_MODE, 0xf4033ef4, 0x9bb3, 0x4378 cpp_quote("EXTERN_GUID(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME, 0x190e852f, 0x6238, 0x42d1, 0xb5, 0xaf, 0x69, 0xea, 0x33, 0x8e, 0xf8, 0x50);") cpp_quote("EXTERN_GUID(MF_PMP_SERVER_CONTEXT, 0x2f00c910, 0xd2cf, 0x4278, 0x8b, 0x6a, 0xd0, 0x77, 0xfa, 0xc3, 0xa2, 0x5f);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS, 0xede4b5e0, 0xf805, 0x4d6c, 0x99, 0xb3, 0xdb, 0x01, 0xbf, 0x95, 0xdf, 0xab);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_SESSION_ID, 0xede4b5e3, 0xf805, 0x4d6c, 0x99, 0xb3, 0xdb, 0x01, 0xbf, 0x95, 0xdf, 0xab);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, 0xb10aaec3, 0xef71, 0x4cc3, 0xb8, 0x73, 0x05, 0xa9, 0xa0, 0x8b, 0x9f, 0x8e);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, 0x6ba644ff, 0x27c5, 0x4d02, 0x98, 0x87, 0xc2, 0x86, 0x19, 0xfd, 0xb9, 0x1b);") +cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, 0xa9770471, 0x92ec, 0x4df4, 0x94, 0xfe, 0x81, 0xc3, 0x6f, 0x0c, 0x3a, 0x7a);") + cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")

1 0

Nikolay Sivov : mf: Attempt to create mmdevapi device on SAR creation.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: cb9b207284e1602b156cec46316ac017064eb4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9b207284e1602b156cec46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:24 2020 +0300 mf: Attempt to create mmdevapi device on SAR creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 27 +++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 2ef767b787..5d74238a91 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -22,6 +22,8 @@ #include "mfidl.h" #include "mferror.h" #include "mf_private.h" +#include "initguid.h" +#include "mmdeviceapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -447,9 +449,55 @@ static const IMFClockStateSinkVtbl audio_renderer_clock_sink_vtbl = audio_renderer_clock_sink_OnClockSetRate, }; +static HRESULT sar_create_mmdevice(IMFAttributes *attributes, IMMDevice **device) +{ + WCHAR *endpoint; + unsigned int length, role = eMultimedia; + IMMDeviceEnumerator *devenum; + HRESULT hr; + + if (attributes) + { + /* Mutually exclusive attributes. */ + if (SUCCEEDED(IMFAttributes_GetItem(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, NULL)) && + SUCCEEDED(IMFAttributes_GetItem(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, NULL))) + { + return E_INVALIDARG; + } + } + + if (FAILED(hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, + (void **)&devenum))) + { + return hr; + } + + role = eMultimedia; + if (attributes && SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, &role))) + TRACE("Specified role %d.\n", role); + + if (attributes && SUCCEEDED(IMFAttributes_GetAllocatedString(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, + &endpoint, &length))) + { + TRACE("Specified end point %s.\n", debugstr_w(endpoint)); + hr = IMMDeviceEnumerator_GetDevice(devenum, endpoint, device); + CoTaskMemFree(endpoint); + } + else + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, role, device); + + if (FAILED(hr)) + hr = MF_E_NO_AUDIO_PLAYBACK_DEVICE; + + IMMDeviceEnumerator_Release(devenum); + + return hr; +} + static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct audio_renderer *renderer; + IMMDevice *device; HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj); @@ -467,6 +515,11 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, if (FAILED(hr = MFCreateEventQueue(&renderer->event_queue))) goto failed; + if (FAILED(hr = sar_create_mmdevice(attributes, &device))) + goto failed; + + IMMDevice_Release(device); + *obj = (IUnknown *)&renderer->IMFMediaSink_iface; return S_OK; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 98e180e453..4f29362102 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -38,6 +38,7 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "mfapi.h" #include "mferror.h" #include "mfidl.h" +#include "mmdeviceapi.h" #include "wine/test.h" @@ -2636,6 +2637,7 @@ static void test_sar(void) IMFClockStateSink *state_sink; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; + IMFAttributes *attributes; IMFActivate *activate; MFCLOCK_STATE state; DWORD flags, count; @@ -2823,6 +2825,31 @@ todo_wine hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); + /* SAR attributes */ + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + + /* Specify role. */ + hr = IMFAttributes_SetUINT32(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, eMultimedia); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateAudioRenderer(attributes, &sink); + ok(hr == S_OK, "Failed to create a sink, hr %#x.\n", hr); + IMFMediaSink_Release(sink); + + /* Invalid endpoint. */ + hr = IMFAttributes_SetString(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ID, L"endpoint"); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateAudioRenderer(attributes, &sink); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_DeleteItem(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE); + ok(hr == S_OK, "Failed to remove attribute, hr %#x.\n", hr); + + hr = MFCreateAudioRenderer(attributes, &sink); + ok(hr == MF_E_NO_AUDIO_PLAYBACK_DEVICE, "Failed to create a sink, hr %#x.\n", hr); + CoUninitialize(); }

1 0

Nikolay Sivov : mf: Add stream sink stub for SAR.
by Alexandre Julliard 08 Apr '20

08 Apr '20

Module: wine Branch: master Commit: a88edd3d39a390cf8948e9e0e5ec9e1091a894f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a88edd3d39a390cf8948e9e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 8 17:21:25 2020 +0300 mf: Add stream sink stub for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 249 ++++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 60 ++++++++++++- 2 files changed, 304 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a88edd3d39a390cf8948…

1 0

Dmitry Timoshkov : adsldp: Map "1.2.840.113556.1.4.906" to ADSTYPE_LARGE_INTEGER.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 38e95ed2227dd3f0fc3d1394c884265d43e3b283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38e95ed2227dd3f0fc3d1394… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 7 18:14:05 2020 +0800 adsldp: Map "1.2.840.113556.1.4.906" to ADSTYPE_LARGE_INTEGER. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 23 +++++++++++++++++------ dlls/adsldp/schema.c | 2 ++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 8897545e4f..5504a376ba 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1478,26 +1478,37 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex } case ADSTYPE_INTEGER: + case ADSTYPE_LARGE_INTEGER: { - WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); + struct berval **values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) return E_ADS_COLUMN_NOT_SET; - count = ldap_count_valuesW(values); + count = ldap_count_values_len(values); col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { - ldap_value_freeW(values); + ldap_value_free_len(values); return E_OUTOFMEMORY; } for (i = 0; i < count; i++) { - col->pADsValues[i].u.Integer = wcstol(values[i], NULL, 10); - TRACE("%s => %d\n", debugstr_w(values[i]), col->pADsValues[i].u.Integer); + col->pADsValues[i].dwType = type; + + if (type == ADSTYPE_LARGE_INTEGER) + { + col->pADsValues[i].u.LargeInteger.QuadPart = _atoi64(values[i]->bv_val); + TRACE("%s => %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len), wine_dbgstr_longlong(col->pADsValues[i].u.LargeInteger.QuadPart)); + } + else + { + col->pADsValues[i].u.Integer = atol(values[i]->bv_val); + TRACE("%s => %d\n", debugstr_an(values[i]->bv_val, values[i]->bv_len), col->pADsValues[i].u.Integer); + } } - ldap_value_freeW(values); + ldap_value_free_len(values); col->hReserved = NULL; break; } diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 6965dc3274..e997c6f98e 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -101,6 +101,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.40")) return ADSTYPE_OCTET_STRING; + if (!wcscmp(type->syntax, L"1.2.840.113556.1.4.906")) + return ADSTYPE_LARGE_INTEGER; if (!wcscmp(type->syntax, L"1.2.840.113556.1.4.907")) return ADSTYPE_NT_SECURITY_DESCRIPTOR;

1 0

Chip Davis : d2d1: Introduce a function to convert D2D1.0 interpolation modes to D2D1.1.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: e771fc8dde7d124429908dab157591d1287a3e1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e771fc8dde7d124429908dab… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:51:59 2020 -0500 d2d1: Introduce a function to convert D2D1.0 interpolation modes to D2D1.1. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 +- dlls/d2d1/d2d1_private.h | 5 +++++ dlls/d2d1/device.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 675fa52e72..1f455897f6 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -962,7 +962,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapB return; } - brush->u.bitmap.interpolation_mode = mode; + brush->u.bitmap.interpolation_mode = d2d1_1_interp_mode_from_d2d1(mode); if (brush->u.bitmap.sampler_state) { ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index a2546a5b1c..4eb7e33142 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -634,6 +634,11 @@ static inline void d2d_rect_expand(D2D1_RECT_F *dst, const D2D1_POINT_2F *point) dst->bottom = point->y; } +static inline D2D1_INTERPOLATION_MODE d2d1_1_interp_mode_from_d2d1(D2D1_BITMAP_INTERPOLATION_MODE mode) +{ + return (D2D1_INTERPOLATION_MODE)mode; +} + static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) { if (!point) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 146f7009da..acecb2058a 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1143,7 +1143,8 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * return; } - d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, NULL); + d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, d2d1_1_interp_mode_from_d2d1(interpolation_mode), + src_rect, NULL); } static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *iface,

1 0

Andrew Guertin : d3d11: Stop warning about depth stencil view flags.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 1dd9b53a6a97de4f49f4a3f16fa40007e03c0a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd9b53a6a97de4f49f4a3f1… Author: Andrew Guertin <aguertin+wine(a)aguertin.net> Date: Tue Apr 7 01:52:34 2020 -0400 d3d11: Stop warning about depth stencil view flags. Support for these flags was added in 600f39d4. Signed-off-by: Andrew Guertin <aguertin+wine(a)aguertin.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 40037989eb..4393d6540e 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1212,9 +1212,6 @@ static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc { wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); - if (desc->Flags) - FIXME("Unhandled depth stencil view flags %#x.\n", desc->Flags); - wined3d_desc->flags = 0; if (desc->Flags & D3D11_DSV_READ_ONLY_DEPTH) wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_DEPTH;

1 0