wine-devel April 2020

wine-devel@winehq.org

87 participants
854 discussions

[PATCH] include: Add ISpatialAudioClient definition.
by Nikolay Sivov 07 Apr '20

07 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/spatialaudioclient.idl | 100 +++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 include/spatialaudioclient.idl diff --git a/include/Makefile.in b/include/Makefile.in index eea1543822..778818dca5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -628,6 +628,7 @@ SOURCES = \ slpublic.h \ snmp.h \ softpub.h \ + spatialaudioclient.idl \ sperror.h \ sql.h \ sqlext.h \ diff --git a/include/spatialaudioclient.idl b/include/spatialaudioclient.idl new file mode 100644 index 0000000000..16a1541fd1 --- /dev/null +++ b/include/spatialaudioclient.idl @@ -0,0 +1,100 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "audioclient.idl"; +import "propsys.idl"; + +typedef [v1_enum] enum AudioObjectType +{ + AudioObjectType_None = 0, + AudioObjectType_Dynamic = 0x00000001, + AudioObjectType_FrontLeft = 0x00000002, + AudioObjectType_FrontRight = 0x00000004, + AudioObjectType_FrontCenter = 0x00000008, + AudioObjectType_LowFrequency = 0x00000010, + AudioObjectType_SideLeft = 0x00000020, + AudioObjectType_SideRight = 0x00000040, + AudioObjectType_BackLeft = 0x00000080, + AudioObjectType_BackRight = 0x00000100, + AudioObjectType_TopFrontLeft = 0x00000200, + AudioObjectType_TopFrontRight = 0x00000400, + AudioObjectType_TopBackLeft = 0x00000800, + AudioObjectType_TopBackRight = 0x00001000, + AudioObjectType_BottomFrontLeft = 0x00002000, + AudioObjectType_BottomFrontRight = 0x00004000, + AudioObjectType_BottomBackLeft = 0x00008000, + AudioObjectType_BottomBackRight = 0x00010000, + AudioObjectType_BackCenter = 0x00020000, +} AudioObjectType; + +[ + object, + uuid(dcdaa858-895a-4a22-a5eb-67bda506096d), + pointer_default(unique), + local +] +interface IAudioFormatEnumerator : IUnknown +{ + HRESULT GetCount( + [out] UINT32 *count); + + HRESULT GetFormat( + [in] UINT32 index, + [out] WAVEFORMATEX **format); +} + +[ + object, + uuid(bbf8e066-aaaa-49be-9a4d-fd2a858ea27f), + pointer_default(unique), + local +] +interface ISpatialAudioClient : IUnknown +{ + HRESULT GetStaticObjectPosition( + [in] AudioObjectType type, + [out] float *x, + [out] float *y, + [out] float *z); + + HRESULT GetNativeStaticObjectTypeMask( + [out] AudioObjectType *mask); + + HRESULT GetMaxDynamicObjectCount( + [out] UINT32 *value); + + HRESULT GetSupportedAudioObjectFormatEnumerator( + [out] IAudioFormatEnumerator **enumerator); + + HRESULT GetMaxFrameCount( + [in] WAVEFORMATEX const *format, + [out] UINT32 *count); + + HRESULT IsAudioObjectFormatSupported( + [in] WAVEFORMATEX const *format); + + HRESULT IsSpatialAudioStreamAvailable( + [in] REFIID stream_uuid, + [in] PROPVARIANT const *info); + + HRESULT ActivateSpatialAudioStream( + [in] PROPVARIANT const *params, + [in] REFIID riid, + [out, iid_is(riid)] void **stream); +} -- 2.25.1

1 0

[PATCH 8/8] wined3d: Fix cursor clipping.
by Zhiyi Zhang 07 Apr '20

