August 2022 - Wine-commits - list.winehq.org

Zebediah Figura : d3d9/tests: Add tests for D3DLOCK_NO_DIRTY_UPDATE with vertex buffers.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: bc7b188f554a9efd419b480e52a057291d411c07 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc7b188f554a9efd419b480e52a057… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 6 17:13:13 2022 -0500 d3d9/tests: Add tests for D3DLOCK_NO_DIRTY_UPDATE with vertex buffers. --- dlls/d3d9/tests/visual.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8be60d5e2fb..5c31d25f2eb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19815,6 +19815,93 @@ static void add_dirty_rect_test(void) DestroyWindow(window); } +static void test_buffer_no_dirty_update(void) +{ + unsigned int refcount, colour; + IDirect3DVertexBuffer9 *vb; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + void *data; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0xff00ff00}, + + {{ 1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.1f}, 0xff00ff00}, + }, + red_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xffff0000}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(green_quad), 0, 0, D3DPOOL_MANAGED, &vb, NULL); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, 0, &data, 0); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + memcpy(data, red_quad, sizeof(red_quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, 0, &data, D3DLOCK_NO_DIRTY_UPDATE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + memcpy(data, green_quad, sizeof(green_quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*green_quad)); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x0000ff00, 1), "Got unexpected colour 0x%09x.\n", colour); + + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_per_stage_constant(void) { IDirect3DDevice9 *device; @@ -27744,6 +27831,7 @@ START_TEST(visual) volume_srgb_test(); volume_dxtn_test(); add_dirty_rect_test(); + test_buffer_no_dirty_update(); multisampled_depth_buffer_test(); resz_test(); stencil_cull_test();

1 0

Zebediah Figura : d3d8: Introduce a wined3d_usage_from_d3d() helper.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 6db6df95dca516d049f9a21cf7265248d2508245 URL: https://gitlab.winehq.org/wine/wine/-/commit/6db6df95dca516d049f9a21cf72652… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 14:15:57 2022 -0500 d3d8: Introduce a wined3d_usage_from_d3d() helper. --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 8 ++++++++ dlls/d3d8/texture.c | 13 +++---------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 463ea93e17c..1b5098c64c9 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -296,7 +296,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * buffer->usage = usage; desc.byte_width = size; - desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); /* Buffers are always readable. */ @@ -600,7 +600,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de return D3DERR_INVALIDCALL; desc.byte_width = size; - desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; + desc.usage = wined3d_usage_from_d3d(pool, usage) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); /* Buffers are always readable. */ diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index da701a2a8d3..0fb3bd5b73e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -353,6 +353,14 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int return access; } +static inline unsigned int wined3d_usage_from_d3d(D3DPOOL pool, DWORD usage) +{ + usage &= WINED3DUSAGE_MASK; + if (pool == D3DPOOL_SCRATCH) + usage |= WINED3DUSAGE_SCRATCH; + return usage; +} + static inline unsigned int wined3d_bind_flags_from_d3d8_usage(DWORD usage) { unsigned int bind_flags = 0; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f383b374bde..5f96336f2d8 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1105,9 +1105,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = usage & WINED3DUSAGE_MASK; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; @@ -1158,10 +1156,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = usage & WINED3DUSAGE_MASK; - desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage) | WINED3DUSAGE_LEGACY_CUBEMAP; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; @@ -1216,9 +1211,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = usage & WINED3DUSAGE_MASK; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width;

1 0

Zebediah Figura : d3d9: Introduce a wined3d_usage_from_d3d() helper.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: a3c4410fea86a47a012d3ab67485b9d37a89d9a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3c4410fea86a47a012d3ab67485b9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 14:21:34 2022 -0500 d3d9: Introduce a wined3d_usage_from_d3d() helper. --- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/d3d9_private.h | 13 ++++++++----- dlls/d3d9/device.c | 6 ++---- dlls/d3d9/texture.c | 13 +++---------- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 0ffb48a66c8..e6224f95763 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -303,7 +303,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * d3d9_resource_init(&buffer->resource); desc.byte_width = size; - desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); /* Buffers are always readable. */ @@ -611,7 +611,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de return D3DERR_INVALIDCALL; desc.byte_width = size; - desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; + desc.usage = wined3d_usage_from_d3d(pool, usage) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); /* Buffers are always readable. */ diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index eb01b15338a..caa146ccd85 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -373,6 +373,14 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int return access; } +static inline unsigned int wined3d_usage_from_d3d(D3DPOOL pool, DWORD usage) +{ + usage &= WINED3DUSAGE_MASK; + if (pool == D3DPOOL_SCRATCH) + usage |= WINED3DUSAGE_SCRATCH; + return usage; +} + static inline unsigned int wined3d_bind_flags_from_d3d9_usage(DWORD usage) { unsigned int bind_flags = 0; @@ -385,11 +393,6 @@ static inline unsigned int wined3d_bind_flags_from_d3d9_usage(DWORD usage) return bind_flags; } -static inline DWORD wined3dusage_from_d3dusage(unsigned int usage) -{ - return usage & WINED3DUSAGE_MASK; -} - static inline enum wined3d_multisample_type wined3d_multisample_type_from_d3d(D3DMULTISAMPLE_TYPE type) { return (enum wined3d_multisample_type)type; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 894659e9ff9..9b8e44f6891 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1976,10 +1976,8 @@ static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurface(IDirect3DDevice9Ex } } - usage = 0; - if (pool == D3DPOOL_SCRATCH) - usage |= WINED3DUSAGE_SCRATCH; - access = wined3daccess_from_d3dpool(pool, usage) + usage = wined3d_usage_from_d3d(pool, 0); + access = wined3daccess_from_d3dpool(pool, 0) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; return d3d9_device_create_surface(device, 0, wined3dformat_from_d3dformat(format), diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 19f0363db07..31bf95834b8 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1317,9 +1317,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = wined3dusage_from_d3dusage(usage); - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; @@ -1414,10 +1412,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = wined3dusage_from_d3dusage(usage); - desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage) | WINED3DUSAGE_LEGACY_CUBEMAP; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; @@ -1500,9 +1495,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = wined3dusage_from_d3dusage(usage); - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width;

