- Wine-Devel - list.winehq.org

[PATCH 0/6] MR170: winemac: PE conversion preparation
by Jacek Caban (＠jacek) June 2, 2022

June 2, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/170

3 7

[PATCH 1/2] d2d1/tests: Test custom effect properties.
by Ziqing Hui June 2, 2022

June 2, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 251 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c73039504d3..ae1cc9f553d 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10886,6 +10886,256 @@ done: release_test_context(&ctx); } +static void test_effect_properties(BOOL d3d11) +{ + UINT32 i, min_inputs, max_inputs, integer, index; + ID2D1EffectContext *effect_context; + D2D1_BUFFER_PRECISION precision; + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + ID2D1Effect *effect; + WCHAR buffer[128]; + CLSID clsid; + BOOL cached; + HRESULT hr; + + static const WCHAR *effect_author = L"The Wine Project"; + static const WCHAR *effect_category = L"Test"; + static const WCHAR *effect_description = L"Test effect."; + + const D2D1_PROPERTY_BINDING binding[] = + { + {L"Integer", effect_impl_set_integer, effect_impl_get_integer}, + {L"Context", NULL, effect_impl_get_context}, + }; + + const struct system_property_test + { + const WCHAR *xml; + const WCHAR *display_name; + const WCHAR *author; + const WCHAR *category; + const WCHAR *description; + UINT32 min_inputs; + UINT32 max_inputs; + } + system_property_tests[] = + { + {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + factory = ctx.factory1; + if (!factory) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + /* Test system properties */ + + for (i = 0; i < ARRAY_SIZE(system_property_tests); ++i) + { + const struct system_property_test *test = &system_property_tests[i]; + winetest_push_context("Test %u", i); + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, test->xml, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + effect = NULL; + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto next; + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, + D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_TestEffect), "Got unexpected clsid %s, expected %s.\n", + debugstr_guid(&clsid), debugstr_guid(&CLSID_TestEffect)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->display_name), "Got unexpected display name %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->display_name)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_AUTHOR, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->author), "Got unexpected author %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->author)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CATEGORY, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->category), "Got unexpected category %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->category)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DESCRIPTION, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, test->description), "Got unexpected description %s, expected %s.\n", + debugstr_w(buffer), debugstr_w(test->description)); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CACHED, + D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(cached == FALSE, "Got unexpected cached %d.\n", cached); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_PRECISION, + D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(precision == D2D1_BUFFER_PRECISION_UNKNOWN, "Got unexpected precision %#x.\n", precision); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MIN_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(min_inputs == test->min_inputs, "Got unexpected min inputs %u, expected %u.\n", + min_inputs, test->min_inputs); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_MAX_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&max_inputs, sizeof(max_inputs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n", + max_inputs, test->max_inputs); + + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_CLSID, + D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_AUTHOR, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_CATEGORY, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_CACHED, + D2D1_PROPERTY_TYPE_BOOL, (BYTE *)&cached, sizeof(cached)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_PRECISION, + D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&precision, sizeof(precision)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_MIN_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&min_inputs, sizeof(min_inputs)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, D2D1_PROPERTY_MAX_INPUTS, + D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&max_inputs, sizeof(max_inputs)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + next: + if (effect) + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + winetest_pop_context(); + } + + /* Test custom properties */ + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_c, binding, 2, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + effect = NULL; + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + + index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); + ok(index == 0, "Got unexpected index %u.\n", index); + index = ID2D1Effect_GetPropertyIndex(effect, L"Integer"); + ok(index == 1, "Got unexpected index %u.\n", index); + + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, + "Got unexpected effect context %p.\n", effect_context); + + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, + "Got unexpected effect context %p.\n", effect_context); + + hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 10, "Got unexpected integer %u.", integer); + + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 10, "Got unexpected integer %u.", integer); + + integer = 20; + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 20, "Got unexpected integer %u.", integer); + + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Test custom properties without binding */ + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_c, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); + ok(index == 0, "Got unexpected index %u.\n", index); + index = ID2D1Effect_GetPropertyIndex(effect, L"Integer"); + ok(index == 1, "Got unexpected index %u.\n", index); + + hr = ID2D1Effect_GetValueByName(effect, L"DeadBeef", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr); + + effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(effect_context == NULL, "Got unexpected effect context %p.\n", effect_context); + + integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(integer == 0, "Got unexpected integer %u.", integer); + + hr = ID2D1Effect_SetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + +done: + if (effect) + ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -12004,6 +12254,7 @@ START_TEST(d2d1) queue_test(test_mt_factory); queue_test(test_effect_register); queue_test(test_effect_context); + queue_test(test_effect_properties); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); -- 2.25.1

2 3

[PATCH v2 0/8] MR165: ntdll: Improve block size rounding compatibility.
by Rémi Bernon June 2, 2022

June 2, 2022

-- v2: ntdll: Use a more compact block layout. ntdll: Round free block size to block size alignment. ntdll: Improve block size rounding compatibility. ntdll: Remove unnecessary constants and typedefs. ntdll: Use a fixed block tail size. ntdll: Call mark_block_tail outside of initialize_block. ntdll: Fix handling of free blocks in RtlWalkHeap. kernelbase: Convert RtlWalkHeap structure on input too. https://gitlab.winehq.org/wine/wine/-/merge_requests/165

2 11

