wine-devel June 2022

wine-devel@winehq.org

68 participants
754 discussions

Start a nNew thread

[PATCH] include: Allow making Wine Server requests from C++ code
by Mahdi Tayarani 03 Jun '22

03 Jun '22

1 0

[PATCH v4 1/6] jscript: Don't allow starting script using state from uninitialized.
by Gabriel Ivăncescu 03 Jun '22

03 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v4: Fix error on last patch. dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d..d6028e6 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5..8723541 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.34.1

2 11

[PATCH 0/4] MR183: kernelbase: Implement VirtualAlloc2FromApp().
by Nikolay Sivov (＠nsivov) 03 Jun '22

03 Jun '22

Also add some tests for three different ways of splitting the region. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/183

2 4

[PATCH 0/1] MR182: winex11: Use XKB key names to map key codes to scan codes.
by Timo Zuccarello (＠timozuccarello) 03 Jun '22

03 Jun '22

Resubmitted as MR, the original patch was https://source.winehq.org/patches/data/232032 (not assigned yet). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/182

2 1

[PATCH v2 1/2] dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod of DWM_TIMING_INFO from DwmGetCompositionTimingInfo().
by Jactry Zeng 03 Jun '22

03 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53038 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 236601. --- dlls/dwmapi/Makefile.in | 1 + dlls/dwmapi/dwmapi_main.c | 27 ++++++++++++++++++++++++++- dlls/dwmapi/tests/Makefile.in | 2 +- dlls/dwmapi/tests/dwmapi.c | 22 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index e63dbc2ea00..37411a57608 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = dwmapi.dll +IMPORTS = user32 IMPORTLIB = dwmapi EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6bb086a87d1..1fb522e389a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -211,12 +211,28 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i return E_NOTIMPL; } +static int get_display_frequency(void) +{ + DEVMODEA mode; + + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode)) + return mode.dmDisplayFrequency; + else + { + WARN("Failed to query display frequency, returning a fallback value.\n"); + return 60; + } +} + /********************************************************************** * DwmGetCompositionTimingInfo (DWMAPI.@) */ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) { - static int i; + LARGE_INTEGER performance_frequency; + static int i, display_frequency; if (!info) return E_INVALIDARG; @@ -229,6 +245,15 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) memset(info, 0, info->cbSize); info->cbSize = sizeof(DWM_TIMING_INFO); + display_frequency = get_display_frequency(); + info->rateRefresh.uiNumerator = display_frequency; + info->rateRefresh.uiDenominator = 1; + info->rateCompose.uiNumerator = display_frequency; + info->rateCompose.uiDenominator = 1; + + QueryPerformanceFrequency(&performance_frequency); + info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency; + return S_OK; } diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in index 6c6130401d6..e819e3ca09a 100644 --- a/dlls/dwmapi/tests/Makefile.in +++ b/dlls/dwmapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwmapi.dll -IMPORTS = dwmapi +IMPORTS = dwmapi user32 C_SRCS = \ dwmapi.c diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c index 696aa9c9d86..29dbcbe74bd 100644 --- a/dlls/dwmapi/tests/dwmapi.c +++ b/dlls/dwmapi/tests/dwmapi.c @@ -35,7 +35,11 @@ static void test_DwmIsCompositionEnabled(void) static void test_DwmGetCompositionTimingInfo(void) { + LARGE_INTEGER performance_frequency; + int result, display_frequency; DWM_TIMING_INFO timing_info; + QPC_TIME refresh_period; + DEVMODEA mode; BOOL enabled; HRESULT hr; @@ -56,9 +60,27 @@ static void test_DwmGetCompositionTimingInfo(void) hr = DwmGetCompositionTimingInfo(NULL, &timing_info); ok(hr == MILERR_MISMATCHED_SIZE, "Got hr %#lx.\n", hr); + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + result = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode); + ok(!!result, "Failed to get display mode %#lx.\n", GetLastError()); + display_frequency = mode.dmDisplayFrequency; + ok(!!QueryPerformanceFrequency(&performance_frequency), "Failed to get performance counter frequency.\n"); + refresh_period = performance_frequency.QuadPart / display_frequency; + timing_info.cbSize = sizeof(timing_info); hr = DwmGetCompositionTimingInfo(NULL, &timing_info); ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(timing_info.cbSize == sizeof(timing_info), "Got wrong struct size %d.\n", timing_info.cbSize); + ok(timing_info.rateRefresh.uiDenominator == 1 && timing_info.rateRefresh.uiNumerator == display_frequency, + "Got wrong monitor refresh rate %d/%d.\n", timing_info.rateRefresh.uiDenominator, + timing_info.rateRefresh.uiNumerator); + ok(timing_info.rateCompose.uiDenominator == 1 && timing_info.rateCompose.uiNumerator == display_frequency, + "Got wrong composition rate %d/%d.\n", timing_info.rateCompose.uiDenominator, + timing_info.rateCompose.uiNumerator); + ok(timing_info.qpcRefreshPeriod == refresh_period + || broken(timing_info.qpcRefreshPeriod == display_frequency), /* win10 v1507 */ + "Got wrong monitor refresh period %s.\n", wine_dbgstr_longlong(timing_info.qpcRefreshPeriod)); } START_TEST(dwmapi) -- 2.35.1

1 1