1 0

Zebediah Figura : d3d11: Always return E_FAIL for formats which have no support flags.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 74ad023154e00cb5273ad855d29e463f13a544c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/74ad023154e00cb5273ad855d29e46… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 10 12:13:01 2022 -0500 d3d11: Always return E_FAIL for formats which have no support flags. --- dlls/d3d11/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0ae695901da..79b972df671 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3959,7 +3959,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * | D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD; } - return S_OK; + return *format_support ? S_OK : E_FAIL; } static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device2 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eab45931d2d..034b5e4320f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21062,15 +21062,18 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) memset(format_support, 0, sizeof(format_support)); for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) { + winetest_push_context("format %#x", format); + hr = ID3D11Device_CheckFormatSupport(device, format, &format_support[format]); - ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), - "Got unexpected result for format %#x: hr %#lx, format_support %#x.\n", - format, hr, format_support[format]); + ok((hr == S_OK && format_support[format]) || (hr == E_FAIL && !format_support[format]), + "Got unexpected hr %#lx, format_support %#x.\n", hr, format_support[format]); if (format_support[format] & D3D11_FORMAT_SUPPORT_MIP_AUTOGEN) { ok(format_support[format] & D3D11_FORMAT_SUPPORT_TEXTURE2D, - "Got unexpected format support %#x for format %#x", format_support[format], format); + "Got unexpected format support %#x", format); } + + winetest_pop_context(); } for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format)

1 0