[PATCH v2 1/2] xmllite/tests: Test depth for MoveToAttributeByName().
by Ziqing Hui June 2, 2022

June 2, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/xmllite/tests/reader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c1778a9764e..7b68365ac48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2570,11 +2570,13 @@ static void test_attribute_by_name(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 0); hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 1); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); @@ -2590,14 +2592,17 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); @@ -2608,18 +2613,22 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c"); IXmlReader_Release(reader); -- 2.25.1

2 3

[PATCH 1/2] xmllite/tests: Test depth for MoveToAttributeByName().
by Ziqing Hui June 2, 2022

June 2, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/xmllite/tests/reader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c1778a9764e..7b68365ac48 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2570,11 +2570,13 @@ static void test_attribute_by_name(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 0); hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); + TEST_DEPTH(reader, 1); hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); @@ -2590,14 +2592,17 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); @@ -2608,18 +2613,22 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine TEST_DEPTH(reader, 2); reader_value(reader, L"value c"); IXmlReader_Release(reader); -- 2.25.1

3 3

[PATCH v2 0/5] MR139: winegstreamer: Implement video plane alignment for the H264 decoder.
by Rémi Bernon June 2, 2022

June 2, 2022

-- v2: winegstreamer: Enforce frame size in H264 decoder SetOutputType. winegstreamer: Support mapping of MF_MT_MINIMUM_DISPLAY_APERTURE. winegstreamer: Request native buffer alignment using video pool meta. winegstreamer: Reply with a video buffer pool to ALLOCATION queries. winegstreamer: Use a custom flag instead of sample info for caps change. https://gitlab.winehq.org/wine/wine/-/merge_requests/139

3 14

[PATCH v3 0/6] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) June 2, 2022

June 2, 2022

-- v3: user32: Factor out raw input device enumeration. user32: Use HID ioctls directly. user32: Use GUID_DEVINTERFACE_HID directly. user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure. user32: Handle failure from HID APIs. user32: Populate the RID_DEVICE_INFO structure in add_device(). https://gitlab.winehq.org/wine/wine/-/merge_requests/130

4 8

[PATCH] d3d9/tests: Do not test the alpha channel in test_multisample_get_front_buffer_data().
by Zebediah Figura June 2, 2022

June 2, 2022

This avoids test failures on radeonsi. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5d8fe10fc79..c53873f76c1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17730,7 +17730,7 @@ static void test_multisample_get_front_buffer_data(void) hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(readback, 320, 240); - ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + ok((color & 0x00ffffff) == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); IDirect3DSurface9_Release(readback); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, @@ -17742,7 +17742,7 @@ static void test_multisample_get_front_buffer_data(void) hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColorFromSurface(readback, 320, 240); - ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + ok((color & 0x00ffffff) == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); IDirect3DSurface9_Release(readback); IDirect3DTexture9_Release(texture); -- 2.36.1

2 1

[PATCH 2/2] d3d9/tests: Demonstrate that NULL HWNDs don't prevent device creation
by Andrew Eikum June 2, 2022

June 2, 2022

The game Planetary Annihilation: TITANS depends on this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 22 ++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index fc148aca4a8..86ac7cf5109 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4925,12 +4925,24 @@ static void test_pinned_buffers(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9Ex *device; D3DCOLOR color; ULONG refcount; HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); if (!(device = create_device(window, NULL))) { @@ -4954,6 +4966,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* test device with NULL HWND */ + device = create_device(NULL, NULL); + ok(!!device, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9Ex_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9Ex_Release(device); } START_TEST(d3d9ex) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2913583916a..bd394d071af 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26122,6 +26122,7 @@ static void test_nrm_instruction(void) static void test_desktop_window(void) { + IDirect3DVertexShader9 *shader; IDirect3DDevice9 *device; IDirect3D9 *d3d; D3DCOLOR color; @@ -26129,6 +26130,17 @@ static void test_desktop_window(void) HWND window; HRESULT hr; + static const DWORD simple_vs[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ + 0x00000009, 0xc0010000, 0x90e40000, 0xa0e40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xc0020000, 0x90e40000, 0xa0e40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xc0040000, 0x90e40000, 0xa0e40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003, /* dp4 oPos.w, v0, c3 */ + 0x0000ffff, /* end */ + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -26156,6 +26168,16 @@ static void test_desktop_window(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + /* test device with NULL HWND */ + device = create_device(d3d, NULL, NULL, TRUE); + ok(device != NULL, "Failed to create a D3D device\n"); + + hr = IDirect3DDevice9_CreateVertexShader(device, simple_vs, &shader); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + IDirect3DVertexShader9_Release(shader); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); } -- 2.36.1

2 1

[PATCH 1/2] d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex
by Andrew Eikum June 2, 2022

June 2, 2022

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2afe73088c7..fc148aca4a8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4923,6 +4923,39 @@ static void test_pinned_buffers(void) DestroyWindow(window); } +static void test_desktop_window(void) +{ + IDirect3DDevice9Ex *device; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + IDirect3DDevice9Ex_Release(device); + DestroyWindow(window); + + device = create_device(GetDesktopWindow(), NULL); + ok(!!device, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice9Ex_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_pixel_color(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4982,6 +5015,7 @@ START_TEST(d3d9ex) test_resource_access(); test_sysmem_draw(); test_pinned_buffers(); + test_desktop_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.36.1

2 1