[PATCH] user32: Perform HID ioctls on the right file handle.
by Zebediah Figura 03 Jun '22

03 Jun '22

This fixes a regression from 8962ec5a83286488da6f839ceba3c39ad1cf00b3. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 90ca074f2a4..4dc240b58b3 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -153,7 +153,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, switch (type) { case RIM_TYPEHID: - status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &hid_info, sizeof(hid_info) ); if (status) @@ -172,7 +172,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, goto fail; } - status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, preparsed, hid_info.DescriptorSize ); if (status) -- 2.35.1

2 1

[PATCH 0/11] MR177: winemac: PE conversion
by Jacek Caban (＠jacek) 03 Jun '22

03 Jun '22

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

3 12

[PATCH vkd3d v3 1/7] tests: Test how matrix types interact with semantics.
by Giovanni Mascellani 03 Jun '22

03 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v2: * Use the new single component syntax --- Makefile.am | 1 + tests/matrix-semantics.shader_test | 71 ++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 tests/matrix-semantics.shader_test diff --git a/Makefile.am b/Makefile.am index dd3ce1ff..74c23b2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/math.shader_test \ + tests/matrix-semantics.shader_test \ tests/nointerpolation.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ diff --git a/tests/matrix-semantics.shader_test b/tests/matrix-semantics.shader_test new file mode 100644 index 00000000..6a089683 --- /dev/null +++ b/tests/matrix-semantics.shader_test @@ -0,0 +1,71 @@ +[pixel shader] +float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader] +row_major float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[require] +shader model >= 4.0 + +[pixel shader] +row_major float4x1 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all r (1.0) + +[pixel shader] +float1x4 main() : sv_target +{ + return float4(1.0, 2.0, 3.0, 4.0); +} + +[test] +todo draw quad +probe all r (1.0) + +[pixel shader] +void main(out row_major float1x4 x : sv_target0, out float1x4 y : sv_target1) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[test] +todo draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + +[pixel shader fail todo] +void main(out float1x4 x : sv_target0, out float1x4 y : sv_target1) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[pixel shader] +void main(out float1x4 x : sv_target0, out float1x4 y : sv_target4) +{ + x = float4(1.0, 2.0, 3.0, 4.0); + y = float4(5.0, 6.0, 7.0, 8.0); +} + +[test] +todo draw quad +probe all r (1.0) -- 2.36.1

2 8

[PATCH v2 1/2] d2d1/tests: Test custom effect properties.
by Ziqing Hui 03 Jun '22

03 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Fix test failure on win8. 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..397e460cbb2 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 || broken(hr == S_OK) /* win8 */, "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 || broken(hr == S_OK) /* win8 */, "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 || broken(hr == S_OK) /* win8 */, "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 || broken(hr == S_OK) /* win8 */, "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

3 5

[PATCH 1/4] d3d10core/tests: Add a regression test for writing to the stencil buffer after clearing it.
by Zebediah Figura 03 Jun '22

03 Jun '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 66 ++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b92448ba932..4bbfc494d47 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19482,6 +19482,71 @@ static void test_rtv_depth_slice(void) release_test_context(&test_context); } +/* This is a regression test for a rather specific code path, triggered by + * SnowRunner. + * + * When a DSV is written to with a depth/stencil state that only writes stencil, + * we need to ensure that locations other than the draw binding are invalidated. + * In particular, if the texture was previously in CLEARED, that must be + * invalidated. + */ +static void test_stencil_only_write_after_clear(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + ID3D10DepthStencilState *ds_state; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsv; + ID3D10Texture2D *ds_texture; + ID3D10Device *device; + HRESULT hr; + + static const struct D3D10_DEPTH_STENCIL_DESC ds_desc = + { + .DepthEnable = FALSE, + .StencilEnable = TRUE, + .StencilReadMask = 0xff, + .StencilWriteMask = 0xff, + .FrontFace.StencilFunc = D3D10_COMPARISON_NOT_EQUAL, + .FrontFace.StencilPassOp = D3D10_STENCIL_OP_REPLACE, + .FrontFace.StencilFailOp = D3D10_STENCIL_OP_REPLACE, + .FrontFace.StencilDepthFailOp = D3D10_STENCIL_OP_REPLACE, + .BackFace.StencilFunc = D3D10_COMPARISON_NOT_EQUAL, + .BackFace.StencilPassOp = D3D10_STENCIL_OP_REPLACE, + .BackFace.StencilFailOp = D3D10_STENCIL_OP_REPLACE, + .BackFace.StencilDepthFailOp = D3D10_STENCIL_OP_REPLACE, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &ds_texture); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)ds_texture, NULL, &dsv); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ID3D10Device_OMSetDepthStencilState(device, ds_state, 0xff); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, dsv); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0); + draw_color_quad(&test_context, &green); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D10Texture2D_Release(ds_texture); + ID3D10DepthStencilView_Release(dsv); + ID3D10DepthStencilState_Release(ds_state); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19614,6 +19679,7 @@ START_TEST(d3d10core) queue_test(test_texture_compressed_3d); queue_test(test_dynamic_map_synchronization); queue_test(test_rtv_depth_slice); + queue_test(test_stencil_only_write_after_clear); run_queued_tests(); -- 2.36.1

2 4

← Newer
1
...
66
67
68
69
70
71
72
...
76
Older →

Jump to page:

2025

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 June 2022