Zebediah Figura : d3d11: Implement D3D11_FEATURE_FORMAT_SUPPORT.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: b34b5da644d2dc039c3956a073131bf56713f459 URL: https://gitlab.winehq.org/wine/wine/-/commit/b34b5da644d2dc039c3956a073131b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 10 12:18:22 2022 -0500 d3d11: Implement D3D11_FEATURE_FORMAT_SUPPORT. This allows Guild Wars 2 to start. --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 79b972df671..65706a414d8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4198,6 +4198,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_FORMAT_SUPPORT: + { + D3D11_FEATURE_DATA_FORMAT_SUPPORT *data = feature_support_data; + if (feature_support_data_size != sizeof(*data)) + { + WARN("Invalid size %u for D3D11_FEATURE_FORMAT_SUPPORT.\n", feature_support_data_size); + return E_INVALIDARG; + } + + return d3d11_device_CheckFormatSupport(iface, data->InFormat, &data->OutFormatSupport); + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 034b5e4320f..5e00bc7a336 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20993,6 +20993,7 @@ static void check_format_support(ID3D11Device *device, const unsigned int *forma static void test_format_support(const D3D_FEATURE_LEVEL feature_level) { unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; + D3D11_FEATURE_DATA_FORMAT_SUPPORT feature_data; struct device_desc device_desc; ID3D11Device *device; DXGI_FORMAT format; @@ -21054,11 +21055,32 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) return; } + feature_data.InFormat = DXGI_FORMAT_R8G8B8A8_UNORM; + + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, NULL, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, &feature_data, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, &feature_data, sizeof(feature_data) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, &feature_data, sizeof(feature_data) / 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, &feature_data, sizeof(feature_data) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, &feature_data, sizeof(feature_data) * 2); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + support = 0xdeadbeef; hr = ID3D11Device_CheckFormatSupport(device, ~0u, &support); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!support, "Got unexpected format support %#x.\n", support); + feature_data.InFormat = ~0u; + feature_data.OutFormatSupport = 0xdeadbeef; + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, &feature_data, sizeof(feature_data)); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); + ok(!feature_data.OutFormatSupport, "Got unexpected format support %#x.\n", feature_data.OutFormatSupport); + memset(format_support, 0, sizeof(format_support)); for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) { @@ -21073,6 +21095,14 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) "Got unexpected format support %#x", format); } + feature_data.InFormat = format; + hr = ID3D11Device_CheckFeatureSupport(device, D3D11_FEATURE_FORMAT_SUPPORT, + &feature_data, sizeof(feature_data)); + ok((hr == S_OK && feature_data.OutFormatSupport) || (hr == E_FAIL && !feature_data.OutFormatSupport), + "Got unexpected hr %#lx, format_support %#x.\n", hr, feature_data.OutFormatSupport); + ok(feature_data.OutFormatSupport == format_support[format], "Expected format support %#x, got %#x.\n", + format_support[format], feature_data.OutFormatSupport); + winetest_pop_context(); }

1 0

Paul Gofman : ddraw/tests: Add more tests for restoring complex surfaces.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 4c0efe444d4fa45eb0fec84980eb255c88780c21 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c0efe444d4fa45eb0fec84980eb25… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 15 20:04:10 2022 -0500 ddraw/tests: Add more tests for restoring complex surfaces. --- dlls/ddraw/tests/ddraw1.c | 44 +++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 44 +++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 56 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 191 insertions(+), 9 deletions(-)

1 0

Paul Gofman : ddraw: Restore full complex attachment chain in ddraw_surface7_Restore().
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: f48f5155eee169666ed36d324f90fd9884f63793 URL: https://gitlab.winehq.org/wine/wine/-/commit/f48f5155eee169666ed36d324f90fd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Aug 15 20:16:58 2022 -0500 ddraw: Restore full complex attachment chain in ddraw_surface7_Restore(). --- dlls/ddraw/surface.c | 12 ++++++++++-- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index afba0d5ac4b..038539632e1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3787,6 +3787,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *attachment; unsigned int i; TRACE("iface %p.\n", iface); @@ -3832,10 +3833,17 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) return DDERR_WRONGMODE; surface->is_lost = FALSE; + for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { - if (surface->complex_array[i]) - surface->complex_array[i]->is_lost = FALSE; + attachment = surface->complex_array[i]; + while (attachment) + { + attachment->is_lost = FALSE; + attachment = attachment->complex_array[0]; + if (attachment == surface->complex_array[i]) + break; + } } return DD_OK; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8d5896e45a0..1629660aedc 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8241,7 +8241,7 @@ static void test_lost_device(void) ok(back_buffer2 != back_buffer, "Got the same surface.\n"); ok(back_buffer2 != surface, "Got the same surface.\n"); hr = IDirectDrawSurface_IsLost(back_buffer2); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); IDirectDrawSurface_Release(back_buffer2); if (ds) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 22cd59ec9b0..0aea1587156 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9236,7 +9236,7 @@ static void test_lost_device(void) ok(back_buffer2 != back_buffer, "Got the same surface.\n"); ok(back_buffer2 != surface, "Got the same surface.\n"); hr = IDirectDrawSurface_IsLost(back_buffer2); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); IDirectDrawSurface_Release(back_buffer2); if (ds) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c1bd91dec88..ab37adc000a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10655,7 +10655,7 @@ static void test_lost_device(void) ok(back_buffer2 != back_buffer, "Got the same surface.\n"); ok(back_buffer2 != surface, "Got the same surface.\n"); hr = IDirectDrawSurface4_IsLost(back_buffer2); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); IDirectDrawSurface4_Release(back_buffer2); if (ds) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8ea566cee4c..c72ea64c17d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10405,7 +10405,7 @@ static void test_lost_device(void) ok(back_buffer2 != back_buffer, "Got the same surface.\n"); ok(back_buffer2 != surface, "Got the same surface.\n"); hr = IDirectDrawSurface7_IsLost(back_buffer2); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); IDirectDrawSurface7_Release(back_buffer2); if (ds)