07 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 2 -- dlls/d3d9/tests/device.c | 2 -- dlls/ddraw/ddraw.c | 31 +++++++++++++++++++++++++++---- dlls/ddraw/tests/ddrawmodes.c | 4 ---- dlls/dxgi/tests/dxgi.c | 2 -- dlls/wined3d/directx.c | 5 ----- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ead5f47bf14..b9d838e5cd4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10152,7 +10152,6 @@ static void test_cursor_clipping(void) get_virtual_rect(&virtual_rect); ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); - todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -10161,7 +10160,6 @@ static void test_cursor_clipping(void) get_virtual_rect(&virtual_rect); ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); - todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b84a35714cd..c65f0cd04da 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13893,7 +13893,6 @@ static void test_cursor_clipping(void) get_virtual_rect(&virtual_rect); ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); - todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -13902,7 +13901,6 @@ static void test_cursor_clipping(void) get_virtual_rect(&virtual_rect); ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); - todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); } diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index db7fc2c9486..95e9fba9011 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -665,6 +665,8 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct wined3d_display_mode mode; + RECT clip_rect; HRESULT hr; TRACE("iface %p.\n", iface); @@ -684,7 +686,15 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) } if (SUCCEEDED(hr = wined3d_output_set_display_mode(ddraw->wined3d_output, NULL))) + { ddraw->flags &= ~DDRAW_RESTORE_MODE; + if (ddraw->cooperative_level & DDSCL_EXCLUSIVE && + SUCCEEDED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL))) + { + SetRect(&clip_rect, 0, 0, mode.width, mode.height); + ClipCursor(&clip_rect); + } + } InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK); @@ -768,6 +778,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, struct wined3d_rendertarget_view *rtv = NULL, *dsv = NULL; struct wined3d_stateblock *stateblock; BOOL restore_state = FALSE; + RECT clip_rect; HRESULT hr; TRACE("ddraw %p, window %p, flags %#x, restore_mode_on_normal %x.\n", ddraw, window, cooplevel, @@ -942,12 +953,11 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, wined3d_stateblock_decref(stateblock); } - if (!(cooplevel & DDSCL_EXCLUSIVE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE) - && restore_mode_on_normal) + if (!(cooplevel & DDSCL_EXCLUSIVE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { - hr = ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface); - if (FAILED(hr)) + if (restore_mode_on_normal && FAILED(ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface))) ERR("RestoreDisplayMode failed\n"); + ClipCursor(NULL); } if ((ddraw->cooperative_level & DDSCL_EXCLUSIVE) @@ -965,6 +975,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, } } + if (cooplevel & DDSCL_EXCLUSIVE) + { + SetRect(&clip_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ClipCursor(&clip_rect); + } + /* Unhandled flags */ if (cooplevel & DDSCL_ALLOWREBOOT) WARN("Unhandled flag DDSCL_ALLOWREBOOT, harmless\n"); @@ -1059,6 +1075,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_display_mode mode; enum wined3d_format_id format; + RECT clip_rect; HRESULT hr; TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", @@ -1117,6 +1134,12 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW ddrawformat_from_wined3dformat(&ddraw->primary->surface_desc.u4.ddpfPixelFormat, mode.format_id); } ddraw->flags |= DDRAW_RESTORE_MODE; + + if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) + { + SetRect(&clip_rect, 0, 0, width, height); + ClipCursor(&clip_rect); + } } InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK); diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 144f284b76c..d5b90effc18 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -613,7 +613,6 @@ static void testcursorclipping(void) flush_events(); get_virtual_rect(&rect); ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); - todo_wine_if(!EqualRect(&clip_rect, &rect)) ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -622,7 +621,6 @@ static void testcursorclipping(void) flush_events(); get_virtual_rect(&rect); ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); - todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1) ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -633,7 +631,6 @@ static void testcursorclipping(void) flush_events(); SetRect(&rect, 0, 0, primary_width, primary_height); ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); - todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1) ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -666,7 +663,6 @@ static void testcursorclipping(void) flush_events(); get_virtual_rect(&rect); ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); - todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1) ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); } diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e44bfa30657..5b09dedb5b4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6120,7 +6120,6 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) 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)); @@ -6140,7 +6139,6 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) 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)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cb3e0dd1041..42e1578561f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1260,7 +1260,6 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, const struct wined3d_display_mode *mode) { DEVMODEW new_mode, current_mode; - RECT clip_rc; LONG ret; enum wined3d_format_id new_format_id; @@ -1341,10 +1340,6 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, /* Store the new values. */ output->screen_format = new_format_id; - /* And finally clip mouse to our screen. */ - SetRect(&clip_rc, 0, 0, new_mode.dmPelsWidth, new_mode.dmPelsHeight); - ClipCursor(&clip_rc); - return WINED3D_OK; } -- 2.20.1

3 2

[PATCH 2/8] dxgi/tests: Fix some test failures in test_find_closest_matching_mode().
by Zhiyi Zhang 07 Apr '20

07 Apr '20

DXGI_MODE_SCALING_CENTERED and DXGI_MODE_SCALING_STRETCHED modes may be supported by drivers. When these flags are specified, IDXGIOutput_FindClosestMatchingMode() will try to find a mode matching the scaling field first, which may not be the same as the original mode. So make sure such a mode exists before finding them. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like in https://test.winehq.org/data/7096ab45444d7b7cbb926b5a51af0cbc46960ed3/win10… dlls/dxgi/tests/dxgi.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index eb22b0d212b..e2d9907d0ea 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1298,8 +1298,14 @@ static void test_output(void) static void test_find_closest_matching_mode(void) { + static const DXGI_MODE_SCALING scaling_tests[] = + { + DXGI_MODE_SCALING_UNSPECIFIED, + DXGI_MODE_SCALING_CENTERED, + DXGI_MODE_SCALING_STRETCHED + }; DXGI_MODE_DESC *modes, mode, matching_mode; - unsigned int i, mode_count; + unsigned int i, j, mode_count; IDXGIAdapter *adapter; IDXGIDevice *device; IDXGIOutput *output; @@ -1451,23 +1457,25 @@ static void test_find_closest_matching_mode(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); - memset(&mode, 0, sizeof(mode)); - mode.Width = modes[0].Width; - mode.Height = modes[0].Height; - mode.Format = modes[0].Format; - mode.Scaling = DXGI_MODE_SCALING_CENTERED; - hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + for (i = 0; i < ARRAY_SIZE(scaling_tests); ++i) + { + for (j = 0; j < mode_count; ++j) + { + if (modes[j].Scaling != scaling_tests[i]) + continue; - memset(&mode, 0, sizeof(mode)); - mode.Width = modes[0].Width; - mode.Height = modes[0].Height; - mode.Format = modes[0].Format; - mode.Scaling = DXGI_MODE_SCALING_STRETCHED; - hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + memset(&mode, 0, sizeof(mode)); + mode.Width = modes[j].Width; + mode.Height = modes[j].Height; + mode.Format = modes[j].Format; + mode.Scaling = modes[j].Scaling; + hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + check_mode_desc(&matching_mode, &modes[j], + MODE_DESC_IGNORE_REFRESH_RATE | MODE_DESC_IGNORE_SCANLINE_ORDERING); + break; + } + } heap_free(modes); -- 2.20.1

2 1

[PATCH] d3d11: Stop warning about depth stencil view flags
by Andrew Guertin 07 Apr '20

07 Apr '20

Support for these flags was added in 600f39d4. Signed-off-by: Andrew Guertin <aguertin+wine(a)aguertin.net> --- dlls/d3d11/view.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 40037989eb3..4393d6540e3 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; -- 2.26.0

3 2

[PATCH 1/2] d2d1: Return enum constants directly in d2d_bitmap_brush_GetInterpolationMode(). (Clang)
by Chip Davis 07 Apr '20

07 Apr '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cc557ea9efa..675fa52e72b 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1010,8 +1010,8 @@ static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInte switch (brush->u.bitmap.interpolation_mode) { case D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR: + return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; case D2D1_INTERPOLATION_MODE_LINEAR: - return brush->u.bitmap.interpolation_mode; default: return D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; } -- 2.24.0

2 3

[PATCH v2] d3d11: Introduce a function to convert a D3D feature level to a D3D10.1 feature level.
by Chip Davis 07 Apr '20

07 Apr '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Supersedes 182745. v2: Fix backwards description. Thanks, Henri. --- dlls/d3d11/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index bc411b0b9f6..1222ba861bd 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5833,13 +5833,18 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } +static D3D10_FEATURE_LEVEL1 d3d10_feature_level1_from_d3d_feature_level(D3D_FEATURE_LEVEL level) +{ + return (D3D10_FEATURE_LEVEL1)level; +} + static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D10Device1 *iface) { struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p.\n", iface); - return device->feature_level; + return d3d10_feature_level1_from_d3d_feature_level(device->feature_level); } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl = -- 2.24.0

2 1

[PATCH 6/8] d3d9/tests: Test cursor clipping.
by Zhiyi Zhang 07 Apr '20

07 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 83 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index efcd630e2df..b84a35714cd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -119,6 +119,14 @@ static BOOL compare_elements(IDirect3DVertexDeclaration9 *declaration, const D3D return equal; } +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); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -13829,6 +13837,80 @@ static void test_creation_parameters(void) DestroyWindow(window); } +static void test_cursor_clipping(void) +{ + unsigned int adapter_idx, adapter_count, mode_idx; + D3DDISPLAYMODE mode, current_mode; + struct device_desc device_desc; + RECT virtual_rect, clip_rect; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + hr = IDirect3D9_GetAdapterDisplayMode(d3d, adapter_idx, &current_mode); + ok(hr == D3D_OK, "Adapter %u: GetAdapterDisplayMode failed, hr %#x.\n", adapter_idx, hr); + for (mode_idx = 0; SUCCEEDED(IDirect3D9_EnumAdapterModes(d3d, adapter_idx, D3DFMT_X8R8G8B8, + mode_idx, &mode)); ++mode_idx) + { + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != current_mode.Width && mode.Height != current_mode.Height) + break; + } + ok(mode.Width != current_mode.Width && mode.Height != current_mode.Height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + current_mode.Width, current_mode.Height); + + ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + device_desc.adapter_ordinal = adapter_idx; + device_desc.width = mode.Width; + device_desc.height = mode.Height; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + IDirect3DDevice9_Release(device); + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -13962,6 +14044,7 @@ START_TEST(device) test_multi_adapter(); test_shader_validator(); test_creation_parameters(); + test_cursor_clipping(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

2 1

[PATCH 5/8] d3d8/tests: Test cursor clipping.
by Zhiyi Zhang 07 Apr '20

07 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 85 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 25dea77b99e..ead5f47bf14 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -75,6 +75,14 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +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); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -10086,6 +10094,82 @@ static void test_creation_parameters(void) DestroyWindow(window); } +static void test_cursor_clipping(void) +{ + unsigned int adapter_idx, adapter_count, mode_idx; + D3DDISPLAYMODE mode, current_mode; + struct device_desc device_desc; + RECT virtual_rect, clip_rect; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + hr = IDirect3D8_GetAdapterDisplayMode(d3d, adapter_idx, &current_mode); + ok(hr == D3D_OK, "Adapter %u: GetAdapterDisplayMode failed, hr %#x.\n", adapter_idx, hr); + for (mode_idx = 0; SUCCEEDED(IDirect3D8_EnumAdapterModes(d3d, adapter_idx, mode_idx, &mode)); + ++mode_idx) + { + if (mode.Format != D3DFMT_X8R8G8B8) + continue; + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != current_mode.Width && mode.Height != current_mode.Height) + break; + } + ok(mode.Width != current_mode.Width && mode.Height != current_mode.Height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + current_mode.Width, current_mode.Height); + + ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + device_desc.adapter_ordinal = adapter_idx; + device_desc.width = mode.Width; + device_desc.height = mode.Height; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + IDirect3DDevice8_Release(device); + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -10204,6 +10288,7 @@ START_TEST(device) test_get_display_mode(); test_multi_adapter(); test_creation_parameters(); + test_cursor_clipping(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.20.1

2 1

[PATCH 3/8] dxgi/tests: Fix uninitialized variable warnings.
by Zhiyi Zhang 07 Apr '20

07 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e2d9907d0ea..882ed0c28b7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2131,7 +2131,7 @@ static void test_get_containing_output(void) {-49, -50}, {-50, -50}, {-51, -50}, {-49, -51}, {-50, -51}, {-51, -51}, }; - unsigned int x, y; + unsigned int x = 0, y = 0; switch (i) { -- 2.20.1

3 2

[PATCH 1/3] quartz: Cache IMediaSeeking for filters.
by Gabriel Ivăncescu 07 Apr '20

07 Apr '20

The Legend of Heroes: Trails of Cold Steel II crashes on its intro videos because it mistakenly destroys and frees its own filter when the IMediaSeeking object is destroyed, which is retrieved as a separate object when we query for it, with a refcount of 1 regardless of the filter's refcount. It does so with msvcrt operator delete, even if the filter had outstanding ref counts. It happens to work on Windows because Windows caches the object exposing the interface. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/quartz/filtergraph.c | 42 ++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c659cf9..0de16c4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -153,6 +153,7 @@ struct filter { struct list entry, sorted_entry; IBaseFilter *filter; + IMediaSeeking *seeking; WCHAR *name; BOOL sorting; }; @@ -569,6 +570,15 @@ static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *na return NULL; } +static IMediaSeeking *get_filter_seeking(struct filter *filter) +{ + /* Cache the IMediaSeeking object as some broken apps actually depend on this. */ + if (!filter->seeking) + if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void**)&filter->seeking))) + filter->seeking = NULL; + return filter->seeking; +} + static BOOL has_output_pins(IBaseFilter *filter) { IEnumPins *enumpins; @@ -593,24 +603,19 @@ static BOOL has_output_pins(IBaseFilter *filter) return FALSE; } -static BOOL is_renderer(IBaseFilter *filter) +static BOOL is_renderer(struct filter *filter) { IAMFilterMiscFlags *flags; - IMediaSeeking *seeking; BOOL ret = FALSE; - if (SUCCEEDED(IBaseFilter_QueryInterface(filter, &IID_IAMFilterMiscFlags, (void **)&flags))) + if (SUCCEEDED(IBaseFilter_QueryInterface(filter->filter, &IID_IAMFilterMiscFlags, (void **)&flags))) { if (IAMFilterMiscFlags_GetMiscFlags(flags) & AM_FILTER_MISC_FLAGS_IS_RENDERER) ret = TRUE; IAMFilterMiscFlags_Release(flags); } - else if (SUCCEEDED(IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking))) - { - IMediaSeeking_Release(seeking); - if (!has_output_pins(filter)) - ret = TRUE; - } + else if (get_filter_seeking(filter) && !has_output_pins(filter->filter)) + ret = TRUE; return ret; } @@ -675,12 +680,13 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, } IBaseFilter_AddRef(entry->filter = filter); + entry->seeking = NULL; list_add_head(&graph->filters, &entry->entry); list_add_head(&graph->sorted_filters, &entry->sorted_entry); entry->sorting = FALSE; ++graph->version; - if (is_renderer(filter)) + if (is_renderer(entry)) ++graph->nRenderers; return duplicate_name ? VFW_S_DUPLICATE_NAME : hr; @@ -755,11 +761,13 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, NULL); if (SUCCEEDED(hr)) { - if (is_renderer(pFilter)) + if (is_renderer(entry)) --This->nRenderers; IBaseFilter_SetSyncSource(pFilter, NULL); IBaseFilter_Release(pFilter); + if (entry->seeking) + IMediaSeeking_Release(entry->seeking); list_remove(&entry->entry); list_remove(&entry->sorted_entry); CoTaskMemFree(entry->name); @@ -2219,13 +2227,11 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) { - IMediaSeeking *seek = NULL; + IMediaSeeking *seek = get_filter_seeking(filter); - IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seek); if (!seek) continue; hr = FoundSeek(This, seek, arg); - IMediaSeeking_Release(seek); if (hr_return != E_NOTIMPL) allnotimpl = FALSE; if (hr_return == S_OK || (FAILED(hr) && hr != E_NOTIMPL && SUCCEEDED(hr_return))) @@ -2429,11 +2435,11 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { - if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking))) + seeking = get_filter_seeking(filter); + if (!seeking) continue; filter_hr = IMediaSeeking_GetStopPosition(seeking, &filter_stop); - IMediaSeeking_Release(seeking); if (SUCCEEDED(filter_hr)) { hr = S_OK; @@ -2539,12 +2545,12 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * { LONGLONG current = current_ptr ? *current_ptr : 0, stop = stop_ptr ? *stop_ptr : 0; - if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking))) + seeking = get_filter_seeking(filter); + if (!seeking) continue; filter_hr = IMediaSeeking_SetPositions(seeking, &current, current_flags | AM_SEEKING_ReturnTime, &stop, stop_flags); - IMediaSeeking_Release(seeking); if (SUCCEEDED(filter_hr)) { hr = S_OK; -- 2.21.0

2 4

← Newer
1
...
65
66
67
68
69
70
71
...
86
Older →

Jump to page:

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 April 2020