1 0

Piotr Caban : winspool.drv: Ignore device name if printer handle is passed in DocumentProperties.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 4723b6b8c5370782c5735cac98fedf5bc4b239cf URL: https://gitlab.winehq.org/wine/wine/-/commit/4723b6b8c5370782c5735cac98fedf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 15 19:56:21 2022 +0200 winspool.drv: Ignore device name if printer handle is passed in DocumentProperties. --- dlls/winspool.drv/info.c | 2 +- dlls/winspool.drv/tests/info.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e1cd0338207..d800eae159f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1889,7 +1889,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, TRACE("(%p,%p,%s,%p,%p,%ld)\n", hWnd, hPrinter, debugstr_w(pDeviceName), pDevModeOutput, pDevModeInput, fMode); - device = pDeviceName && pDeviceName[0] ? pDeviceName : get_opened_printer_name(hPrinter); + device = hPrinter ? get_opened_printer_name(hPrinter) : pDeviceName; if (!device) { ERR("no device name\n"); return -1; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f7464d9d696..47f602b7de3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2679,6 +2679,7 @@ static void test_DocumentProperties(void) LONG dm_size, ret; DEVMODEA *dm; char empty_str[] = ""; + char non_existing_str[] = "non existing printer"; if (!default_printer) { @@ -2707,6 +2708,9 @@ static void test_DocumentProperties(void) ret = DocumentPropertiesA(0, hprn, empty_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); + ret = DocumentPropertiesA(0, hprn, non_existing_str, dm, dm, DM_OUT_BUFFER); + ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); + test_DEVMODEA(dm, dm_size, default_printer); HeapFree(GetProcessHeap(), 0, dm);

1 0

Piotr Caban : winspool.drv: Fix get_config_module when printer and driver names differ.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 26c95858a18de555bd56cffb64f8902d5b88a18d URL: https://gitlab.winehq.org/wine/wine/-/commit/26c95858a18de555bd56cffb64f890… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 15 21:13:17 2022 +0200 winspool.drv: Fix get_config_module when printer and driver names differ. --- dlls/winspool.drv/info.c | 89 ++++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d800eae159f..3806384ee08 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -374,6 +374,30 @@ static HKEY WINSPOOL_OpenDriverReg(const void *pEnvironment) return retval; } +enum printers_key +{ + system_printers_key, + user_printers_key, + user_ports_key, + user_default_key, +}; + +static DWORD create_printers_reg_key( enum printers_key type, HKEY *key ) +{ + switch( type ) + { + case system_printers_key: + return RegCreateKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Print\\Printers", key ); + case user_printers_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Devices", key ); + case user_ports_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\PrinterPorts", key ); + case user_default_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows", key ); + } + return ERROR_PATH_NOT_FOUND; +} + static CRITICAL_SECTION config_modules_cs; static CRITICAL_SECTION_DEBUG config_modules_cs_debug = { @@ -400,13 +424,13 @@ static void release_config_module(config_module_t *config_module) static config_module_t *get_config_module(const WCHAR *device, BOOL grab) { - WCHAR driver[MAX_PATH]; + WCHAR driver_name[100], driver[MAX_PATH]; DWORD size, len; - HKEY driver_key, device_key; + HKEY printers_key, printer_key, drivers_key, driver_key; HMODULE driver_module; config_module_t *ret = NULL; struct wine_rb_entry *entry; - DWORD type; + DWORD r, type; LSTATUS res; EnterCriticalSection(&config_modules_cs); @@ -418,15 +442,38 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) } if (!grab) goto ret; - if (!(driver_key = WINSPOOL_OpenDriverReg(NULL))) goto ret; + if (create_printers_reg_key(system_printers_key, &printers_key)) + { + ERR("Can't create Printers key\n"); + goto ret; + } - res = RegOpenKeyW(driver_key, device, &device_key); - RegCloseKey(driver_key); - if (res) { + r = RegOpenKeyW(printers_key, device, &printer_key); + RegCloseKey(printers_key); + if (r) + { WARN("Device %s key not found\n", debugstr_w(device)); goto ret; } + size = sizeof(driver_name); + r = RegQueryValueExW(printer_key, L"Printer Driver", 0, &type, (BYTE *)driver_name, &size); + RegCloseKey(printer_key); + if (r || type != REG_SZ) + { + WARN("Can't get Printer Driver name\n"); + goto ret; + } + + if (!(drivers_key = WINSPOOL_OpenDriverReg(NULL))) goto ret; + + res = RegOpenKeyW(drivers_key, driver_name, &driver_key); + RegCloseKey(drivers_key); + if (res) { + WARN("Driver %s key not found\n", debugstr_w(driver_name)); + goto ret; + } + size = sizeof(driver); if (!GetPrinterDriverDirectoryW(NULL, NULL, 1, (LPBYTE)driver, size, &size)) goto ret; @@ -435,9 +482,9 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) driver[len++] = '3'; driver[len++] = '\\'; size = sizeof(driver) - len * sizeof(WCHAR); - res = RegQueryValueExW( device_key, L"Configuration File", NULL, &type, + res = RegQueryValueExW( driver_key, L"Configuration File", NULL, &type, (BYTE *)(driver + len), &size ); - RegCloseKey(device_key); + RegCloseKey(driver_key); if (res || type != REG_SZ) { WARN("no configuration file: %lu\n", res); goto ret; @@ -553,30 +600,6 @@ static HANDLE get_backend_handle( HANDLE hprn ) return printer->backend_printer; } -enum printers_key -{ - system_printers_key, - user_printers_key, - user_ports_key, - user_default_key, -}; - -static DWORD create_printers_reg_key( enum printers_key type, HKEY *key ) -{ - switch( type ) - { - case system_printers_key: - return RegCreateKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Print\\Printers", key ); - case user_printers_key: - return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Devices", key ); - case user_ports_key: - return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\PrinterPorts", key ); - case user_default_key: - return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows", key ); - } - return ERROR_PATH_NOT_FOUND; -} - static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) { HKEY printers;

1 0

Zhiyi Zhang : comctl32/tests: Add GetWindowSubclass() tests.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: f7443102009fb67a0dc7a5bca60f6cc46209bb30 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7443102009fb67a0dc7a5bca60f6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:22:55 2022 +0800 comctl32/tests: Add GetWindowSubclass() tests. --- dlls/comctl32/tests/subclass.c | 52 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 439d61a83c8..b7b4dd0508d 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -29,6 +29,7 @@ #include "wine/heap.h" #include "wine/test.h" +static BOOL (WINAPI *pGetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR *); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); @@ -311,11 +312,12 @@ static BOOL init_function_pointers(void) */ #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) MAKEFUNC_ORD(SetWindowSubclass, 410); + MAKEFUNC_ORD(GetWindowSubclass, 411); MAKEFUNC_ORD(RemoveWindowSubclass, 412); MAKEFUNC_ORD(DefSubclassProc, 413); #undef MAKEFUNC_ORD - if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) + if(!pSetWindowSubclass || !pGetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); return FALSE; @@ -338,6 +340,53 @@ static BOOL init_function_pointers(void) return TRUE; } +static void test_GetWindowSubclass(void) +{ + DWORD_PTR data; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowA("TestSubclass", "Test subclass", WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, + 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %ld.\n", GetLastError()); + + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 7); + ok(ret, "SetWindowSubclass failed.\n"); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(NULL, wnd_proc_sub, 2, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, NULL, 2, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 0, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + /* Crash on Wine */ + if (strcmp(winetest_platform, "wine")) + { + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL); + ok(ret, "GetWindowSubclass failed.\n"); + } + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, &data); + ok(ret, "GetWindowSubclass failed.\n"); + ok(data == 7, "Got unexpected data %#Ix.\n", data); + + pRemoveWindowSubclass(hwnd, wnd_proc_sub, 2); + DestroyWindow(hwnd); +} + START_TEST(subclass) { if(!init_function_pointers()) return; @@ -345,4 +394,5 @@ START_TEST(subclass) if(!register_window_classes()) return; test_subclass(); + test_GetWindowSubclass(); }

1 0