- wine-devel - winehq.org

[PATCH] d3d11/tests: Disable cross-device ContextState tests.
by Stefan Dösinger 19 Jan '22

19 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51103 Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 151 +++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 68 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 55a245c744c..d3bf7fefcf2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7396,74 +7396,88 @@ static void test_device_context_state(void) refcount = ID3D11VertexShader_Release(tmp_vs); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - /* context states may be used with other devices instances too */ - d3d11_device2 = create_device(NULL); - ok(!!d3d11_device2, "Failed to create device.\n"); - hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); - ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); - ID3D11Device_Release(d3d11_device2); - ID3D11Device1_GetImmediateContext1(device2, &context2); - ok(!!context2, "Failed to get immediate context.\n"); - - /* but they track a distinct state on each context */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); - ok(!!tmp_context_state, "Failed to get context state.\n"); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - /* updating context2 vertex shader doesn't update other contexts using the same state */ - ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); - ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); - refcount = ID3DDeviceContextState_Release(tmp_context_state); - ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); - refcount = ID3DDeviceContextState_Release(context_state2); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - ok(context_state2 == context_state, "Got unexpected state pointer.\n"); - - /* swapping the default state on context2 effectively clears the vertex shader */ - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); - ok(!!tmp_context_state, "Failed to get context state.\n"); - refcount = ID3DDeviceContextState_Release(tmp_context_state); - ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); - - /* clearing the vertex shader on context doesn't have side effect on context2 */ - ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); - refcount = ID3D11VertexShader_Release(vs2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - /* even after swapping it again */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - /* swapping the initial state on context2 doesn't have side effect on context either */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - refcount = ID3D11DeviceContext1_Release(context2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3D11Device1_Release(device2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + /* context states may be used with other devices instances too + * + * Or at least, no error is returned right away. Using objects like shaders + * from other device instances causes a segfault later on Nvidia Windows + * drivers. This suggests the feature tested below is more a bug than a + * feature. + * + * The tests below suggest that a ContextState object stores its own state + * for every device it is used with. This isn't entirely true, e.g. the + * primitive topology can be transfered between devices, but will cause odd + * refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 + * references on the context's device for example). */ + if (0) + { + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + /* but they track a distinct state on each context */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + /* updating context2 vertex shader doesn't update other contexts using the same state */ + ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + /* swapping the default state on context2 effectively clears the vertex shader */ + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + + /* clearing the vertex shader on context doesn't have side effect on context2 */ + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = get_refcount(vs2); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* even after swapping it again */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* swapping the initial state on context2 doesn't have side effect on context either */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + } ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); @@ -8132,6 +8146,7 @@ static void test_device_context_state(void) if (hs) ID3D11HullShader_Release(hs); ID3D11PixelShader_Release(ps); ID3D11GeometryShader_Release(gs); + ID3D11VertexShader_Release(vs2); ID3D11VertexShader_Release(vs); ID3D11Buffer_Release(cb); ID3D11ShaderResourceView_Release(srv); -- 2.24.3 (Apple Git-128)

3 2

Regarding WinRT and external libraries
by Bernhard Kölbl 19 Jan '22

19 Jan '22

Hello everyone, I have recently started to (try) working on the implementation of WinRT speech recognition (Windows.Media.Speech), which seems to be mainly used by a few games right now (e.g. Phasmophobia). I already finished working on the IDLs, and stubs for the most needed interfaces. The first hurdles weren't really hard to solve, but now, as I'm not the most experience Wine dev and WinRT isn't such a big thing in Wine yet, I came across a few issues that I'd like to discuss: *What are the plans on handling the reuse of common COM-objects across different WinRT dlls? E.g. Creating a vtable for something like IVector<HSTRING>, every time it's used in different DLLs, seems counterproductive and creates unneeded redundant code, because it always provides the same functionality. *What are the requirements for external libraries to be used in Wine? I thought of using something like VOSK or Mozilla DeepSpeech for voice recognition. Would those be acceptable? Bernhard

2 1

[PATCH vkd3d v3 8/8] tests: Test initializer argument flattening.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-flatten.shader_test | 70 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 tests/hlsl-initializer-flatten.shader_test diff --git a/Makefile.am b/Makefile.am index f09a9434..3f71acba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ @@ -297,6 +298,7 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl-initializer-flatten.shader_test new file mode 100644 index 00000000..4fd71da7 --- /dev/null +++ b/tests/hlsl-initializer-flatten.shader_test @@ -0,0 +1,70 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aa = {1, float2(2, 3), 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1, 2, 3, 4) + + +[pixel shader] +struct stu { + int3 aa; + float4 bb; +}; + +float4 main() : sv_target +{ + struct stu foo = {1, 2, float2(3, 4), int3(5, 6, 7)}; + return foo.bb; +} + +[test] +draw quad +probe all rgba (4, 5, 6, 7) + + +[pixel shader] +float4 main() : sv_target +{ + int4 aa = {10, 20, 30, 40}; + float4 foo[3] = {1, aa, aa, 2, 3, 4}; + return foo[1]; +} + +[test] +draw quad +probe all rgba (40, 10, 20, 30) + + +[pixel shader] +struct stu { + float aa; + int bb; +}; + +float4 main() : sv_target +{ + struct stu foo = {2.0, 3}; + float4 f = {1.0, foo, 4.0}; + return f; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +float4 main() : sv_target +{ + int arr[3] = {2, 3, 4}; + float4 f = {1.0, arr}; + return f; +} +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) -- 2.25.1

1 0

[PATCH vkd3d v3 7/8] tests: Test single numeric initializers.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + ...lsl-single-numeric-initializer.shader_test | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/hlsl-single-numeric-initializer.shader_test diff --git a/Makefile.am b/Makefile.am index 0b61aba9..f09a9434 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,6 +83,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ + tests/hlsl-single-numeric-initializer.shader_test \ tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ diff --git a/tests/hlsl-single-numeric-initializer.shader_test b/tests/hlsl-single-numeric-initializer.shader_test new file mode 100644 index 00000000..0aee6439 --- /dev/null +++ b/tests/hlsl-single-numeric-initializer.shader_test @@ -0,0 +1,24 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aa = 7; + return aa; +} +[test] +draw quad +probe all rgba (7.0, 7.0, 7.0, 7.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 bb; + float3 aa = 7; + + bb.xyz = aa; + bb.w = 8.0; + return bb; +} + +[test] +draw quad +probe all rgba (7.0, 7.0, 7.0, 8.0) -- 2.25.1

1 0

[PATCH vkd3d v3 6/8] tests: Test initialization using a numeric constructor with implicit truncation.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ ...numeric-constructor-truncation.shader_test | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 tests/hlsl-numeric-constructor-truncation.shader_test diff --git a/Makefile.am b/Makefile.am index 1ff09003..0b61aba9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -78,6 +78,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ + tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ @@ -308,6 +309,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ + tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ diff --git a/tests/hlsl-numeric-constructor-truncation.shader_test b/tests/hlsl-numeric-constructor-truncation.shader_test new file mode 100644 index 00000000..f54ce44d --- /dev/null +++ b/tests/hlsl-numeric-constructor-truncation.shader_test @@ -0,0 +1,32 @@ +[pixel shader] +float4 main() : sv_target +{ + float3 x = float4(71, 72, 73, 74); + return float4(x, 75); +} + +[test] +draw quad +probe all rgba (71.0, 72.0, 73.0, 75.0) + + +[pixel shader] +struct stu { + float aa; + float2 bb; + float cc; +}; + +float4 main() : sv_target +{ + struct stu foo; + foo.cc = 5; + foo.bb = float3(2, 3, 4); // It shall not overflow to cc; + foo.aa = 1; + + return float4(foo); +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 5.0) -- 2.25.1

1 0

[PATCH vkd3d v3 5/8] tests: Test nested initializers.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-nested.shader_test | 54 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 tests/hlsl-initializer-nested.shader_test diff --git a/Makefile.am b/Makefile.am index 1ac43c6d..1ff09003 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ @@ -294,6 +295,7 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ diff --git a/tests/hlsl-initializer-nested.shader_test b/tests/hlsl-initializer-nested.shader_test new file mode 100644 index 00000000..b32ced40 --- /dev/null +++ b/tests/hlsl-initializer-nested.shader_test @@ -0,0 +1,54 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aaa = {1, {{{2, {3}}, 4}}}; + return aaa; +} + +[test] +draw quad +probe all rgba (1, 2, 3, 4) + + +[pixel shader] +float4 main() : sv_target +{ + float4 aaa[3] = { + 11, {{{12, {13}}, 14}, + 21, 22}, 23, {{24, + 31, {32, 33}, 34}}, + }; + return aaa[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +struct stu1 +{ + float4 aaa; + float4 bbb; +}; + +struct stu2 +{ + int3 ccc; + stu1 ddd; +}; + +float4 main() : sv_target +{ + struct stu2 val = { + 11, {12, 13, + 21, {{{22}}}, 23}, {{24, + 31, 32}}, 33, 34, + }; + return val.ddd.aaa; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

1 0

[PATCH vkd3d v3 4/8] tests: Test complex initializers for numeric types.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-initializer-numeric.shader_test | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 tests/hlsl-initializer-numeric.shader_test diff --git a/Makefile.am b/Makefile.am index cdb59a85..1ac43c6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-invalid.shader_test \ @@ -295,6 +296,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test new file mode 100644 index 00000000..2fce3909 --- /dev/null +++ b/tests/hlsl-initializer-numeric.shader_test @@ -0,0 +1,35 @@ +[pixel shader] +float4 main() : sv_target +{ + int4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float3 aa = {1, 2, 3}; + float4 bb = {aa.x, aa.y, aa.z, 4.0}; + return bb; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 -- 2.25.1

1 0

[PATCH vkd3d v3 3/8] tests: Test invalid number of arguments on initializers.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + ...lsl-initializer-invalid-n-args.shader_test | 95 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 tests/hlsl-initializer-invalid-n-args.shader_test diff --git a/Makefile.am b/Makefile.am index 4a079c11..cdb59a85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ @@ -292,6 +293,7 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ diff --git a/tests/hlsl-initializer-invalid-n-args.shader_test b/tests/hlsl-initializer-invalid-n-args.shader_test new file mode 100644 index 00000000..bde6024f --- /dev/null +++ b/tests/hlsl-initializer-invalid-n-args.shader_test @@ -0,0 +1,95 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 + }; + return color[1][1]; +} + +[test] +draw quad +probe all rgba (17, 18, 19, 20) + + +[pixel shader fail] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 + }; + return color[1][1]; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 + }; + return color[1][1]; +} + + +[pixel shader] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, 32, + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (22, 23, 24, 25) + + +[pixel shader fail] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, 32, 33, + }; + return val.bbb[1].foo; +} + + +[pixel shader fail] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, + }; + return val.bbb[1].foo; +} -- 2.25.1

1 0

[PATCH vkd3d v3 2/8] tests: Test struct initializers.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 78 +++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 tests/hlsl-initializer-struct.shader_test diff --git a/Makefile.am b/Makefile.am index efe99124..4a079c11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -293,6 +294,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test new file mode 100644 index 00000000..d5181f0e --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,78 @@ +[pixel shader] +struct stu { + int3 aaa; + float3 bbb; + double2 ccc; + float4 ddd; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 21, 22, 23, + 31, 32, + 41, 42, 43, 44, + 51 + }; + return val.ddd; +} + +[test] +draw quad +probe all rgba (41, 42, 43, 44) + + +[pixel shader] +struct stu { + int3 aaa; + float3 bbb[2]; + double2 ccc; + float4 ddd[3][2]; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 211, 212, 213, 221, 222, 223, + 31, 32, + 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124, + 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224, + 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324, + 51 + }; + return val.ddd[2][0]; +} + +[test] +draw quad +probe all rgba (4311, 4312, 4313, 4314) + + +[pixel shader] +struct stu { + int3 aaa; + struct { + float4 foo; + int2 bar; + } bbb[3]; +}; + +float4 main() : sv_target +{ + struct stu val = { + 1, 2, 3, + 11, 12, 13, 14, 15, 16, + 21, 22, 23, 24, 25, 26, + 31, 32, 33, 34, 35, 36 + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + -- 2.25.1

1 0

[PATCH vkd3d v3 01/12] vkd3d-shader/hlsl: Add support for sm4 instruction modifiers.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 54 ++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2458018f..07bbd376 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -727,6 +727,46 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ } } +struct sm4_instruction_modifier +{ + enum vkd3d_sm4_instruction_modifier type; + + union + { + struct + { + int u,v,w; + } aoffimmi; + }; +}; + +static uint32_t sm4_encode_instruction_modifier(struct sm4_instruction_modifier imod) +{ + uint32_t word = 0; + + word |= VKD3D_SM4_MODIFIER_MASK & imod.type; + + switch (imod.type) + { + case VKD3D_SM4_MODIFIER_AOFFIMMI: + assert(-8 <= imod.aoffimmi.u && imod.aoffimmi.u <= 7); + assert(-8 <= imod.aoffimmi.v && imod.aoffimmi.v <= 7); + assert(-8 <= imod.aoffimmi.w && imod.aoffimmi.w <= 7); + word |= ((uint32_t)imod.aoffimmi.u & 0xf) << VKD3D_SM4_AOFFIMMI_U_SHIFT; + word |= ((uint32_t)imod.aoffimmi.v & 0xf) << VKD3D_SM4_AOFFIMMI_V_SHIFT; + word |= ((uint32_t)imod.aoffimmi.w & 0xf) << VKD3D_SM4_AOFFIMMI_W_SHIFT; + break; + + default: + FIXME("Unhandled instruction modifier %#x.\n", imod.type); + return 0; + break; + } + + return word; +} + + struct sm4_register { enum vkd3d_sm4_register_type type; @@ -741,6 +781,9 @@ struct sm4_instruction { enum vkd3d_sm4_opcode opcode; + struct sm4_instruction_modifier modifiers[1]; + unsigned int modifier_count; + struct { struct sm4_register reg; @@ -913,6 +956,7 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st uint32_t token = instr->opcode; unsigned int size = 1, i, j; + size += instr->modifier_count; for (i = 0; i < instr->dst_count; ++i) size += sm4_register_order(&instr->dsts[i].reg); for (i = 0; i < instr->src_count; ++i) @@ -920,8 +964,18 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st size += instr->idx_count; token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + + token |= ((0 < instr->modifier_count) << 31); + put_u32(buffer, token); + for (i = 0; i < instr->modifier_count; i++) + { + token = sm4_encode_instruction_modifier(instr->modifiers[i]); + token |= ((i + 1 < instr->modifier_count) << 31); + put_u32(buffer, token); + } + for (i = 0; i < instr->dst_count; ++i) { token = sm4_encode_register(&instr->dsts[i].reg); -- 2.25.1

5 7

[PATCH vkd3d] vkd3d-shader/hlsl: Handle constant value operations on a different file.
by Francisco Casas 19 Jan '22

19 Jan '22

On constant folding, first switch on the op type, handling each operation using a function defined on hlsl_constant_ops.c. Each of these operations switches on the data type, if needed. Since constant value casting had to be rewritten, support was extended to all numeric types. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- I suggest moving the definitions of the operations to this new file since they may end up being considerably large and similar. I am not sure if I should be on the copyright notice of the new files. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 104 ++++--------- libs/vkd3d-shader/hlsl_constant_ops.c | 209 ++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_constant_ops.h | 30 ++++ 4 files changed, 268 insertions(+), 77 deletions(-) create mode 100644 libs/vkd3d-shader/hlsl_constant_ops.c create mode 100644 libs/vkd3d-shader/hlsl_constant_ops.h diff --git a/Makefile.am b/Makefile.am index 20fee06d..6bf8e1e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -194,6 +194,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/hlsl.c \ libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ + libs/vkd3d-shader/hlsl_constant_ops.c \ libs/vkd3d-shader/hlsl_sm1.c \ libs/vkd3d-shader/hlsl_sm4.c \ libs/vkd3d-shader/preproc.h \ @@ -304,7 +305,6 @@ XFAIL_TESTS = \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ - tests/max.shader_test \ tests/sampler.shader_test \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..9cc09738 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -19,6 +19,7 @@ */ #include "hlsl.h" +#include "hlsl_constant_ops.h" #include <stdio.h> /* Split uniforms into two variables representing the constant and temp @@ -652,11 +653,13 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; } + static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; - unsigned int i, dimx; + unsigned int i; + bool success; if (instr->type != HLSL_IR_EXPR) return false; @@ -670,92 +673,41 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; if (!(res = hlsl_alloc(ctx, sizeof(*res)))) return false; init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); - switch (instr->data_type->base_type) + switch (expr->op) { - case HLSL_TYPE_FLOAT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - default: - FIXME("Fold float op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_CAST: + success = constant_op1_cast(ctx, res, arg1); break; - } - - case HLSL_TYPE_UINT: - { - switch (expr->op) - { - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - - case HLSL_OP2_ADD: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u + arg2->value[i].u; - break; - - case HLSL_OP2_MUL: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u * arg2->value[i].u; - break; - - default: - FIXME("Fold uint op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } + case HLSL_OP1_NEG: + success = constant_op1_neg(ctx, res, arg1); + break; + case HLSL_OP2_ADD: + success = constant_op2_add(ctx, res, arg1, arg2); + break; + case HLSL_OP2_MUL: + success = constant_op2_mul(ctx, res, arg1, arg2); break; - } - default: - FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); - vkd3d_free(res); - return false; + FIXME("Fold op %#x.\n", expr->op); + success = 0; } - list_add_before(&expr->node.entry, &res->node.entry); - replace_node(&expr->node, &res->node); - return true; + if (success) + { + list_add_before(&expr->node.entry, &res->node.entry); + replace_node(&expr->node, &res->node); + return true; + } + else + { + vkd3d_free(res); + return false; + } } static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c new file mode 100644 index 00000000..406d1058 --- /dev/null +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -0,0 +1,209 @@ +/* + * HLSL constant value operations for constant folding + * + * Copyright 2022 Francisco Casas 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 + */ + +#include "hlsl_constant_ops.h" + +int constant_op1_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src) +{ + uint32_t u; + int32_t i; + double d; + float f; + + if (tgt->node.data_type->dimx != src->node.data_type->dimx || + tgt->node.data_type->dimy != src->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + + for (int k = 0; k < 4; k++) + { + switch (src->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + u = src->value[k].f; + i = src->value[k].f; + f = src->value[k].f; + d = src->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + u = src->value[k].d; + i = src->value[k].d; + f = src->value[k].d; + d = src->value[k].d; + break; + case HLSL_TYPE_INT: + u = src->value[k].i; + i = src->value[k].i; + f = src->value[k].i; + d = src->value[k].i; + break; + case HLSL_TYPE_UINT: + u = src->value[k].u; + i = src->value[k].u; + f = src->value[k].u; + d = src->value[k].u; + break; + case HLSL_TYPE_BOOL: + u = !!src->value[k].u; + i = !!src->value[k].u; + f = !!src->value[k].u; + d = !!src->value[k].u; + break; + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + switch (tgt->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = d; + break; + case HLSL_TYPE_INT: + tgt->value[k].i = i; + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = u; + break; + case HLSL_TYPE_BOOL: + tgt->value[k].u = (!!u) * 0xffffffff; + break; + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + +int constant_op1_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = tgt->node.data_type->base_type; + + assert(type == src->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = -src->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = -src->value[k].d; + break; + case HLSL_TYPE_INT: + tgt->value[k].i = -src->value[k].i; + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = -src->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.", debug_hlsl_expr_op(HLSL_OP1_NEG), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + +int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = tgt->node.data_type->base_type; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = src1->value[k].f + src2->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = src1->value[k].d + src2->value[k].d; + break; + case HLSL_TYPE_INT: + tgt->value[k].i = src1->value[k].i + src2->value[k].i; + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = src1->value[k].u + src2->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.", debug_hlsl_expr_op(HLSL_OP2_ADD), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + +int constant_op2_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = tgt->node.data_type->base_type; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = src1->value[k].f * src2->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = src1->value[k].d * src2->value[k].d; + break; + case HLSL_TYPE_INT: + tgt->value[k].i = src1->value[k].i * src2->value[k].i; + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = src1->value[k].u * src2->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.", debug_hlsl_expr_op(HLSL_OP2_MUL), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + + + + diff --git a/libs/vkd3d-shader/hlsl_constant_ops.h b/libs/vkd3d-shader/hlsl_constant_ops.h new file mode 100644 index 00000000..17a8a2e8 --- /dev/null +++ b/libs/vkd3d-shader/hlsl_constant_ops.h @@ -0,0 +1,30 @@ +/* + * HLSL constant value operations for constant folding + * + * Copyright 2022 Francisco Casas 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 + */ + +#include "hlsl.h" + +int constant_op1_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src); +int constant_op1_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src); +int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2); +int constant_op2_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2); -- 2.25.1

4 7

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Use list_empty() instead of comparing list_count() against zero.
by Matteo Bruni 19 Jan '22

19 Jan '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I'm sorry for the very late signoffs. For some reason, this year resuming work after vacation has been a real struggle. Then my usual workflow of going through all the pending stuff before sending replies didn't help at all. I'm going to resend the first batch of pending patches (that look okay to me) because: - the oldest of the lot just fell out of the patch tracker - I want to make some trivial changes to a few more - it seems nice to clarify order (although the patches look mostly independent) I'm also going to send a bunch of comments to various, more or less old, email threads. Most of which I had written at the time, but then see above. I'll make it a point to change at least that going forward. Zebediah and Giovanni's reviews and comments that have been flowing in the meantime have been very helpful and you can assume that I agree if I don't say otherwise. libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c4..5a17449a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -326,7 +326,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis struct hlsl_ir_if *iff; /* E.g. "for (i = 0; ; ++i)". */ - if (!list_count(cond_list)) + if (list_empty(cond_list)) return true; condition = node_from_list(cond_list); -- 2.34.1

2 15

[PATCH vkd3d] vkd3d/tests: Revert "Enable on vkd3d the tests for ID3D12CommandQueue::Wait()."
by Conor McCarthy 19 Jan '22

19 Jan '22

This reverts commit 41230b6e763980ad02930213a11336e1358197e3. The tests can hang and the Wait() implementation has issues. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9d4fb7d4..ebf137a8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33289,6 +33289,12 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); + if (!vkd3d_test_platform_is_windows()) + { + skip("Wait() is not implemented yet.\n"); /* FIXME */ + goto skip_tests; + } + /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -33364,6 +33370,7 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); +skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7); -- 2.34.1

2 1

[PATCH vkd3d v2 1/5] vkd3d-shader/hlsl: Write SM4 equality instructions.
by Giovanni Mascellani 19 Jan '22

19 Jan '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: Add hlsl_fixme(). --- libs/vkd3d-shader/hlsl_sm4.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2458018f..26ff019c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1489,6 +1489,40 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_TYPE_BOOL: + { + switch (expr->op) + { + case HLSL_OP2_EQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_EQ, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IEQ, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 equality between \"%s\".\n", debug_hlsl_type(ctx, src_type)); + break; + } + break; + } + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + default: { struct vkd3d_string_buffer *string; -- 2.34.1

3 11

[PATCH vkd3d v2 06/10] vkd3d-shader/hlsl: Properly free parse_variable_def memory in declare_vars().
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c4..988e0743 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1424,6 +1424,9 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); + if (v->arrays.count) + vkd3d_free(v->arrays.sizes); vkd3d_free(v); continue; } @@ -1436,6 +1439,9 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); + if (v->arrays.count) + vkd3d_free(v->arrays.sizes); vkd3d_free(v); continue; } @@ -1485,6 +1491,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { hlsl_fixme(ctx, &v->loc, "Array initializer."); free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); vkd3d_free(v); continue; } @@ -1507,6 +1514,9 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t list_move_tail(statements_list, v->initializer.instrs); vkd3d_free(v->initializer.instrs); } + + if (v->arrays.count) + vkd3d_free(v->arrays.sizes); vkd3d_free(v); } vkd3d_free(var_list); -- 2.25.1

4 6

[PATCH vkd3d v2 07/10] vkd3d-shader/hlsl: Support complex numeric initializers.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.y | 72 ++++++++++++++++++++++++++++++++++------ 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index d15e50c3..1086d028 100644 --- a/Makefile.am +++ b/Makefile.am @@ -298,7 +298,6 @@ XFAIL_TESTS = \ tests/hlsl-initializer-flattening.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ - tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 988e0743..a89e4432 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1278,6 +1278,54 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } +static void numeric_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_variable_def *v, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_i, struct list *instrs) +{ + unsigned int writemask_offset = 0; + unsigned int components_read = 0; + + if (type->type == HLSL_CLASS_MATRIX) + hlsl_fixme(ctx, &var->loc, "Matrix initializer\n"); + + while (components_read < hlsl_type_component_count(type)) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *node; + unsigned int width; + + assert(*initializer_i < v->initializer.args_count); + node = v->initializer.args[*initializer_i]; + *initializer_i += 1; + + width = hlsl_type_component_count(node->data_type); + components_read += width; + + if (components_read > hlsl_type_component_count(type)) + { + hlsl_error(ctx, &node->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Initializer argument has spare components.\n"); + return; + } + + if (!(node = add_implicit_conversion(ctx, instrs, node, + hlsl_get_vector_type(ctx, type->base_type, width), &node->loc))) + return; + + if (!(c = hlsl_new_uint_constant(ctx, reg_offset, node->loc))) + return; + list_add_tail(instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, + ((1u << width) - 1) << writemask_offset, node->loc))) + return; + list_add_tail(instrs, &store->node.entry); + + writemask_offset += width; + } +} + static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -1449,7 +1497,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size && size != 1) @@ -1473,7 +1520,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - if (type->type == HLSL_CLASS_STRUCT) { struct_var_initializer(ctx, statements_list, var, &v->initializer); @@ -1495,23 +1541,27 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - if (v->initializer.args_count > 1) + + if (type->type <= HLSL_CLASS_LAST_NUMERIC && size == 1) { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); + + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); } + else + { + unsigned int initializer_i = 0; - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + numeric_var_initializer(ctx, var, v, 0, type, &initializer_i, v->initializer.instrs); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } -- 2.25.1

4 8

[PATCH vkd3d v4 05/10] vkd3d-shader/hlsl: Add Gather methods with offset and tests.
by Francisco Casas 19 Jan '22

19 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 + libs/vkd3d-shader/hlsl.c | 4 + libs/vkd3d-shader/hlsl.h | 4 + libs/vkd3d-shader/hlsl.y | 106 ++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 61 +++++++++++++++ tests/hlsl-gather-offset.shader_test | 93 +++++++++++++++++++++++ tests/hlsl-gather.shader_test | 107 +++++++++++++++++++++++++++ 7 files changed, 379 insertions(+) create mode 100644 tests/hlsl-gather-offset.shader_test create mode 100644 tests/hlsl-gather.shader_test diff --git a/Makefile.am b/Makefile.am index 16848f5a..749df363 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,8 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather-offset.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -294,6 +296,8 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather-offset.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b426e461..3ace7462 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1277,6 +1277,10 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru { [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", + [HLSL_RESOURCE_GATHER_RED] = "gather_red", + [HLSL_RESOURCE_GATHER_GREEN] = "gather_green", + [HLSL_RESOURCE_GATHER_BLUE] = "gather_blue", + [HLSL_RESOURCE_GATHER_ALPHA] = "gather_alpha", }; vkd3d_string_buffer_printf(buffer, "%s(resource = ", type_names[load->load_type]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2396adb4..49fa8d9d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -378,6 +378,10 @@ enum hlsl_resource_load_type { HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, + HLSL_RESOURCE_GATHER_RED, + HLSL_RESOURCE_GATHER_GREEN, + HLSL_RESOURCE_GATHER_BLUE, + HLSL_RESOURCE_GATHER_ALPHA, }; struct hlsl_ir_resource_load diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3a0ddb93..a321789c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1930,6 +1930,112 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } + else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") + || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) + { + const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + enum hlsl_resource_load_type load_type; + const struct hlsl_type *sampler_type; + struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *offset = NULL; + struct hlsl_ir_load *sampler_load; + struct hlsl_type *result_type; + struct hlsl_ir_node *coords; + int status_out_arg; + int read_channel; + + if (!strcmp(name, "GatherGreen")) + { + load_type = HLSL_RESOURCE_GATHER_GREEN; + read_channel = 1; + } + else if (!strcmp(name, "GatherBlue")) + { + load_type = HLSL_RESOURCE_GATHER_BLUE; + read_channel = 2; + } + else if (!strcmp(name, "GatherAlpha")) + { + load_type = HLSL_RESOURCE_GATHER_ALPHA; + read_channel = 3; + } + else + { + load_type = HLSL_RESOURCE_GATHER_RED; + read_channel = 0; + } + + + if (!strcmp(name, "Gather")) + { + if (params->args_count != 2 && params->args_count != 3) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method 'Gather': expected 2 or 3, but got %u.", params->args_count); + return false; + } + } + else if (params->args_count < 2 || params->args_count == 5 || params->args_count > 7) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method '%s': expected 2,3,4,6 or 7, but got %u.", name, params->args_count); + return false; + } + + status_out_arg = -1; + if (params->args_count == 4) + status_out_arg = 3; + if (params->args_count == 7) + status_out_arg = 6; + if (status_out_arg != -1) + hlsl_fixme(ctx, loc, "Ignoring 'status' output parameter.\n"); + + if (params->args_count == 6 || params->args_count == 7) + hlsl_fixme(ctx, loc, "Ignoring multiple offset parameters.\n"); + + if (params->args_count == 3 || params->args_count == 4) + { + if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2], + hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim), loc))) + return false; + } + + sampler_type = params->args[0]->data_type; + if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER + || sampler_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, sampler_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if (read_channel >= object_type->e.resource_format->dimx) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Method %s() requires at least %d channels.", name, read_channel+1); + return false; + } + + result_type = hlsl_get_vector_type(ctx, object_type->e.resource_format->base_type, 4); + + /* Only HLSL_IR_LOAD can return an object. */ + sampler_load = hlsl_ir_load(params->args[0]); + + if (!(coords = add_implicit_conversion(ctx, instrs, params->args[1], + hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc))) + return false; + + if (!(load = hlsl_new_resource_load(ctx, result_type, + load_type, object_load->src.var, object_load->src.offset.node, + sampler_load->src.var, sampler_load->src.offset.node, coords, offset, loc))) + return false; + list_add_tail(instrs, &load->node.entry); + return true; + } else { struct vkd3d_string_buffer *string; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index d55815f1..61247031 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1661,6 +1661,50 @@ static void write_sm4_loop(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } + +static void write_sm4_gather(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords, + unsigned int swizzle, const struct hlsl_ir_node *texel_offset) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + + /* TODO: possible optimization, if the offset ranges from -8 to 7, an VKD3D_SM4_OP_GATHER4 with + an aoffimmi modifier can be used. */ + instr.opcode = texel_offset? VKD3D_SM5_OP_GATHER4_PO : VKD3D_SM4_OP_GATHER4; + + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); + instr.dst_count = 1; + + instr.src_count = (instr.opcode == VKD3D_SM5_OP_GATHER4_PO)? 4 : 3; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + + if (texel_offset) + { + sm4_register_from_node(&instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, texel_offset); + instr.srcs[1].swizzle = hlsl_swizzle_from_writemask(writemask); + } + + sm4_register_from_deref(ctx, &instr.srcs[instr.src_count-2].reg, &writemask, + &instr.srcs[instr.src_count-2].swizzle_type, resource, resource_type); + instr.srcs[instr.src_count-2].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + + sm4_register_from_deref(ctx, &instr.srcs[instr.src_count-1].reg, &writemask, NULL, + sampler, sampler->var->data_type); + instr.srcs[instr.src_count-1].reg.type = VKD3D_SM4_RT_SAMPLER; + instr.srcs[instr.src_count-1].reg.dim = VKD3D_SM4_DIMENSION_VEC4; + instr.srcs[instr.src_count-1].swizzle_type = VKD3D_SM4_SWIZZLE_SCALAR; + instr.srcs[instr.src_count-1].swizzle = swizzle; + + write_sm4_instruction(buffer, &instr); +} + + static void write_sm4_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_resource_load *load) { @@ -1701,6 +1745,23 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords, texel_offset); break; + + case HLSL_RESOURCE_GATHER_RED: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(X, X, X, X), texel_offset); + break; + case HLSL_RESOURCE_GATHER_GREEN: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(Y, Y, Y, Y), texel_offset); + break; + case HLSL_RESOURCE_GATHER_BLUE: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(Z, Z, Z, Z), texel_offset); + break; + case HLSL_RESOURCE_GATHER_ALPHA: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(W, W, W, W), texel_offset); + break; } } diff --git a/tests/hlsl-gather-offset.shader_test b/tests/hlsl-gather-offset.shader_test new file mode 100644 index 00000000..d7e1a233 --- /dev/null +++ b/tests/hlsl-gather-offset.shader_test @@ -0,0 +1,93 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2), int2(1, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.2, 0.1) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherRed(s, float2(0.6, 0.6), int2(-1, 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 1)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8), int2(-1, -1)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(1, 0)); +} + +[test] +draw quad +probe all rgba (0.5, 0.0, 0.5, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0, -1)); +} + +[test] +draw quad +probe all rgba (0.0, 0.4, 0.0, 0.4) diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl-gather.shader_test new file mode 100644 index 00000000..2682c6ef --- /dev/null +++ b/tests/hlsl-gather.shader_test @@ -0,0 +1,107 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherRed(s, float2(0.6, 0.6), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.2, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 0), int2(0, 0), int2(0, 0), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.5, 0.0, 0.5) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.4, 0.0, 0.4, 0.0) -- 2.25.1

2 1

[PATCH vkd3d v3 10/12] vkd3d-shader/hlsl: Include new texture dimension types in sampler_dim_count().
by Francisco Casas 19 Jan '22

19 Jan '22

This function is also moved from hlsl.y to hlsl.h, since it can be useful in other files. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- This is done in preparation for changing write_sm4_ld() in hlsl_sm4.c. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 23 +++++++++++++++++++++++ libs/vkd3d-shader/hlsl.y | 17 ----------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 334610df..927dca02 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -107,6 +107,29 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBEARRAY, }; +static inline unsigned int sampler_dim_count(enum hlsl_sampler_dim dim) +{ + switch (dim) + { + case HLSL_SAMPLER_DIM_1D: + return 1; + case HLSL_SAMPLER_DIM_1DARRAY: + case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_2DMS: + return 2; + case HLSL_SAMPLER_DIM_2DARRAY: + case HLSL_SAMPLER_DIM_2DMSARRAY: + case HLSL_SAMPLER_DIM_3D: + case HLSL_SAMPLER_DIM_CUBE: + return 3; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return 4; + default: + assert(0); + return 0; + } +} + enum hlsl_matrix_majority { HLSL_COLUMN_MAJOR, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b7446454..389ff057 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1513,23 +1513,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t return statements_list; } -static unsigned int sampler_dim_count(enum hlsl_sampler_dim dim) -{ - switch (dim) - { - case HLSL_SAMPLER_DIM_1D: - return 1; - case HLSL_SAMPLER_DIM_2D: - return 2; - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - return 3; - default: - assert(0); - return 0; - } -} - struct find_function_call_args { const struct parse_initializer *params; -- 2.25.1

3 3

[PATCH v2] wbemprox: Add some properties of SoftwareLicensingProduct class.
by Hans Leidekker 19 Jan '22

19 Jan '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Part of https://bugs.winehq.org/show_bug.cgi?id=51163 v2: Keep classes sorted. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 16 ++++++++++++++++ dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6b63c744b69..5a09d64b8fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -387,6 +387,11 @@ static const struct column col_sid[] = { L"SID", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"SidLength", CIM_UINT32 }, }; +static const struct column col_softwarelicensingproduct[] = +{ + { L"LicenseIsAddon", CIM_BOOLEAN }, + { L"LicenseStatus", CIM_UINT32 }, +}; static const struct column col_sounddevice[] = { { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -809,6 +814,11 @@ struct record_sid const WCHAR *sid; UINT32 sidlength; }; +struct record_softwarelicensingproduct +{ + int license_is_addon; + UINT32 license_status; +}; struct record_sounddevice { const WCHAR *deviceid; @@ -978,6 +988,11 @@ static const struct record_quickfixengineering data_quickfixengineering[] = { L"http://winehq.org", L"KB1234567" }, }; +static const struct record_softwarelicensingproduct data_softwarelicensingproduct[] = +{ + { 0, 1 }, +}; + static const struct record_stdregprov data_stdregprov[] = { { @@ -4110,6 +4125,7 @@ static struct table cimv2_builtin_classes[] = { L"CIM_DataFile", C(col_datafile), 0, 0, NULL, fill_datafile }, { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, + { L"SoftwareLicensingProduct", C(col_softwarelicensingproduct), D(data_softwarelicensingproduct) }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 912671f4ad2..583ae578efa 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1835,6 +1835,31 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_SoftwareLicensingProduct( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM SoftwareLicensingProduct" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK , "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"LicenseIsAddon", VT_BOOL, CIM_BOOLEAN ); + check_property( obj, L"LicenseStatus", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DesktopMonitor( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); @@ -2187,6 +2212,7 @@ START_TEST(query) test_select( services ); /* classes */ + test_SoftwareLicensingProduct( services ); test_StdRegProv( services ); test_SystemSecurity( services ); test_Win32_Baseboard( services ); -- 2.30.2

1 0

[PATCH] dwrite/tests: Use CRT memory allocation functions.
by Nikolay Sivov 19 Jan '22

19 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 5 ++--- dlls/dwrite/tests/font.c | 35 +++++++++++++++++------------------ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index dd3207c7933..875503ed5a3 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -30,7 +30,6 @@ #include "winternl.h" #include "dwrite_3.h" -#include "wine/heap.h" #include "wine/test.h" static IDWriteFactory *factory; @@ -1551,7 +1550,7 @@ static void test_glyph_props(IDWriteTextAnalyzer *analyzer, const WCHAR *family, hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, 0, NULL, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); - ranges = heap_alloc(count * sizeof(*ranges)); + ranges = malloc(count * sizeof(*ranges)); hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, count, ranges, &count); ok(hr == S_OK, "Failed to get ranges, hr %#x.\n", hr); @@ -1608,7 +1607,7 @@ static void test_glyph_props(IDWriteTextAnalyzer *analyzer, const WCHAR *family, } } - heap_free(ranges); + free(ranges); IDWriteFontFace_ReleaseFontTable(fontface, gdef.context); IDWriteFontFace1_Release(fontface1); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba4a2793372..b185db49c13 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,7 +30,6 @@ #include "initguid.h" #include "d2d1.h" -#include "wine/heap.h" #include "wine/test.h" #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') @@ -634,11 +633,12 @@ static ULONG WINAPI singlefontfileenumerator_AddRef(IDWriteFontFileEnumerator *i static ULONG WINAPI singlefontfileenumerator_Release(IDWriteFontFileEnumerator *iface) { - struct test_fontenumerator *This = impl_from_IDWriteFontFileEnumerator(iface); - ULONG ref = InterlockedDecrement(&This->ref); - if (!ref) { - IDWriteFontFile_Release(This->font_file); - heap_free(This); + struct test_fontenumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); + ULONG ref = InterlockedDecrement(&enumerator->ref); + if (!ref) + { + IDWriteFontFile_Release(enumerator->font_file); + free(enumerator); } return ref; } @@ -678,8 +678,7 @@ static HRESULT create_enumerator(IDWriteFontFile *font_file, IDWriteFontFileEnum { struct test_fontenumerator *enumerator; - enumerator = heap_alloc(sizeof(struct test_fontenumerator)); - if (!enumerator) + if (!(enumerator = calloc(1, sizeof(*enumerator)))) return E_OUTOFMEMORY; enumerator->IDWriteFontFileEnumerator_iface.lpVtbl = &singlefontfileenumeratorvtbl; @@ -2989,7 +2988,7 @@ static ULONG WINAPI fontcollectionloader_Release(IDWriteFontCollectionLoader *if ULONG ref = InterlockedDecrement(&loader->ref); if (!ref) - heap_free(loader); + free(loader); return ref; } @@ -3011,7 +3010,7 @@ static const struct IDWriteFontCollectionLoaderVtbl dwritefontcollectionloadervt static IDWriteFontCollectionLoader *create_collection_loader(void) { - struct collection_loader *loader = heap_alloc(sizeof(*loader)); + struct collection_loader *loader = malloc(sizeof(*loader)); loader->IDWriteFontCollectionLoader_iface.lpVtbl = &dwritefontcollectionloadervtbl; loader->ref = 1; @@ -3573,7 +3572,7 @@ static void array_reserve(void **elements, size_t *capacity, size_t count, size_ if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return; *elements = new_elements; @@ -3705,7 +3704,7 @@ static UINT32 fontface_get_expected_unicode_ranges(IDWriteFontFace1 *fontface, D count = opentype_cmap_get_unicode_ranges(&cmap, &ranges); IDWriteFontFace1_ReleaseFontTable(fontface, cmap.context); - *out = heap_alloc(count * sizeof(**out)); + *out = malloc(count * sizeof(**out)); /* Eliminate duplicates and merge ranges together. */ for (i = 0, j = 0; i < count; ++i) { @@ -3720,7 +3719,7 @@ static UINT32 fontface_get_expected_unicode_ranges(IDWriteFontFace1 *fontface, D (*out)[j++] = ranges[i]; } - heap_free(ranges); + free(ranges); return j; } @@ -3776,7 +3775,7 @@ static void test_GetUnicodeRanges(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count > 1, "got %u\n", count); - ranges = heap_alloc(count*sizeof(DWRITE_UNICODE_RANGE)); + ranges = malloc(count*sizeof(DWRITE_UNICODE_RANGE)); hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, count, ranges, &count); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3785,7 +3784,7 @@ static void test_GetUnicodeRanges(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(ranges[0].first != 0 && ranges[0].last != 0, "got 0x%x-0x%0x\n", ranges[0].first, ranges[0].last); - heap_free(ranges); + free(ranges); hr = IDWriteFactory_UnregisterFontFileLoader(factory, &rloader); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3848,7 +3847,7 @@ if (strcmp(winetest_platform, "wine")) { hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, 0, NULL, &range_count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); - ranges = heap_alloc(range_count * sizeof(*ranges)); + ranges = malloc(range_count * sizeof(*ranges)); hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, range_count, ranges, &range_count); ok(hr == S_OK, "Failed to get ranges, hr %#x.\n", hr); @@ -3870,8 +3869,8 @@ if (strcmp(winetest_platform, "wine")) { } } - heap_free(expected_ranges); - heap_free(ranges); + free(expected_ranges); + free(ranges); IDWriteFontFace1_Release(fontface1); IDWriteFontFace_Release(fontface); -- 2.34.1

1 0

[PATCH] wbemprox: Add some properties of SoftwareLicensingProduct class.
by Louis Lenders 19 Jan '22

19 Jan '22

Part of https://bugs.winehq.org/show_bug.cgi?id=51163 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wbemprox/builtin.c | 16 ++++++++++++++++ dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6b63c744b69..f47fc008b4b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -387,6 +387,11 @@ static const struct column col_sid[] = { L"SID", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"SidLength", CIM_UINT32 }, }; +static const struct column col_softwarelicensingproduct[] = +{ + { L"LicenseIsAddon", CIM_BOOLEAN }, + { L"LicenseStatus", CIM_UINT32 }, +}; static const struct column col_sounddevice[] = { { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -809,6 +814,11 @@ struct record_sid const WCHAR *sid; UINT32 sidlength; }; +struct record_softwarelicensingproduct +{ + int license_is_addon; + UINT32 license_status; +}; struct record_sounddevice { const WCHAR *deviceid; @@ -978,6 +988,11 @@ static const struct record_quickfixengineering data_quickfixengineering[] = { L"http://winehq.org", L"KB1234567" }, }; +static const struct record_softwarelicensingproduct data_softwarelicensingproduct[] = +{ + { 0, 1 }, +}; + static const struct record_stdregprov data_stdregprov[] = { { @@ -4136,6 +4151,7 @@ static struct table cimv2_builtin_classes[] = { L"Win32_Process", C(col_process), 0, 0, NULL, fill_process }, { L"Win32_Processor", C(col_processor), 0, 0, NULL, fill_processor }, { L"Win32_QuickFixEngineering", C(col_quickfixengineering), D(data_quickfixengineering) }, + { L"SoftwareLicensingProduct", C(col_softwarelicensingproduct), D(data_softwarelicensingproduct) }, { L"Win32_SID", C(col_sid), 0, 0, NULL, fill_sid }, { L"Win32_Service", C(col_service), 0, 0, NULL, fill_service }, { L"Win32_SoundDevice", C(col_sounddevice), 0, 0, NULL, fill_sounddevice }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 912671f4ad2..61b245f2e85 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1835,6 +1835,31 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_SoftwareLicensingProduct( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM SoftwareLicensingProduct" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK , "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"LicenseIsAddon", VT_BOOL, CIM_BOOLEAN ); + check_property( obj, L"LicenseStatus", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DesktopMonitor( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); @@ -2209,6 +2234,7 @@ START_TEST(query) test_Win32_Processor( services ); test_Win32_QuickFixEngineering( services ); test_Win32_Service( services ); + test_SoftwareLicensingProduct( services ); test_Win32_SoundDevice( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); -- 2.34.1

1 0

[website] German translation for release 7.0
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.0-rc6
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.0-rc5
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.0-rc4
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.0-rc3
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.0-rc2
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 7.0-rc1
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 409
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.23
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 408
by Julian Rüger 19 Jan '22

19 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 0/3] prototype / implementation mismatch
by Eric Pouech 19 Jan '22

19 Jan '22

Janitorial: found a couple of places where implentation didn't exactly match prototype. Mainly (unsigned) int vs. (U)LONG|DWORD. 0 impact as they all boil down to 4-byte integers. Generate warnings when DWORD is typedef:ed to a long (as it should). V1 => V2: - updated dwrite as Nikolay comment - changed another proto in winternl.h (even if MS doc seems broken, but aligned proto to very similar APIs) - fixed another one in programs/rpcss A+ --- Eric Pouech (3): include/winternl.h: fix prototype definition dlls/dwrite: adjust implementation to match prototype programs/rpcss: fix implem declaration to match prototype dlls/dwrite/dwrite_private.h | 8 ++++---- include/winternl.h | 4 ++-- programs/rpcss/rpcss_main.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)

2 4

[PATCH] winhttp: Remove unused ole32 import.
by Zebediah Figura 19 Jan '22

19 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winhttp/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index f4fc317c5f1..97266fbc92a 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,7 +1,7 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 ws2_32 -DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 iphlpapi dhcpcsvc +DELAYIMPORTS = oleaut32 crypt32 secur32 iphlpapi dhcpcsvc C_SRCS = \ cookie.c \ -- 2.34.1

2 1

[PATCH] wininet: Support more internet time format.
by Ziqing Hui 19 Jan '22

19 Jan '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/wininet/internet.c | 42 +++++++++++++++++++++++++---------- dlls/wininet/tests/internet.c | 16 ++++++------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 59fae2fbc95..61e713f41e2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3400,36 +3400,54 @@ BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD r * a SYSTEMTIME structure. */ - while (*s && !iswalpha( *s )) s++; - if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + while (*s && !iswalnum(*s)) s++; + if (*s == '\0') return TRUE; time->wDayOfWeek = 7; - for (i = 0; i < 7; i++) + if (iswalpha(*s)) { - if (!wcsnicmp( WININET_wkday[i], s, 3 )) + if (s[1] == '\0' || s[2] == '\0') return TRUE; + for (i = 0; i < 7; i++) { - time->wDayOfWeek = i; - break; + if (!wcsnicmp(WININET_wkday[i], s, 3)) + { + time->wDayOfWeek = i; + break; + } } } + else + { + time->wDayOfWeek = *s - '0'; + ++s; + } if (time->wDayOfWeek > 6) return TRUE; while (*s && !iswdigit( *s )) s++; time->wDay = wcstol( s, &end, 10 ); s = end; - while (*s && !iswalpha( *s )) s++; - if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + while (*s && !iswalnum(*s)) s++; + if (*s == '\0') return TRUE; time->wMonth = 0; - for (i = 0; i < 12; i++) + if (iswalpha(*s)) { - if (!wcsnicmp( WININET_month[i], s, 3 )) + if (s[1] == '\0' || s[2] == '\0') return TRUE; + for (i = 0; i < 12; i++) { - time->wMonth = i + 1; - break; + if (!wcsnicmp(WININET_month[i], s, 3)) + { + time->wMonth = i + 1; + break; + } } } + else + { + time->wMonth = wcstol(s, &end, 10); + s = end; + } if (time->wMonth == 0) return TRUE; while (*s && !iswdigit( *s )) s++; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4c2facb635a..317ccf9d6b8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -917,14 +917,14 @@ static void test_InternetTimeToSystemTime(void) { { "Fri, 07 Jan 2005 12:06:35 GMT", &expect1, TRUE }, { " fri, 7 jan 2005 12 06 35", &expect1, TRUE }, - { "Fri, 07-01-2005 12:06:35", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE, TRUE }, - { "2, 11 01 2022 11 13 05", &expect2, TRUE, TRUE }, - { "2, 11-01-2022 11#13^05", &expect2, TRUE, TRUE }, - { "2, 11*01/2022 11+13=05", &expect2, TRUE, TRUE }, - { "2, 11-Jan-2022 11:13:05", &expect2, TRUE, TRUE }, + { "Fri, 07-01-2005 12:06:35", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE }, + { "2, 11 01 2022 11 13 05", &expect2, TRUE }, + { "2, 11-01-2022 11#13^05", &expect2, TRUE }, + { "2, 11*01/2022 11+13=05", &expect2, TRUE }, + { "2, 11-Jan-2022 11:13:05", &expect2, TRUE }, { "Fr", NULL, FALSE }, }; -- 2.25.1

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.203.
by Georg Lehmann 18 Jan '22

18 Jan '22

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e9b1b456584..e548025a6ad 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.201" +VK_XML_VERSION = "1.2.203" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -109,6 +109,7 @@ UNSUPPORTED_EXTENSIONS = [ "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier", "VK_EXT_physical_device_drm", + "VK_GOOGLE_surfaceless_query", "VK_KHR_external_fence_fd", "VK_KHR_external_memory_fd", "VK_KHR_external_semaphore_fd", -- 2.34.1

1 0

Wine staging 7.0 release
by Alistair Leslie-Hughes 18 Jan '22

18 Jan '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.0 (555 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

RFC: release notes
by Alexandre Julliard 18 Jan '22

18 Jan '22

Folks, Here are the release notes for 7.0. Please review them and let me know if you spot anything incorrect or missing. The final 7.0 will be out shortly. Many thanks to Esme, Henri, Nikolay, Jacek, Rémi and Zeb for their help with these release notes. What's new in Wine 7.0 ====================== *** PE modules - With a few exceptions, all modules can be built in PE format. The goal is to convert the remaining modules after 7.0. - For PE modules with an associated Unix library, the interface between the PE part and the Unix part goes through a standard NT system call. This enables hiding the Unix code from Windows debuggers, and switching the thread register on platforms that require it. - Builtin dlls are only loaded if there is a corresponding PE file on disk, either a real binary or a fake PE module. This ensures that the application always sees a valid PE file mapping. It can be disabled through the WINEBOOTSTRAPMODE environment variable, used at prefix creation time. *** WoW64 - The 64-bit Windows-on-Windows (WoW64) architecture is implemented, and supports running a 32-bit Windows application inside a 64-bit Unix host process, using thunks to map 32-bit NT system calls to the 64-bit NTDLL. - WoW64 thunks are implemented for most Unix libraries, enabling a 32-bit PE module to call a 64-bit Unix library. Once the remaining modules are converted to PE, this will make it possible to run 32-bit applications without installing 32-bit Unix libraries. *** Theming - A "Light" theme is included in Wine, with the color variants "Blue" and "Classic Blue". It can be enabled through WineCfg. - All the Common Controls support theming, and automatically refresh on theme changes. - All the builtin applications support theming, as well as High DPI rendering. *** Graphics - There's a new Win32u library implementing the kernel side of graphics and window management support. Large portions of the GDI32 and USER32 libraries are converted to use this new library. This work will continue after 7.0, and the graphics drivers (winex11.drv, winemac.drv, etc.) will be migrated to Win32u as well. - The Vulkan driver supports up to version 1.2.201 of the Vulkan spec. - Hit-testing stroked geometries using the Direct2D API is implemented. - Some initial support for Direct2D effects (using the ID2D1Effect interface) is implemented. - The Direct2D API supports the ID2D1MultiThread interface. - WindowsCodecs supports decoding images in WMP (Windows Media Photo) format, as well as encoding images to the DDS (DirectDraw Surface) format. - WindowsCodecs no longer supports encoding images to macOS ICNS format. This is not supported on Windows, and was no longer used by Wine either. *** Direct3D - Various improvements have been made to the Vulkan renderer for the Wine Direct3D implementation. In most cases, for Direct3D 10 and 11 applications the Vulkan renderer should be about on-par with the older OpenGL renderer in Wine 7.0. Like in Wine 6.0, the Vulkan renderer can be enabled by setting the Direct3D "renderer" registry setting to "vulkan". - The following Direct3D 10 and 11 features are implemented: - Deferred device contexts. - Device context state objects, and switching between them. - Constant buffer offsetting. - Resolving typeless multi-sample resources. - Clearing unordered-access views of texture resources. When using the OpenGL renderer, this requires the GL_ARB_clear_texture OpenGL extension. - Resource copies between resources with "block-compatible" formats, like for example DXGI_FORMAT_BC3_TYPELESS and DXGI_FORMAT_R32G32B32A32_TYPELESS. - Clearing layered render-target views. - Support for multiple displays ("multi-head") is implemented. In practice, this tends to mean the ability to choose which monitor a Direct3D application will use for full-screen mode. Note that this depends on the underlying display drivers to accurately report the attached displays. For Wine's X11 driver, that requires proper support for version 1.4 or later of the X RandR extension. - Display gamma adjustment using the DXGI API is implemented. This is sometimes used by Direct3D 10 and 11 applications to adjust screen "brightness". - Direct3D 12 supports version 1.1 root signatures. - When the VK_EXT_host_query_reset Vulkan extension is available, query handling in the Vulkan renderer is slightly more efficient. - Retrieving swapchain present counts using the DXGI API is implemented. - A fallback path using GDI is added for swapchain presentation. This is used in cases where OpenGL or Vulkan can't be used to present the swapchain, for example when presenting to a window of a different process. This path is much slower, but is often sufficient for some common use cases, like for example applications using the Chromium Embedded Framework ("CEF") with cross-process rendering. - The "precise" shader instruction modifier is respected when using the GLSL shader backend. - The DirectDraw API supports 3D rendering to system memory surfaces when using software device types like the "RGB", "MMX", and "Ramp" devices. - The following additional graphics cards are recognized by the Direct3D graphics card database: - AMD Radeon RX 5500M - AMD Radeon RX 6800/6800 XT/6900 XT - AMD Van Gogh - Intel UHD Graphics 630 - NVIDIA GT 1030 - The following HKEY_CURRENT_USER\Software\Wine\Direct3D key is removed: - "UseGLSL" This setting was deprecated in favor of the "shader_backend" setting in Wine 5.0, and has been removed in this release. *** D3DX - The support for version 10 of the D3DX effects framework is much improved. - D3DX 10 supports the Windows Media Photo (JPEG XR) image file format. - Various D3DX10 texture creation functions (D3DX10CreateTextureFromMemory() and variants) are implemented. - A partial implementation of the ID3DX10Sprite interface is added. - A partial implementation of the ID3DX10Font interface is added. *** Audio / video - The DirectShow and Media Foundation GStreamer glue is unified into a single backend, making it easier to implement new media decoding APIs. - The Windows Media asynchronous and synchronous reader objects are implemented based on the WineGStreamer backend. Like other multimedia decoding libraries, they require a functioning GStreamer installation. - The Media Foundation support is more complete, with notably: - Basic functionality of IMFPMediaPlayer, media item properties, support for audio and video tracks. - Support for sample allocator in the Source Reader. - Improved EVR sink integration with presenter and mixer. - Improved SAR rendering buffer behavior. - Video sample allocator, with support for d3d9, d3d11, and system memory buffers. - Further improvements to EVR's presenter and mixer implementation. - D3D11 frame output for IMFMediaEngine. - Improvements to generic media source implementation in WineGStreamer to support stopped and paused states, refined output type configuration. - The QuickTime decoder library (wineqtdecoder) is removed. GStreamer is required for all built-in multimedia codecs also on macOS. *** Input devices - The HID (Human Interface Device) stack implementation is more complete. This includes HID descriptor and report parsers, report processing, as well as HID mini-driver support. - The winebus.sys driver backends are improved, to better describe the devices into HID reports when pass-through is not possible, and to add standard Physical Interface Device reports to expose force-feedback capabilities over HID. - There's a new DirectInput joystick backend using the improved HID stack to communicate with winebus.sys and host devices. This backend supports force-feedback effects using the standard HID Physical Interface Device reports, and is also compatible with pass-through HID device which implement it. The SDL and evdev winebus.sys Linux backends are also supported as they implement it too. This replaces and deprecates the legacy Linux js and evdev, and macOS IOHID backends. - The joystick control panel is improved, as well as the interaction with XInput-compatible devices. For such devices the joystick control panel can be used to force DInput as the primary interface instead of XInput. This translates to the "<joystick name>"="override" (REG_SZ) registry value in HKCU\Software\Wine\AppDefaults\<app.exe>\DirectInput (or HKCU\Software\Wine\DirectInput for prefix-wide setting). - The WinMM joystick support is implemented using DInput instead of Linux evdev or macOS IOHID, and the old joystick driver (winejoystick.drv) is removed. - Many tests are added to the DInput module, using a virtual HID device to not require a physical device anymore. The code is extensively and automatically tested, including force-feedback effects with HID input / output report validation. *** Text and fonts - Arabic shaping is implemented in DirectWrite, currently enabled for Arabic and Syriac. - The Font Set object is implemented in DirectWrite. - The TextHost interface is properly implemented in RichEdit. *** Mono / .NET - The Mono engine is updated to version 7.0.0, with the following changes: - IDispatch interface supported on COM Callable Wrappers. - Improved support for SafeArray marshaling. - Many other marshaling and COM interop improvements. - Code imports from .NET Core: System.Drawing.Printing, System.Security.Principal, WindowsFormsApplicationBase, parts of Microsoft.VisualBasic.Interaction - WMA and WMV support in FNA using mfplat. - Debug symbols available separately in PDB form. - Old VBNC compiler for Visual Basic .NET replaced with the VBC compiler from .NET Core. - Mono's JIT compiler generates code compatible with 64-bit macOS. - WPF built with support for media controls. - A replacement for the Managed DirectX API is included. - Fixes for various bugs that prevented most WPF applications from working. *** Internationalization - Unicode character tables are based on version 14.0.0 of the Unicode Standard. - The timezone data is updated, based on the information from the Olson and Unicode CLDR databases. - Codepages 720 (Arabic, Farsi and Urdu) and 20949 (Korean Wansung) are supported. - The sr-Latn-RS locale is supported. *** Kernel - Launching applications with the 'wine' executable invokes start.exe for any unrecognized binary. This means that file associations work also from the Unix command line, e.g. 'wine foo.msi'. - The low-level NtAlertThreadByThreadId / NtWaitForAlertByThreadId synchronization mechanism (roughly equivalent to Linux futexes) is supported, and used to implement the higher-level synchronization primitives. - NT debug objects are implemented and used by the kernel debugger functions. - The dynamic registry keys for performance data are implemented. *** C runtime - There's a full math library implementation in the C runtime, mostly imported from the Musl C library. The Unix math library is no longer used. - The floating point environment functions are supported properly on all CPU platforms. *** Internet and networking - IE11 compatibility mode is improved and used by default for standard-compliant HTML documents. - JScript EcmaScript compliant mode supports 'let' statements, Map object, object freezing, object sealing and mutable prototype chains. - Gecko add-on MSI packages are installed into the prefix on demand, instead of during prefix update, to make updates faster and reduce disk space usage. - The DTLS communication protocol is supported. - The NSI device (Network Store Interface) is implemented, and used to provide higher-level network services in IpHlpAPI. - The Windows Sockets support is reimplemented to go through NTDLL and the Afd device, following the Windows architecture. - The various network database files (/etc/protocols, /etc/networks, etc.) are provided and installed in the prefix. The equivalent Unix databases are no longer used for network queries. *** Alternative platforms - The new Apple Silicon Macs are supported, including running x86-64 binaries under Rosetta 2. - GnuTLS is required on macOS for BCrypt and Secur32 support; the macOS-specific backend implementations have been removed. - 32-bit ARM binaries are built in Thumb-2 mode, like on Windows. - The preloader is also used on 32-bit ARM, for a more compatible address space layout. - Stack unwinding is implemented on 32-bit ARM. - More low-level system information queries like memory and battery status are supported on FreeBSD. *** Builtin applications - The REG registry tool supports operating on either the 32- or 64-bit view of the registry. - The REG registry tool supports copying registry keys. - The WineDump tool supports dumping Windows Metafiles, and shows more detailed information for CodeView records. - The Wine Debugger (winedbg) supports debugging a 32-bit target process from the 64-bit debugger. *** Development tools - The IDL compiler (widl) supports loading type libraries embedded inside PE files. - The IDL compiler searches for type libraries in the per-platform library search path instead of the include search path. - The IDL compiler supports many more WinRT-specific constructs and attributes. *** Build infrastructure - All libraries are installed in architecture-specific directories, using names like 'i386-windows' for PE binaries, and 'x86_64-unix' for the Unix libraries. This enables supporting multiple architectures with a single Wine installation, as well as Winelib cross-compilation. - Static (.a) import libraries are used on all platforms. Wine no longer generates the old-style .def libraries, though they are still supported for backwards compatibility. - The option to prefer a native DLL by default is specified through a flag in the PE header, which can be set by passing the '--prefer-native option' to winebuild. The previous method, handling DLL_WINE_PREATTACH in DllMain, is no longer supported. - The Dwarf debugging format is supported up to version 4. The Wine libraries are built with version 4 by default. - Unique build identifiers can be stored in the binaries by passing the '--enable-build-id' option to configure. - The Clang compiler in MSVC mode is supported. *** Miscellaneous - The Shell Folder naming is converted to use the Windows Vista+ scheme; for instance 'My Documents' becomes 'Documents', and most things are saved under the 'AppData' directory. - The OpenCL library wrapper supports versions up to OpenCL 1.2. - Paper forms are supported in various sizes in the WinSpool printer driver. - There is initial support for MSDASQL, a Microsoft OLE DB provider for ODBC drivers. *** External dependencies - The following libraries are bundled in the source tree and built as PE libraries, so they are no longer required at the Unix level: - Faudio - GSM - LCMS2 - LibJPEG - LibJXR - LibMPG123 - LibPng - LibTiff - LibXml2 - LibXslt - Zlib - The libraries above can still be imported as external libraries instead of using the bundled copy, provided that they are available in PE format. This behavior is requested with the '--with-system-dllpath' configure option, which specifies the Unix search path for such dependencies. - Direct3D 12 support now requires version 1.2 or later of the vkd3d library. Version 1.2 or later of the related vkd3d-shader library was already required by Wine 6.0 for translation of Direct3D shader to SPIR-V in the Vulkan renderer for the Direct3D implementation. - The deprecated HAL library is no longer supported or needed. - The macOS QuickTime library is no longer used. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] mfmediaengine: Fix a memory leak.
by Giovanni Mascellani 18 Jan '22

18 Jan '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 98504c5e269..5b8d91d9632 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1094,6 +1094,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFMediaTypeHandler_Release(type_handler); } + + IMFStreamDescriptor_Release(sd); } if (!sd_video && !sd_audio) -- 2.34.1

2 1

[PATCH 1/3] comctl32/tests: Print id value as decimal.
by Dmitry Timoshkov 18 Jan '22

18 Jan '22

All the notification codes (printed as an id) have negative base value (SBN_, UDN_, HDN_, BCN_, TBN_, TTN_, RBN_, TRBN_, PGN_, TVN_, LVN_, TCN_, CBEN_, IPN_, MCN_, DTN_), and printing them as decimal helps to quickly identify the corresponding notification value in cases when an id in the message sequence doesn't match. Custom ids in the message sequences have small numbers (0, 1, 2, ...), so they also get printed correctly. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/msg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 7337c724a5c..8ba2efddb0a 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -261,14 +261,14 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, failcount++; dump++; ok_(file, line) (FALSE, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); } } else { ok_(file, line) (expected->id == actual->id, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); if (expected->id != actual->id) dump++; } -- 2.34.1

2 1

[PATCH v6 1/6] ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only if window is not in foreground.
by Gabriel Ivăncescu 18 Jan '22

18 Jan '22

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The current tests were testing a hidden window only, which ddraw treats as "inactive" (but not d3d8/d3d9ex). Tests were added to show that even visible windows, but not foreground, are not set to topmost, while foreground ones are. This is ddraw specific. d3d8 and d3d9ex treat hidden windows as "active" for the purposes of window changes (so only visible windows, if inactive, prevent changes). We have existing tests for that. Unfortunately, most of the tests are still todo_wine, even though the WS_EX_TOPMOST style matches (except when exiting, that's fixed on 3rd patch). That's because we don't have WS_EX_WINDOWEDGE on fullscreen windows (long-standing issue), but the topmost bit is set correctly. dlls/ddraw/ddraw.c | 6 ++-- dlls/ddraw/tests/ddraw1.c | 67 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 67 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 67 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 67 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 268 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5b70bb4..77172d4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -583,8 +583,10 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH - | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + + if (window != GetForegroundWindow()) + swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index efbecf0..137469c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2585,14 +2585,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2636,6 +2638,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2659,6 +2723,7 @@ static void test_window_style(void) ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 65ac21d..f3801ef 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2663,14 +2663,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw2 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2714,6 +2716,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2737,6 +2801,7 @@ static void test_window_style(void) ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ce2333d..9c22103 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2899,14 +2899,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw4 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2950,6 +2952,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2973,6 +3037,7 @@ static void test_window_style(void) ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4cf57bf..7cadb88 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2564,14 +2564,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw7 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2615,6 +2617,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2638,6 +2702,7 @@ static void test_window_style(void) ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } -- 2.34.1

4 20

[PATCH 3/3] comctl32/tests: Add more LVM_INSERTITEM tests.
by Dmitry Timoshkov 18 Jan '22

18 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 139 ++++++++++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 236a9d14372..51adefa5221 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -413,15 +413,6 @@ static const struct message listview_header_set_imagelist[] = { { 0 } }; -static const struct message parent_insert_focused_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, - { 0 } -}; - static const struct message parent_report_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, @@ -5920,6 +5911,93 @@ static void test_deleteitem(void) DestroyWindow(hwnd); } +static const struct message parent_insert_focused0_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_focused1_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_item_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_selected_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static void test_LVM_INSERTITEM(void) +{ + static const struct + { + UINT mask, state, stateMask; + } insert_item[] = + { + { LVIF_STATE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE, 0, LVIS_FOCUSED }, + { LVIF_STATE, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE, 0, LVIS_SELECTED }, + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED }, + { LVIF_STATE, 0, LVIS_FOCUSED | LVIS_SELECTED }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_SELECTED }, + { LVIF_STATE, 0, 0 }, + { LVIF_PARAM, 0, 0 }, + }; + LVITEMA item; + UINT state; + HWND hwnd; + INT ret, i; + char buf[256]; + + for (i = 0; i < ARRAY_SIZE(insert_item); i++) + { + hwnd = create_listview_control(LVS_REPORT); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.mask = insert_item[i].mask; + item.state = insert_item[i].state; + item.stateMask = insert_item[i].stateMask; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "%d: got %d\n", i, ret); + + if (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED)) + { + sprintf(buf, "%d: insert focused", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + } + else + { + sprintf(buf, "%d: insert item", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, buf, FALSE); + } + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED | LVIS_SELECTED); + ok(state == insert_item[i].state, "%d: expected %#x, got %#x\n", i, insert_item[i].state, state); + + DestroyWindow(hwnd); + } +} + static void test_insertitem(void) { LVITEMA item; @@ -5929,6 +6007,8 @@ static void test_insertitem(void) hwnd = create_listview_control(LVS_REPORT); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* insert item 0 focused */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5937,12 +6017,11 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); - flush_sequences(sequences, NUM_MSG_SEQUENCES); - /* insert item 1, focus shift */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5951,8 +6030,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -5965,10 +6043,44 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 2, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert focused 2", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); + /* insert item 3 */ + item.mask = LVIF_STATE | LVIF_PARAM; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + item.iItem = 3; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 3, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + + /* insert item 4 */ + item.mask = LVIF_PARAM; + item.state = 0; + item.stateMask = 0; + item.iItem = 4; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 4, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert param", FALSE); + + /* insert item 5 */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = 0; + item.iItem = 5; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 5, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert state", FALSE); + DestroyWindow(hwnd); } @@ -6687,6 +6799,7 @@ START_TEST(listview) test_imagelists(); test_deleteitem(); test_insertitem(); + test_LVM_INSERTITEM(); test_header_proc(); test_oneclickactivate(); test_callback_mask(); -- 2.34.1

1 0

[PATCH 2/3] comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context.
by Dmitry Timoshkov 18 Jan '22

18 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..236a9d14372 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -472,7 +472,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + + msg.id = nmlv->hdr.code; + if (msg.id == LVN_ITEMCHANGING || msg.id == LVN_ITEMCHANGED) + { + msg.wParam = nmlv->iItem; + msg.lParam = nmlv->uChanged; + } + } if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */ -- 2.34.1

1 0

[PATCH] secur32/tests: Add more DTLS tests.
by Connor McAdams 18 Jan '22

18 Jan '22

Add more tests for DTLS, and clear up behavior of prior tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- This could use some review, as I'm new to this area of Wine. But I think this outlines the issues I've found so far in Wine's current DTLS implementation. --- dlls/secur32/tests/schannel.c | 57 ++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7cb3871193c..1fceaae6a61 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1517,15 +1517,25 @@ static void test_application_protocol_negotiation(void) closesocket(sock); } +static void init_dtls_output_buffer(SecBufferDesc *buffer) +{ + buffer->pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffer->pBuffers[0].cbBuffer = 1420; + buffer->pBuffers[1].BufferType = SECBUFFER_ALERT; + buffer->pBuffers[1].cbBuffer = 1024; + if (!buffer->pBuffers[1].pvBuffer) + buffer->pBuffers[1].pvBuffer = HeapAlloc( GetProcessHeap(), 0, 1024 ); +} + static void test_dtls(void) { SECURITY_STATUS status; TimeStamp exp; SCHANNEL_CRED cred; CredHandle cred_handle; - CtxtHandle ctx_handle; + CtxtHandle ctx_handle, ctx_handle2; SecBufferDesc buffers[3]; - ULONG flags_req, flags_ret, attr; + ULONG flags_req, flags_ret, attr, prev_buf_len; init_cred( &cred ); cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; @@ -1549,11 +1559,7 @@ static void test_dtls(void) buffers[0].pBuffers[0].cbBuffer = 2; init_buffers( &buffers[1], 2, 2048 ); - buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; - buffers[1].pBuffers[0].cbBuffer = 1420; - buffers[1].pBuffers[1].BufferType = SECBUFFER_ALERT; - buffers[1].pBuffers[1].cbBuffer = 1024; - buffers[1].pBuffers[1].pvBuffer = HeapAlloc( GetProcessHeap(), 0, 1024 ); + init_dtls_output_buffer(&buffers[1]); attr = 0; exp.LowPart = exp.HighPart = 0xdeadbeef; @@ -1566,22 +1572,57 @@ static void test_dtls(void) ok( attr == flags_ret, "got %08x\n", attr ); ok( !exp.LowPart, "got %08x\n", exp.LowPart ); ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + ok( buffers[1].pBuffers[1].BufferType == SECBUFFER_ALERT, "Expected buffertype SECBUFFER_ALERT, got %#x\n", buffers[1].pBuffers[1].BufferType); + todo_wine ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); + prev_buf_len = buffers[1].pBuffers[0].cbBuffer; + /* + * If we don't set the SECBUFFER_ALERT cbBuffer value, we will get + * SEC_E_INSUFFICIENT_MEMORY. + */ buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; buffers[1].pBuffers[0].cbBuffer = 1420; attr = 0; exp.LowPart = exp.HighPart = 0xdeadbeef; + ctx_handle2.dwLower = ctx_handle2.dwUpper = 0xdeadbeef; status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, - &ctx_handle, &buffers[1], &attr, &exp ); + &ctx_handle2, &buffers[1], &attr, &exp ); ok( status == SEC_E_INSUFFICIENT_MEMORY, "got %08x\n", status ); flags_ret = ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; todo_wine ok( attr == flags_ret, "got %08x\n", attr ); ok( !exp.LowPart, "got %08x\n", exp.LowPart ); ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + ok( ctx_handle2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); + ok( ctx_handle2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); + + /* No new input buffer value, just repeats the same behavior as before. */ + init_dtls_output_buffer(&buffers[1]); + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + ctx_handle2.dwLower = ctx_handle2.dwUpper = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, + &ctx_handle2, &buffers[1], &attr, &exp ); + todo_wine ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); + + flags_ret = ISC_RET_MANUAL_CRED_VALIDATION | ISC_RET_STREAM | ISC_RET_EXTENDED_ERROR | ISC_RET_DATAGRAM | + ISC_RET_USED_SUPPLIED_CREDS | ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + todo_wine ok( attr == flags_ret, "got %08x\n", attr ); + todo_wine ok( exp.LowPart, "got %08x\n", exp.LowPart ); + todo_wine ok( exp.HighPart, "got %08x\n", exp.HighPart ); + ok( buffers[1].pBuffers[1].BufferType == SECBUFFER_ALERT, "Expected buffertype SECBUFFER_ALERT, got %#x\n", buffers[1].pBuffers[1].BufferType); + todo_wine ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); + todo_wine ok( ctx_handle.dwLower == ctx_handle2.dwLower, "dwLower mismatch, expected %#lx, got %#lx\n", ctx_handle.dwLower, ctx_handle2.dwLower); + todo_wine ok( ctx_handle.dwUpper == ctx_handle2.dwUpper, "dwUpper mismatch, expected %#lx, got %#lx\n", ctx_handle.dwUpper, ctx_handle2.dwUpper); + + /* With no new input buffer, output buffer length should match prior call. */ + todo_wine ok(buffers[1].pBuffers[0].cbBuffer == prev_buf_len, "Output buffer size mismatch, expected %#x, got %#x\n", + prev_buf_len, buffers[1].pBuffers[0].cbBuffer); free_buffers( &buffers[0] ); + HeapFree(GetProcessHeap(), 0, buffers[1].pBuffers[1].pvBuffer); free_buffers( &buffers[1] ); DeleteSecurityContext( &ctx_handle ); FreeCredentialsHandle( &cred_handle ); -- 2.25.1

3 2

[PATCH vkd3d] vkd3d-shader/hlsl: Support casts between all numeric types on constant folding.
by Francisco Casas 18 Jan '22

18 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- This is a proposal to handle all numeric constants in the same way. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.c | 54 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 3 ++ libs/vkd3d-shader/hlsl_codegen.c | 48 ++++++++++------------------ 4 files changed, 73 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index 20fee06d..39003dfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -304,7 +304,6 @@ XFAIL_TESTS = \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ - tests/max.shader_test \ tests/sampler.shader_test \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d2ea4c34..a44b638e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1663,6 +1663,60 @@ unsigned int hlsl_combine_swizzles(unsigned int first, unsigned int second, unsi return ret; } +void hlsl_cast_constant_value(struct hlsl_ir_constant *con, enum hlsl_base_type current, + enum hlsl_base_type target){ + uint32_t u; int32_t i; float f; double d; + + assert(con); + for (int k = 0; k < 4; k++) + { + switch (current) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + u = con->value[k].f; i = con->value[k].f; f = con->value[k].f; d = con->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + u = con->value[k].d; i = con->value[k].d; f = con->value[k].d; d = con->value[k].d; + break; + case HLSL_TYPE_INT: + u = con->value[k].i; i = con->value[k].i; f = con->value[k].i; d = con->value[k].i; + break; + case HLSL_TYPE_UINT: + u = con->value[k].u; i = con->value[k].u; f = con->value[k].u; d = con->value[k].u; + break; + case HLSL_TYPE_BOOL: + u = !!con->value[k].u; i = !!con->value[k].u; f = !!con->value[k].u; d = !!con->value[k].u; + break; + default: + assert(0); + break; + } + switch (target) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + con->value[k].f = f; + break; + case HLSL_TYPE_DOUBLE: + con->value[k].d = d; + break; + case HLSL_TYPE_INT: + con->value[k].i = i; + break; + case HLSL_TYPE_UINT: + con->value[k].u = u; + break; + case HLSL_TYPE_BOOL: + con->value[k].u = (!!u) * 0xffffffff; + break; + default: + assert(0); + break; + } + } +} + static const struct hlsl_profile_info *get_target_info(const char *target) { unsigned int i; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 57acf3a0..a07ccf17 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -755,6 +755,9 @@ unsigned int hlsl_combine_writemasks(unsigned int first, unsigned int second); unsigned int hlsl_map_swizzle(unsigned int swizzle, unsigned int writemask); unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); +void hlsl_cast_constant_value(struct hlsl_ir_constant *con, enum hlsl_base_type current, + enum hlsl_base_type target); + bool hlsl_offset_from_deref(const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..ef627f2b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -656,7 +656,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; - unsigned int i, dimx; + unsigned int i; if (instr->type != HLSL_IR_EXPR) return false; @@ -670,48 +670,32 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; if (!(res = hlsl_alloc(ctx, sizeof(*res)))) return false; init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); + if (expr->op == HLSL_OP1_CAST && instr->data_type->base_type <= HLSL_TYPE_LAST_SCALAR) + { + if (instr->data_type->dimx != arg1->node.data_type->dimx + || instr->data_type->dimy != arg1->node.data_type->dimy) + { + WARN("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + } + memcpy(res->value, arg1->value, sizeof(res->value)); + hlsl_cast_constant_value(res, arg1->node.data_type->base_type, instr->data_type->base_type); + list_add_before(&expr->node.entry, &res->node.entry); + replace_node(&expr->node, &res->node); + return res; + } + switch (instr->data_type->base_type) { case HLSL_TYPE_FLOAT: { switch (expr->op) { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - default: FIXME("Fold float op %#x.\n", expr->op); vkd3d_free(res); -- 2.25.1

3 8

[PATCH vkd3d 6/8] vkd3d-shader/hlsl: Support casts for all numeric types in fold_constants().
by Francisco Casas 17 Jan '22

17 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_constant_ops.c | 131 +++++++++++++++++--------- 2 files changed, 87 insertions(+), 45 deletions(-) diff --git a/Makefile.am b/Makefile.am index d3dfc0a7..606bfdb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,7 +84,6 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/max.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 8279c58b..54c63691 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -20,6 +20,89 @@ #include "hlsl.h" +static int constant_op1_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src) +{ + uint32_t u; + int32_t i; + double d; + float f; + + if (tgt->node.data_type->dimx != src->node.data_type->dimx || + tgt->node.data_type->dimy != src->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + + for (int k = 0; k < 4; k++) + { + switch (src->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + u = src->value[k].f; + i = src->value[k].f; + f = src->value[k].f; + d = src->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + u = src->value[k].d; + i = src->value[k].d; + f = src->value[k].d; + d = src->value[k].d; + break; + case HLSL_TYPE_INT: + u = src->value[k].i; + i = src->value[k].i; + f = src->value[k].i; + d = src->value[k].i; + break; + case HLSL_TYPE_UINT: + u = src->value[k].u; + i = src->value[k].u; + f = src->value[k].u; + d = src->value[k].u; + break; + case HLSL_TYPE_BOOL: + u = !!src->value[k].u; + i = !!src->value[k].u; + f = !!src->value[k].u; + d = !!src->value[k].u; + break; + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + switch (tgt->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = d; + break; + case HLSL_TYPE_INT: + tgt->value[k].i = i; + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = u; + break; + case HLSL_TYPE_BOOL: + tgt->value[k].u = (!!u) * 0xffffffff; + break; + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + static int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) { @@ -61,7 +144,7 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; - unsigned int i, dimx; + unsigned int i; bool success; if (instr->type != HLSL_IR_EXPR) @@ -76,7 +159,6 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont arg1 = hlsl_ir_constant(expr->operands[0].node); if (expr->operands[1].node) arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; if (!(res = hlsl_alloc(ctx, sizeof(*res)))) return false; @@ -86,6 +168,9 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont switch (expr->op) { + case HLSL_OP1_CAST: + success = constant_op1_cast(ctx, res, arg1); + break; case HLSL_OP2_ADD: success = constant_op2_add(ctx, res, arg1, arg2); break; @@ -109,48 +194,6 @@ fallback: switch (instr->data_type->base_type) { - case HLSL_TYPE_FLOAT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - default: - FIXME("Fold float op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } - break; - } - case HLSL_TYPE_UINT: { switch (expr->op) -- 2.25.1

2 1

[PATCH vkd3d 4/8] vkd3d-shader/hlsl: Prepare to swap switch order on fold_constants().
by Francisco Casas 17 Jan '22

17 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Don't mind about the 'goto fallback' too much, it is used transitionally so that the tests still pass. It is removed in later patches. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 924e0380..3a778837 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -25,6 +25,7 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; struct hlsl_ir_expr *expr; unsigned int i, dimx; + bool success; if (instr->type != HLSL_IR_EXPR) return false; @@ -44,6 +45,28 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont return false; init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); + success = false; + + switch (expr->op) + { + default: + goto fallback; + } + + if (success) + { + list_add_before(&expr->node.entry, &res->node.entry); + hlsl_replace_node(&expr->node, &res->node); + return true; + } + else + { + vkd3d_free(res); + return false; + } + +fallback: + switch (instr->data_type->base_type) { case HLSL_TYPE_FLOAT: -- 2.25.1

3 2

[PATCH vkd3d 2/8] vkd3d-shader/hlsl: Rename replace_node() to hlsl_replace_node().
by Francisco Casas 17 Jan '22

17 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3fb84b28..d92e731e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1384,7 +1384,7 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl vkd3d_string_buffer_cleanup(&buffer); } -void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) { struct hlsl_src *src, *next; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 393b3f1f..530d12ad 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -680,7 +680,7 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); -void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); +void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); void hlsl_free_instr(struct hlsl_ir_node *node); void hlsl_free_instr_list(struct list *list); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 00f3dae3..6cb4df8b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -254,7 +254,7 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -402,7 +402,7 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l if (!(swizzle_node = hlsl_new_swizzle(ctx, swizzle, type->dimx, new_node, &node->loc))) return false; list_add_before(&node->entry, &swizzle_node->node.entry); - replace_node(node, &swizzle_node->node); + hlsl_replace_node(node, &swizzle_node->node); return true; } @@ -490,7 +490,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { - replace_node(&expr->node, expr->operands[0].node); + hlsl_replace_node(&expr->node, expr->operands[0].node); return true; } } @@ -632,7 +632,7 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; list_add_after(&new_cast->node.entry, &swizzle->node.entry); - replace_node(&cast->node, &swizzle->node); + hlsl_replace_node(&cast->node, &swizzle->node); return true; } @@ -741,7 +741,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi } list_add_before(&expr->node.entry, &res->node.entry); - replace_node(&expr->node, &res->node); + hlsl_replace_node(&expr->node, &res->node); return true; } @@ -761,7 +761,7 @@ static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *i if (((swizzle->swizzle >> (2 * i)) & 3) != i) return false; - replace_node(instr, swizzle->val.node); + hlsl_replace_node(instr, swizzle->val.node); return true; } -- 2.25.1

3 3

[PATCH v4 vkd3d 1/3] vkd3d-shader/hlsl: Cast round() input to float.
by Nikolay Sivov 17 Jan '22

17 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 19 ++++++++++++++++++- tests/round.shader_test | 13 +++++++++++++ tests/shader_runner_d3d12.c | 13 +++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c..6c285c3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1570,6 +1570,18 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static struct hlsl_ir_node *intrinsic_float_convert_arg(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = arg->data_type; + + if (type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF) + return arg; + + type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + return add_implicit_conversion(ctx, params->instrs, arg, type, loc); +} + static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -1675,7 +1687,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, static bool intrinsic_round(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], loc); + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc); } static bool intrinsic_saturate(struct hlsl_ctx *ctx, diff --git a/tests/round.shader_test b/tests/round.shader_test index d8eb11b..cc5a697 100644 --- a/tests/round.shader_test +++ b/tests/round.shader_test @@ -24,3 +24,16 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (6.0, 8.0, 0.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform int4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 int4 -1 0 2 10 +draw quad +probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 47f419b..c5992aa 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -552,6 +552,19 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &i, sizeof(i)); } + if (match_string(line, "int4", &line)) + { + int v[4]; + + if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) + fatal_error("Malformed int4 constant '%s'.\n", line); + if (offset + 4 > context->uniform_count) + { + context->uniform_count = offset + 4; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, v, sizeof(v)); + } else if (match_string(line, "uint", &line)) { unsigned int u; -- 2.34.1

3 8

[PATCH vkd3d v2 1/7] tests: Separate the compile_shader function from the shader_test parser.
by Zebediah Figura 17 Jan '22

17 Jan '22

In essence, the goal is to separate the d3d12 backend. Just separate the compiler first, though, to make the diff easier to read. NOTE TO SELF: Generate this diff with -C Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 41 +- include/private/vkd3d_test.h | 19 +- tests/shader_runner.c | 862 +++++++++++++++++++++++++++++++++++ tests/shader_runner.h | 29 ++ tests/shader_runner_d3d12.c | 847 +--------------------------------- 5 files changed, 947 insertions(+), 851 deletions(-) create mode 100644 tests/shader_runner.c create mode 100644 tests/shader_runner.h diff --git a/Makefile.am b/Makefile.am index 20fee06d0..84aba0ee7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,9 +50,6 @@ vkd3d_cross_tests = \ tests/d3d12_invalid_usage \ tests/hlsl_d3d12 -vkd3d_shader_runners = \ - tests/shader_runner_d3d12 - vkd3d_shader_tests = \ tests/abs.shader_test \ tests/cast-to-float.shader_test \ @@ -113,7 +110,8 @@ vkd3d_shader_tests = \ vkd3d_test_headers = \ tests/d3d12_crosstest.h \ - tests/d3d12_test_utils.h + tests/d3d12_test_utils.h \ + tests/shader_runner.h vkd3d_demos = \ demos/vkd3d-gears \ @@ -273,15 +271,18 @@ AM_DEFAULT_SOURCE_EXT = .c TEST_EXTENSIONS = .shader_test if BUILD_TESTS -check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_runners) +check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) tests/shader_runner TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_SOURCES = \ + tests/shader_runner.c \ + tests/shader_runner_d3d12.c tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la -SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 +SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ @@ -388,14 +389,17 @@ CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/i CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) +shader_runner_cross_sources = \ + $(srcdir)/tests/shader_runner.c \ + $(srcdir)/tests/shader_runner_d3d12.c + if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) \ - $(vkd3d_shader_runners:=.cross32.exe) -CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe CLEANFILES += $(CROSS32_FILES) crosstest32: $(CROSS32_FILES) @@ -411,6 +415,12 @@ $(CROSS32_EXEFILES): %.cross32.exe: %.c $(CROSS32_IMPLIBS) $(widl_headers) $(AM_V_CCLD)depbase=`echo $@ | $(SED) 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ $(am__mv) $$depbase.Tpo $$depbase.Po + +tests/shader_runner.cross32.exe: $(shader_runner_cross_sources) $(CROSS32_IMPLIBS) $(widl_headers) + $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ + $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $(shader_runner_cross_sources) $(CROSS32_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ + $(am__mv) $$depbase.Tpo $$depbase.Po + else crosstest32: endif @@ -420,9 +430,8 @@ CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) \ - $(vkd3d_shader_runners:=.cross64.exe) -CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe CLEANFILES += $(CROSS64_FILES) crosstest64: $(CROSS64_FILES) @@ -438,6 +447,12 @@ $(CROSS64_EXEFILES): %.cross64.exe: %.c $(CROSS64_IMPLIBS) $(widl_headers) $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ $(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS64_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ $(am__mv) $$depbase.Tpo $$depbase.Po + +tests/shader_runner.cross64.exe: $(shader_runner_cross_sources) $(CROSS64_IMPLIBS) $(widl_headers) + $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ + $(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $(shader_runner_cross_sources) $(CROSS64_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ + $(am__mv) $$depbase.Tpo $$depbase.Po + else crosstest64: endif diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 6b8763dde..0cc7fe4f3 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -28,16 +28,15 @@ #include <stdlib.h> #include <string.h> -static void vkd3d_test_main(int argc, char **argv); -static const char *vkd3d_test_name; -static const char *vkd3d_test_platform = "other"; +extern const char *vkd3d_test_name; +extern const char *vkd3d_test_platform; static void vkd3d_test_start_todo(bool is_todo); static int vkd3d_test_loop_todo(void); static void vkd3d_test_end_todo(void); #define START_TEST(name) \ - static const char *vkd3d_test_name = #name; \ + const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) /* @@ -100,7 +99,7 @@ static void vkd3d_test_end_todo(void); #define todo todo_if(true) -static struct +struct vkd3d_test_state { LONG success_count; LONG failure_count; @@ -120,7 +119,8 @@ static struct const char *test_name_filter; char context[1024]; -} vkd3d_test_state; +}; +extern struct vkd3d_test_state vkd3d_test_state; static bool vkd3d_test_platform_is_windows(void) @@ -253,6 +253,12 @@ vkd3d_test_debug(const char *fmt, ...) printf("%s\n", buffer); } +#ifndef VKD3D_TEST_NO_DEFS +const char *vkd3d_test_platform = "other"; +struct vkd3d_test_state vkd3d_test_state; + +static void vkd3d_test_main(int argc, char **argv); + int main(int argc, char **argv) { const char *test_filter = getenv("VKD3D_TEST_FILTER"); @@ -339,6 +345,7 @@ int wmain(int argc, WCHAR **wargv) return ret; } #endif /* _WIN32 */ +#endif /* VKD3D_TEST_NO_DEFS */ typedef void (*vkd3d_test_pfn)(void); diff --git a/tests/shader_runner.c b/tests/shader_runner.c new file mode 100644 index 000000000..df4344881 --- /dev/null +++ b/tests/shader_runner.c @@ -0,0 +1,862 @@ +/* + * Copyright 2020-2021 Zebediah Figura 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 + */ + +/* + * This application contains code derived from piglit, the license for which + * follows: + * + * Copyright © 2010 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "d3d12_crosstest.h" +#include "shader_runner.h" +#include <errno.h> + +static void VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2) fatal_error(const char *format, ...) +{ + va_list args; + + va_start(args, format); + vfprintf(stderr, format, args); + va_end(args); + exit(1); +} + +static bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (element_count <= *capacity) + return true; + + max_capacity = ~(size_t)0 / element_size; + if (max_capacity < element_count) + return false; + + new_capacity = max(*capacity, 4); + while (new_capacity < element_count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + + if (new_capacity < element_count) + new_capacity = element_count; + + if (!(new_elements = realloc(*elements, new_capacity * element_size))) + return false; + + *elements = new_elements; + *capacity = new_capacity; + + return true; +} + +enum texture_data_type +{ + TEXTURE_DATA_FLOAT, + TEXTURE_DATA_SINT, + TEXTURE_DATA_UINT, +}; + +struct sampler +{ + unsigned int slot; + + D3D12_FILTER filter; + D3D12_TEXTURE_ADDRESS_MODE u_address, v_address, w_address; +}; + +struct texture +{ + unsigned int slot; + + DXGI_FORMAT format; + enum texture_data_type data_type; + unsigned int texel_size; + unsigned int width, height; + uint8_t *data; + size_t data_size, data_capacity; + + D3D12_DESCRIPTOR_RANGE descriptor_range; + ID3D12DescriptorHeap *heap; + ID3D12Resource *resource; + unsigned int root_index; +}; + +struct shader_context +{ + const struct shader_runner_ops *ops; + + struct test_context c; + + ID3D10Blob *ps_code; + + uint32_t *uniforms; + size_t uniform_count; + + struct texture *textures; + size_t texture_count; + + struct sampler *samplers; + size_t sampler_count; +}; + +static void free_texture(struct texture *texture) +{ + ID3D12DescriptorHeap_Release(texture->heap); + ID3D12Resource_Release(texture->resource); + free(texture->data); + memset(texture, 0, sizeof(*texture)); +} + +enum parse_state +{ + STATE_NONE, + STATE_PREPROC, + STATE_PREPROC_INVALID, + STATE_SAMPLER, + STATE_SHADER_INVALID_PIXEL, + STATE_SHADER_PIXEL, + STATE_TEXTURE, + STATE_TEST, +}; + +static bool match_string(const char *line, const char *token, const char **const rest) +{ + size_t len = strlen(token); + + if (strncmp(line, token, len) || !isspace(line[len])) + return false; + if (rest) + { + *rest = line + len; + while (isspace(**rest)) + ++*rest; + } + return true; +} + +static void parse_texture_format(struct texture *texture, const char *line) +{ + static const struct + { + const char *string; + enum texture_data_type data_type; + unsigned int texel_size; + DXGI_FORMAT format; + } + formats[] = + { + {"r32g32b32a32 float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT}, + {"r32g32 uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT}, + {"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT}, + {"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + if (match_string(line, formats[i].string, &line)) + { + texture->format = formats[i].format; + texture->data_type = formats[i].data_type; + texture->texel_size = formats[i].texel_size; + return; + } + } + + fatal_error("Unknown format '%s'.\n", line); +} + +static D3D12_TEXTURE_ADDRESS_MODE parse_sampler_address_mode(const char *line, const char **rest) +{ + if (match_string(line, "border", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_BORDER; + if (match_string(line, "clamp", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + if (match_string(line, "mirror_once", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE; + if (match_string(line, "mirror", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_MIRROR; + if (match_string(line, "wrap", rest)) + return D3D12_TEXTURE_ADDRESS_MODE_WRAP; + + fatal_error("Unknown sampler address mode '%s'.\n", line); +} + +static void parse_sampler_directive(struct sampler *sampler, const char *line) +{ + if (match_string(line, "address", &line)) + { + sampler->u_address = parse_sampler_address_mode(line, &line); + sampler->v_address = parse_sampler_address_mode(line, &line); + sampler->w_address = parse_sampler_address_mode(line, &line); + } + else if (match_string(line, "filter", &line)) + { + static const struct + { + const char *string; + D3D12_FILTER filter; + } + filters[] = + { + {"point point point", D3D12_FILTER_MIN_MAG_MIP_POINT}, + {"point point linear", D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR}, + {"point linear point", D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT}, + {"point linear linear", D3D12_FILTER_MIN_POINT_MAG_MIP_LINEAR}, + {"linear point point", D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT}, + {"linear point linear", D3D12_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR}, + {"linear linear point", D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT}, + {"linear linear linear", D3D12_FILTER_MIN_MAG_MIP_LINEAR}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(filters); ++i) + { + if (match_string(line, filters[i].string, &line)) + { + sampler->filter = filters[i].filter; + return; + } + } + + fatal_error("Unknown sampler filter '%s'.\n", line); + } + else + { + fatal_error("Unknown sampler directive '%s'.\n", line); + } +} + +static void parse_texture_directive(struct texture *texture, const char *line) +{ + int ret; + + if (match_string(line, "format", &line)) + { + parse_texture_format(texture, line); + } + else if (match_string(line, "size", &line)) + { + ret = sscanf(line, "( %u , %u )", &texture->width, &texture->height); + if (ret < 2) + fatal_error("Malformed texture size '%s'.\n", line); + } + else + { + union + { + float f; + int32_t i; + uint32_t u; + } u; + char *rest; + + u.u = 0; + + for (;;) + { + switch (texture->data_type) + { + case TEXTURE_DATA_FLOAT: + u.f = strtof(line, &rest); + break; + + case TEXTURE_DATA_SINT: + u.i = strtol(line, &rest, 10); + break; + + case TEXTURE_DATA_UINT: + u.u = strtoul(line, &rest, 10); + break; + } + + if (rest == line) + break; + + vkd3d_array_reserve((void **)&texture->data, &texture->data_capacity, texture->data_size + sizeof(u), 1); + memcpy(texture->data + texture->data_size, &u, sizeof(u)); + texture->data_size += sizeof(u); + line = rest; + } + } +} + +static void parse_test_directive(struct shader_context *context, const char *line) +{ + if (match_string(line, "draw quad", &line)) + { + D3D12_SHADER_BYTECODE ps + = {ID3D10Blob_GetBufferPointer(context->ps_code), ID3D10Blob_GetBufferSize(context->ps_code)}; + ID3D12GraphicsCommandList *command_list = context->c.list; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; + D3D12_ROOT_PARAMETER root_params[3], *root_param; + D3D12_STATIC_SAMPLER_DESC static_samplers[1]; + static const float clear_color[4]; + unsigned int uniform_index; + ID3D12PipelineState *pso; + HRESULT hr; + size_t i; + + root_signature_desc.NumParameters = 0; + root_signature_desc.pParameters = root_params; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = static_samplers; + + if (context->uniform_count) + { + uniform_index = root_signature_desc.NumParameters++; + root_param = &root_params[uniform_index]; + root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_param->Constants.ShaderRegister = 0; + root_param->Constants.RegisterSpace = 0; + root_param->Constants.Num32BitValues = context->uniform_count; + root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + } + + for (i = 0; i < context->texture_count; ++i) + { + struct texture *texture = &context->textures[i]; + D3D12_DESCRIPTOR_RANGE *range = &texture->descriptor_range; + D3D12_SUBRESOURCE_DATA resource_data; + + texture->root_index = root_signature_desc.NumParameters++; + root_param = &root_params[texture->root_index]; + root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_param->DescriptorTable.NumDescriptorRanges = 1; + root_param->DescriptorTable.pDescriptorRanges = range; + root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + + range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + range->NumDescriptors = 1; + range->BaseShaderRegister = texture->slot; + range->RegisterSpace = 0; + range->OffsetInDescriptorsFromTableStart = 0; + + if (!texture->resource) + { + texture->heap = create_gpu_descriptor_heap(context->c.device, + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + texture->resource = create_default_texture(context->c.device, texture->width, texture->height, + texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); + resource_data.pData = texture->data; + resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size; + upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list); + reset_command_list(command_list, context->c.allocator); + transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, + D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + ID3D12Device_CreateShaderResourceView(context->c.device, texture->resource, + NULL, get_cpu_descriptor_handle(&context->c, texture->heap, 0)); + } + } + + assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params)); + + for (i = 0; i < context->sampler_count; ++i) + { + D3D12_STATIC_SAMPLER_DESC *sampler_desc = &static_samplers[root_signature_desc.NumStaticSamplers++]; + const struct sampler *sampler = &context->samplers[i]; + + memset(sampler_desc, 0, sizeof(*sampler_desc)); + sampler_desc->Filter = sampler->filter; + sampler_desc->AddressU = sampler->u_address; + sampler_desc->AddressV = sampler->v_address; + sampler_desc->AddressW = sampler->w_address; + sampler_desc->ShaderRegister = sampler->slot; + sampler_desc->RegisterSpace = 0; + sampler_desc->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + } + + if (context->c.root_signature) + ID3D12RootSignature_Release(context->c.root_signature); + hr = create_root_signature(context->c.device, &root_signature_desc, &context->c.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + pso = create_pipeline_state(context->c.device, context->c.root_signature, context->c.render_target_desc.Format, + NULL, &ps, NULL); + if (!pso) + return; + vkd3d_array_reserve((void **)&context->c.pso, &context->c.pso_capacity, context->c.pso_count + 1, sizeof(*context->c.pso)); + context->c.pso[context->c.pso_count++] = pso; + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->c.root_signature); + if (context->uniform_count) + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, uniform_index, + context->uniform_count, context->uniforms, 0); + for (i = 0; i < context->texture_count; ++i) + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, context->textures[i].root_index, + get_gpu_descriptor_handle(&context->c, context->textures[i].heap, 0)); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->c.rtv, false, NULL); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->c.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->c.viewport); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->c.rtv, clear_color, 0, NULL); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + transition_resource_state(command_list, context->c.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + } + else if (match_string(line, "probe all rgba", &line)) + { + unsigned int ulps; + struct vec4 v; + int ret; + + ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); + if (ret < 4) + fatal_error("Malformed probe arguments '%s'.\n", line); + if (ret < 5) + ulps = 0; + check_sub_resource_vec4(context->c.render_target, 0, context->c.queue, context->c.list, &v, ulps); + reset_command_list(context->c.list, context->c.allocator); + } + else if (match_string(line, "probe rect rgba", &line)) + { + unsigned int x, y, w, h, ulps; + struct resource_readback rb; + struct vec4 v; + RECT rect; + int ret; + + ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f ) %u", + &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w, &ulps); + if (ret < 8) + fatal_error("Malformed probe arguments '%s'.\n", line); + if (ret < 9) + ulps = 0; + + get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); + rect.left = x; + rect.right = x + w; + rect.top = y; + rect.bottom = y + h; + check_readback_data_vec4(&rb, &rect, &v, ulps); + release_resource_readback(&rb); + reset_command_list(context->c.list, context->c.allocator); + } + else if (match_string(line, "probe rgba", &line)) + { + struct resource_readback rb; + unsigned int x, y, ulps; + struct vec4 v; + RECT rect; + int ret; + + ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); + if (ret < 6) + fatal_error("Malformed probe arguments '%s'.\n", line); + if (ret < 7) + ulps = 0; + + get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); + rect.left = x; + rect.right = x + 1; + rect.top = y; + rect.bottom = y + 1; + check_readback_data_vec4(&rb, &rect, &v, ulps); + release_resource_readback(&rb); + reset_command_list(context->c.list, context->c.allocator); + } + else if (match_string(line, "uniform", &line)) + { + unsigned int offset; + + if (!sscanf(line, "%u", &offset)) + fatal_error("Unknown uniform type '%s'.\n", line); + line = strchr(line, ' ') + 1; + + if (match_string(line, "float4", &line)) + { + struct vec4 v; + + if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4) + fatal_error("Malformed float4 constant '%s'.\n", line); + if (offset + 4 > context->uniform_count) + { + context->uniform_count = offset + 4; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &v, sizeof(v)); + } + else if (match_string(line, "float", &line)) + { + float f; + + if (sscanf(line, "%f", &f) < 1) + fatal_error("Malformed float constant '%s'.\n", line); + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &f, sizeof(f)); + } + else if (match_string(line, "int", &line)) + { + int i; + + if (sscanf(line, "%i", &i) < 1) + fatal_error("Malformed int constant '%s'.\n", line); + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &i, sizeof(i)); + } + else if (match_string(line, "uint", &line)) + { + unsigned int u; + + if (sscanf(line, "%u", &u) < 1) + fatal_error("Malformed uint constant '%s'.\n", line); + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &u, sizeof(u)); + } + } + else + { + fatal_error("Unknown test directive '%s'.\n", line); + } +} + +static struct sampler *get_sampler(struct shader_context *context, unsigned int slot) +{ + struct sampler *sampler; + size_t i; + + for (i = 0; i < context->sampler_count; ++i) + { + sampler = &context->samplers[i]; + + if (sampler->slot == slot) + return sampler; + } + + return NULL; +} + +static struct texture *get_texture(struct shader_context *context, unsigned int slot) +{ + struct texture *texture; + size_t i; + + for (i = 0; i < context->texture_count; ++i) + { + texture = &context->textures[i]; + if (texture->slot == slot) + return texture; + } + + return NULL; +} + +void run_shader_tests(int argc, char **argv, const struct shader_runner_ops *ops) +{ + static const struct test_context_desc desc = + { + .rt_width = 640, + .rt_height = 480, + .no_root_signature = true, + .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, + }; + size_t shader_source_size = 0, shader_source_len = 0; + struct sampler *current_sampler = NULL; + struct texture *current_texture = NULL; + enum parse_state state = STATE_NONE; + unsigned int i, line_number = 0; + struct shader_context context; + const char *filename = NULL; + char *shader_source = NULL; + char line[256]; + FILE *f; + + parse_args(argc, argv); + enable_d3d12_debug_layer(argc, argv); + init_adapter_info(); + + for (i = 1; i < argc; ++i) + { + if (argv[i][0] != '-') + { + filename = argv[i]; + break; + } + } + + if (!filename) + { + fprintf(stderr, "Usage: %s [file]\n", argv[0]); + return; + } + + if (!(f = fopen(filename, "r"))) + { + fatal_error("Unable to open '%s' for reading: %s\n", argv[1], strerror(errno)); + return; + } + + memset(&context, 0, sizeof(context)); + context.ops = ops; + init_test_context(&context.c, &desc); + + for (;;) + { + char *ret = fgets(line, sizeof(line), f); + + ++line_number; + + if (!ret || line[0] == '[') + { + switch (state) + { + case STATE_NONE: + case STATE_SAMPLER: + case STATE_TEST: + case STATE_TEXTURE: + break; + + case STATE_SHADER_PIXEL: + if (!(context.ps_code = context.ops->compile_shader(shader_source))) + return; + shader_source_len = 0; + break; + + case STATE_SHADER_INVALID_PIXEL: + { + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = D3DCompile(shader_source, strlen(shader_source), NULL, + NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!blob, "Expected no compiled shader blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); + if (!errors) + return; + + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + + shader_source_len = 0; + break; + } + + case STATE_PREPROC_INVALID: + { + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!blob, "Expected no compiled shader blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); + + if (errors) + { + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + + shader_source_len = 0; + break; + } + + case STATE_PREPROC: + { + ID3D10Blob *blob = NULL, *errors = NULL; + SIZE_T size; + HRESULT hr; + char *text; + + hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + if (errors) + { + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + + text = ID3D10Blob_GetBufferPointer(blob); + size = ID3D10Blob_GetBufferSize(blob); + ok(vkd3d_memmem(text, size, "pass", strlen("pass")), + "'pass' not found in preprocessed shader.\n"); + ok(!vkd3d_memmem(text, size, "fail", strlen("fail")), + "'fail' found in preprocessed shader.\n"); + ID3D10Blob_Release(blob); + } + + shader_source_len = 0; + break; + } + } + } + + if (!ret) + break; + + if (line[0] == '[') + { + unsigned int index; + + if (!strcmp(line, "[pixel shader]\n")) + { + state = STATE_SHADER_PIXEL; + + if (context.ps_code) + ID3D10Blob_Release(context.ps_code); + context.ps_code = NULL; + } + else if (!strcmp(line, "[pixel shader fail]\n")) + { + state = STATE_SHADER_INVALID_PIXEL; + } + else if (sscanf(line, "[sampler %u]\n", &index)) + { + state = STATE_SAMPLER; + + if ((current_sampler = get_sampler(&context, index))) + { + memset(current_sampler, 0, sizeof(*current_sampler)); + } + else + { + context.samplers = realloc(context.samplers, + ++context.sampler_count * sizeof(*context.samplers)); + current_sampler = &context.samplers[context.sampler_count - 1]; + memset(current_sampler, 0, sizeof(*current_sampler)); + } + current_sampler->slot = index; + current_sampler->filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + current_sampler->u_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + current_sampler->v_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + current_sampler->w_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + } + else if (sscanf(line, "[texture %u]\n", &index)) + { + state = STATE_TEXTURE; + + if ((current_texture = get_texture(&context, index))) + { + free_texture(current_texture); + } + else + { + context.textures = realloc(context.textures, + ++context.texture_count * sizeof(*context.textures)); + current_texture = &context.textures[context.texture_count - 1]; + memset(current_texture, 0, sizeof(*current_texture)); + } + current_texture->slot = index; + current_texture->format = DXGI_FORMAT_R32G32B32A32_FLOAT; + current_texture->data_type = TEXTURE_DATA_FLOAT; + current_texture->texel_size = 16; + } + else if (!strcmp(line, "[test]\n")) + { + state = STATE_TEST; + } + else if (!strcmp(line, "[preproc]\n")) + { + state = STATE_PREPROC; + } + else if (!strcmp(line, "[preproc fail]\n")) + { + state = STATE_PREPROC_INVALID; + } + + vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); + } + else if (line[0] != '%' && line[0] != '\n') + { + switch (state) + { + case STATE_NONE: + fatal_error("Malformed line '%s'.\n", line); + break; + + case STATE_PREPROC: + case STATE_PREPROC_INVALID: + case STATE_SHADER_INVALID_PIXEL: + case STATE_SHADER_PIXEL: + { + size_t len = strlen(line); + + vkd3d_array_reserve((void **)&shader_source, &shader_source_size, shader_source_len + len + 1, 1); + memcpy(shader_source + shader_source_len, line, len + 1); + shader_source_len += len; + break; + } + + case STATE_SAMPLER: + parse_sampler_directive(current_sampler, line); + break; + + case STATE_TEXTURE: + parse_texture_directive(current_texture, line); + break; + + case STATE_TEST: + parse_test_directive(&context, line); + break; + } + } + } + + if (context.ps_code) + ID3D10Blob_Release(context.ps_code); + for (i = 0; i < context.texture_count; ++i) + free_texture(&context.textures[i]); + destroy_test_context(&context.c); + + fclose(f); +} + +START_TEST(shader_runner) +{ + run_shader_tests_d3d12(argc, argv); +} diff --git a/tests/shader_runner.h b/tests/shader_runner.h new file mode 100644 index 000000000..5178c6544 --- /dev/null +++ b/tests/shader_runner.h @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Zebediah Figura 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 + */ + +#include "vkd3d_windows.h" +#include "vkd3d_d3dcommon.h" + +struct shader_runner_ops +{ + ID3D10Blob *(*compile_shader)(const char *source); +}; + +void run_shader_tests(int argc, char **argv, const struct shader_runner_ops *ops); + +void run_shader_tests_d3d12(int argc, char **argv); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 47f419b96..6246c8701 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -1,5 +1,5 @@ /* - * Copyright 2020 Zebediah Figura for CodeWeavers + * Copyright 2020-2021 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,127 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * This application contains code derived from piglit, the license for which - * follows: - * - * Copyright © 2010 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include "d3d12_crosstest.h" -#include <errno.h> - -static void VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2) fatal_error(const char *format, ...) -{ - va_list args; - - va_start(args, format); - vfprintf(stderr, format, args); - va_end(args); - exit(1); -} - -static bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) -{ - size_t new_capacity, max_capacity; - void *new_elements; - - if (element_count <= *capacity) - return true; - - max_capacity = ~(size_t)0 / element_size; - if (max_capacity < element_count) - return false; - - new_capacity = max(*capacity, 4); - while (new_capacity < element_count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - - if (new_capacity < element_count) - new_capacity = element_count; - - if (!(new_elements = realloc(*elements, new_capacity * element_size))) - return false; - - *elements = new_elements; - *capacity = new_capacity; - - return true; -} - -enum texture_data_type -{ - TEXTURE_DATA_FLOAT, - TEXTURE_DATA_SINT, - TEXTURE_DATA_UINT, -}; +#define COBJMACROS +#define CONST_VTABLE +#define VKD3D_TEST_NO_DEFS +#include "vkd3d_windows.h" +#include "vkd3d_d3dcommon.h" +#include "vkd3d_d3dcompiler.h" +#include "vkd3d_test.h" +#include "shader_runner.h" -struct sampler -{ - unsigned int slot; - - D3D12_FILTER filter; - D3D12_TEXTURE_ADDRESS_MODE u_address, v_address, w_address; -}; - -struct texture -{ - unsigned int slot; - - DXGI_FORMAT format; - enum texture_data_type data_type; - unsigned int texel_size; - unsigned int width, height; - uint8_t *data; - size_t data_size, data_capacity; - - D3D12_DESCRIPTOR_RANGE descriptor_range; - ID3D12DescriptorHeap *heap; - ID3D12Resource *resource; - unsigned int root_index; -}; - -struct shader_context -{ - struct test_context c; - - ID3D10Blob *ps_code; - - uint32_t *uniforms; - size_t uniform_count; - - struct texture *textures; - size_t texture_count; - - struct sampler *samplers; - size_t sampler_count; -}; - -static ID3D10Blob *compile_shader(const char *source, const char *target) +static ID3D10Blob *d3d12_runner_compile_shader(const char *source) { ID3D10Blob *blob = NULL, *errors = NULL; HRESULT hr; - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); if (errors) { @@ -147,723 +41,12 @@ static ID3D10Blob *compile_shader(const char *source, const char *target) return blob; } -static void free_texture(struct texture *texture) +static const struct shader_runner_ops d3d12_runner_ops = { - ID3D12DescriptorHeap_Release(texture->heap); - ID3D12Resource_Release(texture->resource); - free(texture->data); - memset(texture, 0, sizeof(*texture)); -} - -enum parse_state -{ - STATE_NONE, - STATE_PREPROC, - STATE_PREPROC_INVALID, - STATE_SAMPLER, - STATE_SHADER_INVALID_PIXEL, - STATE_SHADER_PIXEL, - STATE_TEXTURE, - STATE_TEST, + .compile_shader = d3d12_runner_compile_shader, }; -static bool match_string(const char *line, const char *token, const char **const rest) -{ - size_t len = strlen(token); - - if (strncmp(line, token, len) || !isspace(line[len])) - return false; - if (rest) - { - *rest = line + len; - while (isspace(**rest)) - ++*rest; - } - return true; -} - -static void parse_texture_format(struct texture *texture, const char *line) -{ - static const struct - { - const char *string; - enum texture_data_type data_type; - unsigned int texel_size; - DXGI_FORMAT format; - } - formats[] = - { - {"r32g32b32a32 float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT}, - {"r32g32 uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT}, - {"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT}, - {"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT}, - }; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(formats); ++i) - { - if (match_string(line, formats[i].string, &line)) - { - texture->format = formats[i].format; - texture->data_type = formats[i].data_type; - texture->texel_size = formats[i].texel_size; - return; - } - } - - fatal_error("Unknown format '%s'.\n", line); -} - -static D3D12_TEXTURE_ADDRESS_MODE parse_sampler_address_mode(const char *line, const char **rest) -{ - if (match_string(line, "border", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_BORDER; - if (match_string(line, "clamp", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - if (match_string(line, "mirror_once", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE; - if (match_string(line, "mirror", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_MIRROR; - if (match_string(line, "wrap", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_WRAP; - - fatal_error("Unknown sampler address mode '%s'.\n", line); -} - -static void parse_sampler_directive(struct sampler *sampler, const char *line) -{ - if (match_string(line, "address", &line)) - { - sampler->u_address = parse_sampler_address_mode(line, &line); - sampler->v_address = parse_sampler_address_mode(line, &line); - sampler->w_address = parse_sampler_address_mode(line, &line); - } - else if (match_string(line, "filter", &line)) - { - static const struct - { - const char *string; - D3D12_FILTER filter; - } - filters[] = - { - {"point point point", D3D12_FILTER_MIN_MAG_MIP_POINT}, - {"point point linear", D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR}, - {"point linear point", D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT}, - {"point linear linear", D3D12_FILTER_MIN_POINT_MAG_MIP_LINEAR}, - {"linear point point", D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT}, - {"linear point linear", D3D12_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR}, - {"linear linear point", D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT}, - {"linear linear linear", D3D12_FILTER_MIN_MAG_MIP_LINEAR}, - }; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(filters); ++i) - { - if (match_string(line, filters[i].string, &line)) - { - sampler->filter = filters[i].filter; - return; - } - } - - fatal_error("Unknown sampler filter '%s'.\n", line); - } - else - { - fatal_error("Unknown sampler directive '%s'.\n", line); - } -} - -static void parse_texture_directive(struct texture *texture, const char *line) -{ - int ret; - - if (match_string(line, "format", &line)) - { - parse_texture_format(texture, line); - } - else if (match_string(line, "size", &line)) - { - ret = sscanf(line, "( %u , %u )", &texture->width, &texture->height); - if (ret < 2) - fatal_error("Malformed texture size '%s'.\n", line); - } - else - { - union - { - float f; - int32_t i; - uint32_t u; - } u; - char *rest; - - u.u = 0; - - for (;;) - { - switch (texture->data_type) - { - case TEXTURE_DATA_FLOAT: - u.f = strtof(line, &rest); - break; - - case TEXTURE_DATA_SINT: - u.i = strtol(line, &rest, 10); - break; - - case TEXTURE_DATA_UINT: - u.u = strtoul(line, &rest, 10); - break; - } - - if (rest == line) - break; - - vkd3d_array_reserve((void **)&texture->data, &texture->data_capacity, texture->data_size + sizeof(u), 1); - memcpy(texture->data + texture->data_size, &u, sizeof(u)); - texture->data_size += sizeof(u); - line = rest; - } - } -} - -static void parse_test_directive(struct shader_context *context, const char *line) -{ - if (match_string(line, "draw quad", &line)) - { - D3D12_SHADER_BYTECODE ps - = {ID3D10Blob_GetBufferPointer(context->ps_code), ID3D10Blob_GetBufferSize(context->ps_code)}; - ID3D12GraphicsCommandList *command_list = context->c.list; - D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; - D3D12_ROOT_PARAMETER root_params[3], *root_param; - D3D12_STATIC_SAMPLER_DESC static_samplers[1]; - static const float clear_color[4]; - unsigned int uniform_index; - ID3D12PipelineState *pso; - HRESULT hr; - size_t i; - - root_signature_desc.NumParameters = 0; - root_signature_desc.pParameters = root_params; - root_signature_desc.NumStaticSamplers = 0; - root_signature_desc.pStaticSamplers = static_samplers; - - if (context->uniform_count) - { - uniform_index = root_signature_desc.NumParameters++; - root_param = &root_params[uniform_index]; - root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; - root_param->Constants.ShaderRegister = 0; - root_param->Constants.RegisterSpace = 0; - root_param->Constants.Num32BitValues = context->uniform_count; - root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - } - - for (i = 0; i < context->texture_count; ++i) - { - struct texture *texture = &context->textures[i]; - D3D12_DESCRIPTOR_RANGE *range = &texture->descriptor_range; - D3D12_SUBRESOURCE_DATA resource_data; - - texture->root_index = root_signature_desc.NumParameters++; - root_param = &root_params[texture->root_index]; - root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; - root_param->DescriptorTable.NumDescriptorRanges = 1; - root_param->DescriptorTable.pDescriptorRanges = range; - root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - - range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; - range->NumDescriptors = 1; - range->BaseShaderRegister = texture->slot; - range->RegisterSpace = 0; - range->OffsetInDescriptorsFromTableStart = 0; - - if (!texture->resource) - { - texture->heap = create_gpu_descriptor_heap(context->c.device, - D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); - texture->resource = create_default_texture(context->c.device, texture->width, texture->height, - texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); - resource_data.pData = texture->data; - resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size; - upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list); - reset_command_list(command_list, context->c.allocator); - transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, - D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); - ID3D12Device_CreateShaderResourceView(context->c.device, texture->resource, - NULL, get_cpu_descriptor_handle(&context->c, texture->heap, 0)); - } - } - - assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params)); - - for (i = 0; i < context->sampler_count; ++i) - { - D3D12_STATIC_SAMPLER_DESC *sampler_desc = &static_samplers[root_signature_desc.NumStaticSamplers++]; - const struct sampler *sampler = &context->samplers[i]; - - memset(sampler_desc, 0, sizeof(*sampler_desc)); - sampler_desc->Filter = sampler->filter; - sampler_desc->AddressU = sampler->u_address; - sampler_desc->AddressV = sampler->v_address; - sampler_desc->AddressW = sampler->w_address; - sampler_desc->ShaderRegister = sampler->slot; - sampler_desc->RegisterSpace = 0; - sampler_desc->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - } - - if (context->c.root_signature) - ID3D12RootSignature_Release(context->c.root_signature); - hr = create_root_signature(context->c.device, &root_signature_desc, &context->c.root_signature); - ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - - pso = create_pipeline_state(context->c.device, context->c.root_signature, context->c.render_target_desc.Format, - NULL, &ps, NULL); - if (!pso) - return; - vkd3d_array_reserve((void **)&context->c.pso, &context->c.pso_capacity, context->c.pso_count + 1, sizeof(*context->c.pso)); - context->c.pso[context->c.pso_count++] = pso; - - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->c.root_signature); - if (context->uniform_count) - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, uniform_index, - context->uniform_count, context->uniforms, 0); - for (i = 0; i < context->texture_count; ++i) - ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, context->textures[i].root_index, - get_gpu_descriptor_handle(&context->c, context->textures[i].heap, 0)); - - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->c.rtv, false, NULL); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->c.scissor_rect); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->c.viewport); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->c.rtv, clear_color, 0, NULL); - ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - transition_resource_state(command_list, context->c.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - } - else if (match_string(line, "probe all rgba", &line)) - { - unsigned int ulps; - struct vec4 v; - int ret; - - ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); - if (ret < 4) - fatal_error("Malformed probe arguments '%s'.\n", line); - if (ret < 5) - ulps = 0; - check_sub_resource_vec4(context->c.render_target, 0, context->c.queue, context->c.list, &v, ulps); - reset_command_list(context->c.list, context->c.allocator); - } - else if (match_string(line, "probe rect rgba", &line)) - { - unsigned int x, y, w, h, ulps; - struct resource_readback rb; - struct vec4 v; - RECT rect; - int ret; - - ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f ) %u", - &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w, &ulps); - if (ret < 8) - fatal_error("Malformed probe arguments '%s'.\n", line); - if (ret < 9) - ulps = 0; - - get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); - rect.left = x; - rect.right = x + w; - rect.top = y; - rect.bottom = y + h; - check_readback_data_vec4(&rb, &rect, &v, ulps); - release_resource_readback(&rb); - reset_command_list(context->c.list, context->c.allocator); - } - else if (match_string(line, "probe rgba", &line)) - { - struct resource_readback rb; - unsigned int x, y, ulps; - struct vec4 v; - RECT rect; - int ret; - - ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); - if (ret < 6) - fatal_error("Malformed probe arguments '%s'.\n", line); - if (ret < 7) - ulps = 0; - - get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); - rect.left = x; - rect.right = x + 1; - rect.top = y; - rect.bottom = y + 1; - check_readback_data_vec4(&rb, &rect, &v, ulps); - release_resource_readback(&rb); - reset_command_list(context->c.list, context->c.allocator); - } - else if (match_string(line, "uniform", &line)) - { - unsigned int offset; - - if (!sscanf(line, "%u", &offset)) - fatal_error("Unknown uniform type '%s'.\n", line); - line = strchr(line, ' ') + 1; - - if (match_string(line, "float4", &line)) - { - struct vec4 v; - - if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4) - fatal_error("Malformed float4 constant '%s'.\n", line); - if (offset + 4 > context->uniform_count) - { - context->uniform_count = offset + 4; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &v, sizeof(v)); - } - else if (match_string(line, "float", &line)) - { - float f; - - if (sscanf(line, "%f", &f) < 1) - fatal_error("Malformed float constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &f, sizeof(f)); - } - else if (match_string(line, "int", &line)) - { - int i; - - if (sscanf(line, "%i", &i) < 1) - fatal_error("Malformed int constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &i, sizeof(i)); - } - else if (match_string(line, "uint", &line)) - { - unsigned int u; - - if (sscanf(line, "%u", &u) < 1) - fatal_error("Malformed uint constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &u, sizeof(u)); - } - } - else - { - fatal_error("Unknown test directive '%s'.\n", line); - } -} - -static struct sampler *get_sampler(struct shader_context *context, unsigned int slot) -{ - struct sampler *sampler; - size_t i; - - for (i = 0; i < context->sampler_count; ++i) - { - sampler = &context->samplers[i]; - - if (sampler->slot == slot) - return sampler; - } - - return NULL; -} - -static struct texture *get_texture(struct shader_context *context, unsigned int slot) -{ - struct texture *texture; - size_t i; - - for (i = 0; i < context->texture_count; ++i) - { - texture = &context->textures[i]; - if (texture->slot == slot) - return texture; - } - - return NULL; -} - -START_TEST(shader_runner_d3d12) +void run_shader_tests_d3d12(int argc, char **argv) { - static const struct test_context_desc desc = - { - .rt_width = 640, - .rt_height = 480, - .no_root_signature = true, - .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, - }; - size_t shader_source_size = 0, shader_source_len = 0; - struct sampler *current_sampler = NULL; - struct texture *current_texture = NULL; - enum parse_state state = STATE_NONE; - unsigned int i, line_number = 0; - struct shader_context context; - const char *filename = NULL; - char *shader_source = NULL; - char line[256]; - FILE *f; - - parse_args(argc, argv); - enable_d3d12_debug_layer(argc, argv); - init_adapter_info(); - - for (i = 1; i < argc; ++i) - { - if (argv[i][0] != '-') - { - filename = argv[i]; - break; - } - } - - if (!filename) - { - fprintf(stderr, "Usage: %s [file]\n", argv[0]); - return; - } - - if (!(f = fopen(filename, "r"))) - { - fatal_error("Unable to open '%s' for reading: %s\n", argv[1], strerror(errno)); - return; - } - - memset(&context, 0, sizeof(context)); - init_test_context(&context.c, &desc); - - for (;;) - { - char *ret = fgets(line, sizeof(line), f); - - ++line_number; - - if (!ret || line[0] == '[') - { - switch (state) - { - case STATE_NONE: - case STATE_SAMPLER: - case STATE_TEST: - case STATE_TEXTURE: - break; - - case STATE_SHADER_PIXEL: - if (!(context.ps_code = compile_shader(shader_source, "ps_4_0"))) - return; - shader_source_len = 0; - break; - - case STATE_SHADER_INVALID_PIXEL: - { - ID3D10Blob *blob = NULL, *errors = NULL; - HRESULT hr; - - hr = D3DCompile(shader_source, strlen(shader_source), NULL, - NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - ok(!blob, "Expected no compiled shader blob.\n"); - ok(!!errors, "Expected non-NULL error blob.\n"); - if (!errors) - return; - - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); - - shader_source_len = 0; - break; - } - - case STATE_PREPROC_INVALID: - { - ID3D10Blob *blob = NULL, *errors = NULL; - HRESULT hr; - - hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - ok(!blob, "Expected no compiled shader blob.\n"); - ok(!!errors, "Expected non-NULL error blob.\n"); - - if (errors) - { - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); - } - - shader_source_len = 0; - break; - } - - case STATE_PREPROC: - { - ID3D10Blob *blob = NULL, *errors = NULL; - SIZE_T size; - HRESULT hr; - char *text; - - hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr == S_OK) - { - if (errors) - { - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); - } - - text = ID3D10Blob_GetBufferPointer(blob); - size = ID3D10Blob_GetBufferSize(blob); - ok(vkd3d_memmem(text, size, "pass", strlen("pass")), - "'pass' not found in preprocessed shader.\n"); - ok(!vkd3d_memmem(text, size, "fail", strlen("fail")), - "'fail' found in preprocessed shader.\n"); - ID3D10Blob_Release(blob); - } - - shader_source_len = 0; - break; - } - } - } - - if (!ret) - break; - - if (line[0] == '[') - { - unsigned int index; - - if (!strcmp(line, "[pixel shader]\n")) - { - state = STATE_SHADER_PIXEL; - - if (context.ps_code) - ID3D10Blob_Release(context.ps_code); - context.ps_code = NULL; - } - else if (!strcmp(line, "[pixel shader fail]\n")) - { - state = STATE_SHADER_INVALID_PIXEL; - } - else if (sscanf(line, "[sampler %u]\n", &index)) - { - state = STATE_SAMPLER; - - if ((current_sampler = get_sampler(&context, index))) - { - memset(current_sampler, 0, sizeof(*current_sampler)); - } - else - { - context.samplers = realloc(context.samplers, - ++context.sampler_count * sizeof(*context.samplers)); - current_sampler = &context.samplers[context.sampler_count - 1]; - memset(current_sampler, 0, sizeof(*current_sampler)); - } - current_sampler->slot = index; - current_sampler->filter = D3D12_FILTER_MIN_MAG_MIP_POINT; - current_sampler->u_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - current_sampler->v_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - current_sampler->w_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - } - else if (sscanf(line, "[texture %u]\n", &index)) - { - state = STATE_TEXTURE; - - if ((current_texture = get_texture(&context, index))) - { - free_texture(current_texture); - } - else - { - context.textures = realloc(context.textures, - ++context.texture_count * sizeof(*context.textures)); - current_texture = &context.textures[context.texture_count - 1]; - memset(current_texture, 0, sizeof(*current_texture)); - } - current_texture->slot = index; - current_texture->format = DXGI_FORMAT_R32G32B32A32_FLOAT; - current_texture->data_type = TEXTURE_DATA_FLOAT; - current_texture->texel_size = 16; - } - else if (!strcmp(line, "[test]\n")) - { - state = STATE_TEST; - } - else if (!strcmp(line, "[preproc]\n")) - { - state = STATE_PREPROC; - } - else if (!strcmp(line, "[preproc fail]\n")) - { - state = STATE_PREPROC_INVALID; - } - - vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); - } - else if (line[0] != '%' && line[0] != '\n') - { - switch (state) - { - case STATE_NONE: - fatal_error("Malformed line '%s'.\n", line); - break; - - case STATE_PREPROC: - case STATE_PREPROC_INVALID: - case STATE_SHADER_INVALID_PIXEL: - case STATE_SHADER_PIXEL: - { - size_t len = strlen(line); - - vkd3d_array_reserve((void **)&shader_source, &shader_source_size, shader_source_len + len + 1, 1); - memcpy(shader_source + shader_source_len, line, len + 1); - shader_source_len += len; - break; - } - - case STATE_SAMPLER: - parse_sampler_directive(current_sampler, line); - break; - - case STATE_TEXTURE: - parse_texture_directive(current_texture, line); - break; - - case STATE_TEST: - parse_test_directive(&context, line); - break; - } - } - } - - if (context.ps_code) - ID3D10Blob_Release(context.ps_code); - for (i = 0; i < context.texture_count; ++i) - free_texture(&context.textures[i]); - destroy_test_context(&context.c); - - fclose(f); + run_shader_tests(argc, argv, &d3d12_runner_ops); } -- 2.34.1

3 8

Re: [Mingw-w64-public] [PATCH] wtypes.h: replace #include <...> with #include "..." for rpc
by LIU Hao 17 Jan '22

17 Jan '22

在 1/13/22 10:07 PM, Jonathan Marler 写道: > Been 3 months since my last email, what's going on with this? > > On Tue, Oct 19, 2021 at 11:03 PM Jonathan Marler <johnnymarler(a)gmail.com> > wrote: > >> Jacek were you able to forward this discussion to Wine? If so do you have >> a link to that discussion? Thanks. >> >> This patch applies to a file that is directly copied from wine; any changes will be overwritten. Thus it will not be accepted. I'm adding wine as CC now. The original thread is located at https://sourceforge.net/p/mingw-w64/mailman/message/37341200/. -- Best regards, LIU Hao

2 1

[PATCH vkd3d] vkd3d-shader/spirv: Enable descriptor indexing if runtime arrays are used.
by Conor McCarthy 17 Jan '22

17 Jan '22

SpvCapabilityRuntimeDescriptorArrayEXT requires descriptor indexing and a validation error will result if it is not enabled. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa3ca67e..1ffce6a1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1833,7 +1833,8 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_extension(&stream, "SPV_KHR_shader_draw_parameters"); if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityDemoteToHelperInvocationEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_demote_to_helper_invocation"); - if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformBufferArrayDynamicIndexing) + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityRuntimeDescriptorArrayEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformBufferArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) -- 2.34.1

2 1

[PATCH vkd3d v2] vkd3d: Implement ID3D12CommandQueue_GetClockCalibration().
by Conor McCarthy 17 Jan '22

17 Jan '22

Extends vkd3d_instance_create_info with struct vkd3d_host_time_domain_info to allow host ticks per second to be changed from the default 10000000. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Do not use a Vk MAX_ENUM value, rearrange a conditional to avoid indentation, use a loop to select host time domain, and introduce an optional instance parameter for host ticks per second. --- include/vkd3d.h | 12 +++++++ libs/vkd3d/command.c | 59 +++++++++++++++++++++++++++++-- libs/vkd3d/device.c | 71 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 4 +++ libs/vkd3d/vulkan_procs.h | 6 ++++ tests/d3d12.c | 4 --- 6 files changed, 150 insertions(+), 6 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 61ccf6c3..a2c70116 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -48,6 +48,9 @@ enum vkd3d_structure_type VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + /* 1.3 */ + VKD3D_STRUCTURE_TYPE_HOST_TIME_DOMAIN_INFO, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; @@ -109,6 +112,15 @@ struct vkd3d_application_info enum vkd3d_api_version api_version; }; +/* Extends vkd3d_instance_create_info. Available since 1.3. */ +struct vkd3d_host_time_domain_info +{ + enum vkd3d_structure_type type; + const void *next; + + uint64_t ticks_per_second; +}; + struct vkd3d_device_create_info { enum vkd3d_structure_type type; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3e252aee..353a61cd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6238,13 +6238,68 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D1 return S_OK; } +#define NANOSECONDS_IN_A_SECOND 1000000000 + static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetClockCalibration(ID3D12CommandQueue *iface, UINT64 *gpu_timestamp, UINT64 *cpu_timestamp) { - FIXME("iface %p, gpu_timestamp %p, cpu_timestamp %p stub!\n", + struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); + struct d3d12_device *device = command_queue->device; + const struct vkd3d_vk_device_procs *vk_procs; + VkCalibratedTimestampInfoEXT infos[2]; + uint64_t timestamps[2]; + uint64_t deviations[2]; + VkResult vr; + + TRACE("iface %p, gpu_timestamp %p, cpu_timestamp %p.\n", iface, gpu_timestamp, cpu_timestamp); - return E_NOTIMPL; + if (!command_queue->vkd3d_queue->timestamp_bits) + { + WARN("Timestamp queries not supported.\n"); + return E_FAIL; + } + + if (!gpu_timestamp || !cpu_timestamp) + return E_INVALIDARG; + + if (!device->vk_info.EXT_calibrated_timestamps || device->vk_host_time_domain == -1) + { + WARN(!device->vk_info.EXT_calibrated_timestamps + ? "VK_EXT_calibrated_timestamps was not found. Setting timestamps to zero.\n" + : "Device and/or host time domain is not available. Setting timestamps to zero.\n"); + *gpu_timestamp = 0; + *cpu_timestamp = 0; + return S_OK; + } + + vk_procs = &device->vk_procs; + + infos[0].sType = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT; + infos[0].pNext = NULL; + infos[0].timeDomain = VK_TIME_DOMAIN_DEVICE_EXT; + infos[1].sType = VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT; + infos[1].pNext = NULL; + infos[1].timeDomain = device->vk_host_time_domain; + + if ((vr = VK_CALL(vkGetCalibratedTimestampsEXT(command_queue->device->vk_device, + ARRAY_SIZE(infos), infos, timestamps, deviations))) < 0) + { + WARN("Failed to get calibrated timestamps, vr %d.\n", vr); + return E_FAIL; + } + + if (infos[1].timeDomain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT + || infos[1].timeDomain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT) + { + /* Convert monotonic clock to match Wine's RtlQueryPerformanceFrequency(). */ + timestamps[1] /= NANOSECONDS_IN_A_SECOND / device->vkd3d_instance->host_ticks_per_second; + } + + *gpu_timestamp = timestamps[0]; + *cpu_timestamp = timestamps[1]; + + return S_OK; } static D3D12_COMMAND_QUEUE_DESC * STDMETHODCALLTYPE d3d12_command_queue_GetDesc(ID3D12CommandQueue *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 661ca1d9..4af26074 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -130,6 +130,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), /* EXT extensions */ + VK_EXTENSION(EXT_CALIBRATED_TIMESTAMPS, EXT_calibrated_timestamps), VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), @@ -447,12 +448,16 @@ static uint64_t vkd3d_init_config_flags(void) return config_flags; } +/* TICKSPERSEC from Wine */ +#define VKD3D_DEFAULT_HOST_TICKS_PER_SECOND 10000000 + static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; const struct vkd3d_optional_instance_extensions_info *optional_extensions; const struct vkd3d_application_info *vkd3d_application_info; + const struct vkd3d_host_time_domain_info *time_domain_info; bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; @@ -578,6 +583,11 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return hr; } + if ((time_domain_info = vkd3d_find_struct(create_info->next, HOST_TIME_DOMAIN_INFO))) + instance->host_ticks_per_second = time_domain_info->ticks_per_second; + else + instance->host_ticks_per_second = VKD3D_DEFAULT_HOST_TICKS_PER_SECOND; + instance->vk_instance = vk_instance; TRACE("Created Vulkan instance %p.\n", vk_instance); @@ -2349,6 +2359,66 @@ static void vkd3d_gpu_descriptor_allocator_cleanup(struct vkd3d_gpu_descriptor_a pthread_mutex_destroy(&allocator->mutex); } +static bool have_vk_time_domain(VkTimeDomainEXT *domains, unsigned int count, VkTimeDomainEXT domain) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + if (domains[i] == domain) + return true; + + return false; +} + +static void vkd3d_time_domains_init(struct d3d12_device *device) +{ + static const VkTimeDomainEXT host_time_domains[] = + { + /* In order of preference */ + VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT, + VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT, + VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT, + + }; + const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkTimeDomainEXT domains[8]; + unsigned int i; + uint32_t count; + VkResult vr; + + device->vk_host_time_domain = -1; + + if (!device->vk_info.EXT_calibrated_timestamps) + return; + + count = ARRAY_SIZE(domains); + if ((vr = VK_CALL(vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(device->vk_physical_device, + &count, domains))) != VK_SUCCESS && vr != VK_INCOMPLETE) + { + WARN("Failed to get calibrated time domains, vr %d.\n", vr); + return; + } + + if (vr == VK_INCOMPLETE) + FIXME("Calibrated time domain list is incomplete.\n"); + + if (!have_vk_time_domain(domains, count, VK_TIME_DOMAIN_DEVICE_EXT)) + { + WARN("Device time domain not found. Calibrated timestamps will not be available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(host_time_domains); ++i) + { + if (!have_vk_time_domain(domains, count, host_time_domains[i])) + continue; + device->vk_host_time_domain = host_time_domains[i]; + break; + } + if (device->vk_host_time_domain == -1) + WARN("Found no acceptable host time domain. Calibrated timestamps will not be available.\n"); +} + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device(ID3D12Device *iface) { @@ -3910,6 +3980,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_render_pass_cache_init(&device->render_pass_cache); vkd3d_gpu_descriptor_allocator_init(&device->gpu_descriptor_allocator); vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); + vkd3d_time_domains_init(device); for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) pthread_mutex_init(&device->desc_mutex[i], NULL); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 047f4a29..3f5ea21c 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -108,6 +108,7 @@ struct vkd3d_vulkan_info bool KHR_push_descriptor; bool KHR_sampler_mirror_clamp_to_edge; /* EXT device extensions */ + bool EXT_calibrated_timestamps; bool EXT_conditional_rendering; bool EXT_debug_marker; bool EXT_depth_clip_enable; @@ -159,6 +160,8 @@ struct vkd3d_instance VkDebugReportCallbackEXT vk_debug_callback; + uint64_t host_ticks_per_second; + LONG refcount; }; @@ -1195,6 +1198,7 @@ struct d3d12_device struct vkd3d_queue *copy_queue; uint32_t queue_family_indices[VKD3D_MAX_QUEUE_FAMILY_COUNT]; unsigned int queue_family_count; + VkTimeDomainEXT vk_host_time_domain; struct vkd3d_instance *vkd3d_instance; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index ec29eb45..60556735 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -55,6 +55,9 @@ VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2KHR) VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT) +/* VK_EXT_calibrated_timestamps */ +VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceCalibrateableTimeDomainsEXT) + /* Device functions (obtained by vkGetDeviceProcAddr). */ VK_DEVICE_PFN(vkDestroyDevice) /* Load vkDestroyDevice() first. */ VK_DEVICE_PFN(vkAllocateCommandBuffers) @@ -192,6 +195,9 @@ VK_DEVICE_EXT_PFN(vkGetDescriptorSetLayoutSupportKHR) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_calibrated_timestamps */ +VK_DEVICE_EXT_PFN(vkGetCalibratedTimestampsEXT) + /* VK_EXT_conditional_rendering */ VK_DEVICE_EXT_PFN(vkCmdBeginConditionalRenderingEXT) VK_DEVICE_EXT_PFN(vkCmdEndConditionalRenderingEXT) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9d4fb7d4..a4488017 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36023,19 +36023,15 @@ static void test_clock_calibration(void) return; hr = ID3D12CommandQueue_GetClockCalibration(context.queue, &gpu_times[0], &cpu_times[0]); - todo ok(hr == S_OK, "Failed to retrieve calibrated timestamps, hr %#x.\n", hr); vkd3d_sleep(100); hr = ID3D12CommandQueue_GetClockCalibration(context.queue, &gpu_times[1], &cpu_times[1]); - todo ok(hr == S_OK, "Failed to retrieve calibrated timestamps, hr %#x.\n", hr); - todo ok(gpu_times[1] > gpu_times[0], "Inconsistent GPU timestamps %"PRIu64" and %"PRIu64".\n", gpu_times[0], gpu_times[1]); - todo ok(cpu_times[1] > cpu_times[0], "Inconsistent CPU timestamps %"PRIu64" and %"PRIu64".\n", cpu_times[0], cpu_times[1]); -- 2.34.1

2 2

[PATCH] dxgi: Allow sampling of Vulkan swapchain images for D3D12.
by Conor McCarthy 17 Jan '22

17 Jan '22

Psychonauts 2 creates an SRV on a swapchain image and lack of VK_IMAGE_USAGE_SAMPLED_BIT results in failure to create a Vulkan descriptor. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8d5f2f537..015a32498 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1303,7 +1303,8 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.tiling = VK_IMAGE_TILING_OPTIMAL; image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT - | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT + | VK_IMAGE_USAGE_SAMPLED_BIT; image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; image_info.queueFamilyIndexCount = 0; image_info.pQueueFamilyIndices = NULL; @@ -1792,8 +1793,11 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT; usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_SAMPLED_BIT; if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) WARN("Transfer not supported for swapchain images.\n"); + if (!(usage & VK_IMAGE_USAGE_SAMPLED_BIT)) + WARN("Sampling not supported for swapchain images.\n"); vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; vk_swapchain_desc.pNext = NULL; -- 2.34.1

3 2

[PATCH v2] msi: Don't call RegCloseKey with uninitialized value.
by Hans Leidekker 17 Jan '22

17 Jan '22

From: Eric Pouech <eric.pouech(a)gmail.com> v2: Initialize variable when declared. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a47c2b068b..8ee9420af55 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6973,7 +6973,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) LPCWSTR name, value, component; WCHAR *p, *q, *deformatted = NULL, *new_value = NULL; DWORD flags, type, size, len, len_value = 0, len_new_value; - HKEY env; + HKEY env = NULL; MSICOMPONENT *comp; MSIRECORD *uirow; int action = 0; -- 2.30.2

1 0

[PATCH 1/4] ddraw/tests: Drop ddraw1 test workarounds for Windows <= 2000
by Alex Henrie 17 Jan '22

17 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 40 ++++++--------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index efbecf04c2d..9d3bd542b70 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -941,15 +941,6 @@ static void test_coop_level_create_device_window(void) device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); ok(!device_window, "Unexpected device window found.\n"); - /* Windows versions before 98 / NT5 don't support DDSCL_CREATEDEVICEWINDOW. */ - if (broken(hr == DDERR_INVALIDPARAMS)) - { - win_skip("DDSCL_CREATEDEVICEWINDOW not supported, skipping test.\n"); - IDirectDraw_Release(ddraw); - DestroyWindow(focus_window); - return; - } - hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); @@ -1179,7 +1170,7 @@ static void test_clipper_blt(void) } hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); - ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); @@ -3152,13 +3143,6 @@ static void test_coop_level_mode_set(void) hr = IDirectDrawSurface_Restore(primary); ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); - if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) - { - win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); - IDirectDrawSurface_Release(primary); - IDirectDraw_Release(ddraw); - goto done; - } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface_Restore(primary); ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); @@ -3538,7 +3522,6 @@ static void test_coop_level_mode_set(void) ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); -done: expect_messages = NULL; DestroyWindow(window); UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); @@ -3580,13 +3563,6 @@ static void test_coop_level_mode_set_multi(void) /* With just a single ddraw object, the display mode is restored on * release. */ hr = set_display_mode(ddraw1, 800, 600); - if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) - { - win_skip("Broken SetDisplayMode(), skipping test.\n"); - IDirectDraw_Release(ddraw1); - DestroyWindow(window); - return; - } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); w = GetSystemMetrics(SM_CXSCREEN); ok(w == 800, "Got unexpected screen width %u.\n", w); @@ -3991,13 +3967,10 @@ static void test_initialize(void) IDirectDraw_Release(ddraw); CoUninitialize(); - if (0) /* This crashes on the W2KPROSP4 testbot. */ - { - CoInitialize(NULL); - hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirect3D, (void **)&d3d); - ok(hr == E_NOINTERFACE, "CoCreateInstance returned hr %#x, expected E_NOINTERFACE.\n", hr); - CoUninitialize(); - } + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirect3D, (void **)&d3d); + todo_wine ok(hr == E_NOINTERFACE, "CoCreateInstance returned hr %#x, expected E_NOINTERFACE.\n", hr); + CoUninitialize(); } static void test_coop_level_surf_create(void) @@ -7691,8 +7664,7 @@ static void test_palette_alpha(void) UINT retval; hr = IDirectDrawSurface_GetDC(surface, &dc); - ok(SUCCEEDED(hr) || broken(hr == DDERR_CANTCREATEDC) /* Win2k testbot */, - "Failed to get DC, hr %#x, %s surface.\n", hr, test_data[i].name); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x, %s surface.\n", hr, test_data[i].name); if (SUCCEEDED(hr)) { retval = GetDIBColorTable(dc, 1, 1, &rgbquad); -- 2.34.1

2 6

[PATCH vkd3d 1/2] vkd3d/tests: Enable on vkd3d the tests for ID3D12CommandQueue::Wait().
by Conor McCarthy 17 Jan '22

17 Jan '22

The Wait() implementation was added some time ago and these tests succeed. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3b0c4242..c1956fa3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33268,12 +33268,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); - if (!vkd3d_test_platform_is_windows()) - { - skip("Wait() is not implemented yet.\n"); /* FIXME */ - goto skip_tests; - } - /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -33349,7 +33343,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); -skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7); -- 2.34.1

5 5

[PATCH] programs/msi: don't call RegCloseKey with uninitialized value
by Eric Pouech 17 Jan '22

17 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msi/action.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a47c2b068b..22f56a0c63f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7012,6 +7012,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) if (!deformatted) { res = ERROR_OUTOFMEMORY; + env = NULL; goto done; }

1 0

[PATCH 1/2] include/winternl.h: fix prototype definition
by Eric Pouech 15 Jan '22

15 Jan '22

https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/nf-ntif… funnily enough, implementation is correct Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/winternl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 0e23fdd97bf..3c075497070 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4374,7 +4374,7 @@ NTSYSAPI NTSTATUS WINAPI RtlLookupAtomInAtomTable(RTL_ATOM_TABLE,const WCHAR*,R NTSYSAPI NTSTATUS WINAPI RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); NTSYSAPI void WINAPI RtlMapGenericMask(PACCESS_MASK,const GENERIC_MAPPING*); NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); -NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,UINT); +NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING); NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); NTSYSAPI NTSTATUS WINAPI RtlNormalizeString(ULONG,const WCHAR*,INT,WCHAR*,INT*);

2 2

[PATCH] advapi32: Fix some spec file entries (try 3)
by André Zwing 15 Jan '22

15 Jan '22

(including make_specfiles changes now) Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/advapi32/advapi32.spec | 22 +++++++++---------- .../api-ms-win-core-registry-l2-1-0.spec | 8 +++---- .../api-ms-win-core-registry-l2-2-0.spec | 8 +++---- .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 2 +- .../api-ms-win-security-lsalookup-l2-1-0.spec | 4 ++-- .../api-ms-win-security-lsalookup-l2-1-1.spec | 4 ++-- .../api-ms-win-security-sddl-l1-1-0.spec | 2 +- .../api-ms-win-service-winsvc-l1-1-0.spec | 2 +- .../api-ms-win-service-winsvc-l1-2-0.spec | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0391643aa6a..cefc8dc2899 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -91,7 +91,7 @@ # @ stub CancelOverlappedAccess @ stdcall -import ChangeServiceConfig2A(long long ptr) @ stdcall -import ChangeServiceConfig2W(long long ptr) -@ stdcall -import ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall -import ChangeServiceConfigA(long long long long str str ptr str str str str) @ stdcall -import ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) # @ stub CheckForHiberboot @ stdcall -import CheckTokenMembership(long ptr ptr) @@ -129,8 +129,8 @@ # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) @ stdcall -import ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidA(ptr ptr) -@ stdcall -import ConvertStringSidToSidW(ptr ptr) +@ stdcall ConvertStringSidToSidA(str ptr) +@ stdcall -import ConvertStringSidToSidW(wstr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @@ -429,16 +429,16 @@ @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) -@ stdcall LookupPrivilegeValueA(ptr ptr ptr) -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) +@ stdcall LookupPrivilegeValueA(str str ptr) +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) @ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @@ -681,17 +681,17 @@ @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) @ stdcall -import RegRestoreKeyW(long wstr long) -@ stdcall RegSaveKeyA(long ptr ptr) +@ stdcall RegSaveKeyA(long str ptr) @ stdcall -import RegSaveKeyExA(long str ptr long) @ stdcall -import RegSaveKeyExW(long wstr ptr long) -@ stdcall RegSaveKeyW(long ptr ptr) +@ stdcall RegSaveKeyW(long wstr ptr) @ stdcall -import RegSetKeySecurity(long long ptr) @ stdcall -import RegSetKeyValueA(long str str long ptr long) @ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long) -@ stdcall RegSetValueA(long str long ptr long) +@ stdcall RegSetValueA(long str long str long) @ stdcall -import RegSetValueExA(long str long long ptr long) @ stdcall -import RegSetValueExW(long wstr long long ptr long) -@ stdcall RegSetValueW(long wstr long ptr long) +@ stdcall RegSetValueW(long wstr long wstr long) @ stdcall -import RegUnLoadKeyA(long str) @ stdcall -import RegUnLoadKeyW(long wstr) @ stdcall RegisterEventSourceA(str str) diff --git a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec index 6d63dd997ff..17cd6e79311 100644 --- a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec +++ b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec @@ -25,9 +25,9 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW @ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec index 6d9ae1f4048..7710da384c5 100644 --- a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -23,7 +23,7 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec index 96e1a042eed..b0dabec0f34 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec @@ -1,7 +1,7 @@ @ stdcall CloseServiceHandle(long) advapi32.CloseServiceHandle @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW @ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW @ stdcall CredEnumerateW(wstr long ptr ptr) advapi32.CredEnumerateW @ stdcall CredFree(ptr) advapi32.CredFree diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec index 25b293939df..c1c3cd8e2aa 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -1,6 +1,6 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec index 1a0ed04ace4..c06b1435333 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec @@ -1,7 +1,7 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains @ stub LsaManageSidNameMapping diff --git a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec index 1ac8704c7c3..f2b12d4c629 100644 --- a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec +++ b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec @@ -1,4 +1,4 @@ @ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) advapi32.ConvertSecurityDescriptorToStringSecurityDescriptorW @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW diff --git a/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec b/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec index d902c9d17b1..e68ac850bd4 100644 --- a/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec +++ b/dlls/api-ms-win-service-winsvc-l1-1-0/api-ms-win-service-winsvc-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall ChangeServiceConfig2A(long long ptr) advapi32.ChangeServiceConfig2A -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) advapi32.ChangeServiceConfigA +@ stdcall ChangeServiceConfigA(long long long long str str ptr str str str str) advapi32.ChangeServiceConfigA @ stdcall ControlService(long long ptr) advapi32.ControlService @ stub ControlServiceExA @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) advapi32.CreateServiceA diff --git a/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec b/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec index aa914b6cf9e..295194f38f3 100644 --- a/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec +++ b/dlls/api-ms-win-service-winsvc-l1-2-0/api-ms-win-service-winsvc-l1-2-0.spec @@ -1,5 +1,5 @@ @ stdcall ChangeServiceConfig2A(long long ptr) advapi32.ChangeServiceConfig2A -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) advapi32.ChangeServiceConfigA +@ stdcall ChangeServiceConfigA(long long long long str str ptr str str str str) advapi32.ChangeServiceConfigA @ stdcall ControlService(long long ptr) advapi32.ControlService @ stub ControlServiceExA @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) advapi32.CreateServiceA -- 2.25.1

1 0

[PATCH] advapi32: Fix some spec file entries (try 2)
by André Zwing 15 Jan '22

15 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/advapi32/advapi32.spec | 22 +++++++++---------- .../api-ms-win-core-registry-l2-1-0.spec | 8 +++---- .../api-ms-win-core-registry-l2-2-0.spec | 8 +++---- .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 2 +- .../api-ms-win-security-lsalookup-l2-1-0.spec | 4 ++-- .../api-ms-win-security-lsalookup-l2-1-1.spec | 4 ++-- .../api-ms-win-security-sddl-l1-1-0.spec | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0391643aa6a..cefc8dc2899 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -91,7 +91,7 @@ # @ stub CancelOverlappedAccess @ stdcall -import ChangeServiceConfig2A(long long ptr) @ stdcall -import ChangeServiceConfig2W(long long ptr) -@ stdcall -import ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall -import ChangeServiceConfigA(long long long long str str ptr str str str str) @ stdcall -import ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) # @ stub CheckForHiberboot @ stdcall -import CheckTokenMembership(long ptr ptr) @@ -129,8 +129,8 @@ # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) @ stdcall -import ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidA(ptr ptr) -@ stdcall -import ConvertStringSidToSidW(ptr ptr) +@ stdcall ConvertStringSidToSidA(str ptr) +@ stdcall -import ConvertStringSidToSidW(wstr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @@ -429,16 +429,16 @@ @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) -@ stdcall LookupPrivilegeValueA(ptr ptr ptr) -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) +@ stdcall LookupPrivilegeValueA(str str ptr) +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) @ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @@ -681,17 +681,17 @@ @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) @ stdcall -import RegRestoreKeyW(long wstr long) -@ stdcall RegSaveKeyA(long ptr ptr) +@ stdcall RegSaveKeyA(long str ptr) @ stdcall -import RegSaveKeyExA(long str ptr long) @ stdcall -import RegSaveKeyExW(long wstr ptr long) -@ stdcall RegSaveKeyW(long ptr ptr) +@ stdcall RegSaveKeyW(long wstr ptr) @ stdcall -import RegSetKeySecurity(long long ptr) @ stdcall -import RegSetKeyValueA(long str str long ptr long) @ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long) -@ stdcall RegSetValueA(long str long ptr long) +@ stdcall RegSetValueA(long str long str long) @ stdcall -import RegSetValueExA(long str long long ptr long) @ stdcall -import RegSetValueExW(long wstr long long ptr long) -@ stdcall RegSetValueW(long wstr long ptr long) +@ stdcall RegSetValueW(long wstr long wstr long) @ stdcall -import RegUnLoadKeyA(long str) @ stdcall -import RegUnLoadKeyW(long wstr) @ stdcall RegisterEventSourceA(str str) diff --git a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec index 6d63dd997ff..17cd6e79311 100644 --- a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec +++ b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec @@ -25,9 +25,9 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW @ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec index 6d9ae1f4048..7710da384c5 100644 --- a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -23,7 +23,7 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec index 96e1a042eed..b0dabec0f34 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec @@ -1,7 +1,7 @@ @ stdcall CloseServiceHandle(long) advapi32.CloseServiceHandle @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW @ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW @ stdcall CredEnumerateW(wstr long ptr ptr) advapi32.CredEnumerateW @ stdcall CredFree(ptr) advapi32.CredFree diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec index 25b293939df..c1c3cd8e2aa 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -1,6 +1,6 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec index 1a0ed04ace4..c06b1435333 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec @@ -1,7 +1,7 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains @ stub LsaManageSidNameMapping diff --git a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec index 1ac8704c7c3..f2b12d4c629 100644 --- a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec +++ b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec @@ -1,4 +1,4 @@ @ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) advapi32.ConvertSecurityDescriptorToStringSecurityDescriptorW @ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW -@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall ConvertStringSidToSidW(wstr ptr) advapi32.ConvertStringSidToSidW -- 2.25.1

1 0

[PATCH] shlwapi: Fix some spec file entries
by André Zwing 15 Jan '22

15 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 68d0e7f8122..6926fd13835 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -257,7 +257,7 @@ 257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) +260 stdcall -noname SHQueueUserWorkItem(long long long long long str long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) @@ -288,8 +288,8 @@ 288 stub -noname IUnknown_CPContainerInvokeIndirect 289 stdcall -noname PlaySoundWrapW(wstr long long) 290 stub -noname SHMirrorIcon -291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) -292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) +291 stdcall -noname SHMessageBoxCheckExA(ptr ptr str ptr ptr long str) +292 stdcall -noname SHMessageBoxCheckExW(ptr ptr wstr ptr ptr long wstr) 293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr wstr wstr wstr) @@ -488,7 +488,7 @@ 488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW -491 stdcall -noname SHGetShellKey(long long long) +491 stdcall -noname SHGetShellKey(long wstr long) 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr @@ -663,8 +663,8 @@ @ stdcall -import PathRenameExtensionW(wstr wstr) @ stdcall -import PathSearchAndQualifyA(str ptr long) @ stdcall -import PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) +@ stdcall PathSetDlgItemPathA (long long str) +@ stdcall PathSetDlgItemPathW (long long wstr) @ stdcall -import PathSkipRootA(str) @ stdcall -import PathSkipRootW(wstr) @ stdcall -import PathStripPathA(str) -- 2.25.1

1 0

[PATCH] ntdll: Fix some spec file entries
by André Zwing 15 Jan '22

15 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/ntdll/ntdll.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd8e1f5efe6..0a710559efe 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -52,7 +52,7 @@ @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwEventWrite(int64 ptr long ptr) -@ stdcall EtwEventWriteString(int64 long int64 ptr) +@ stdcall EtwEventWriteString(int64 long int64 wstr) @ stdcall EtwEventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall EtwGetTraceEnableFlags(int64) @ stdcall EtwGetTraceEnableLevel(int64) @@ -594,7 +594,7 @@ @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange -@ stdcall RtlDeleteRegistryValue(long ptr ptr) +@ stdcall RtlDeleteRegistryValue(long wstr wstr) @ stdcall RtlDeleteResource(ptr) @ stdcall RtlDeleteSecurityObject(ptr) @ stdcall RtlDeleteTimer(ptr ptr ptr) @@ -913,8 +913,8 @@ @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet -@ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) -@ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues +@ stdcall RtlQueryRegistryValues(long wstr ptr ptr ptr) +@ stdcall RtlQueryRegistryValuesEx(long wstr ptr ptr ptr) RtlQueryRegistryValues @ stub RtlQuerySecurityObject @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) @@ -1089,7 +1089,7 @@ @ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) @ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream -@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) +@ stdcall RtlWriteRegistryValue(long wstr wstr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr) -- 2.25.1

1 0

[PATCH] advapi32: Fix some spec file entries
by André Zwing 15 Jan '22

15 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/advapi32/advapi32.spec | 18 +++++++++--------- .../api-ms-win-core-registry-l2-1-0.spec | 8 ++++---- .../api-ms-win-core-registry-l2-2-0.spec | 8 ++++---- .../api-ms-win-security-lsalookup-l2-1-0.spec | 4 ++-- .../api-ms-win-security-lsalookup-l2-1-1.spec | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0391643aa6a..e9db778647f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -129,7 +129,7 @@ # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) @ stdcall -import ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidA(ptr ptr) +@ stdcall ConvertStringSidToSidA(str ptr) @ stdcall -import ConvertStringSidToSidW(ptr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) @@ -429,16 +429,16 @@ @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) -@ stdcall LookupPrivilegeValueA(ptr ptr ptr) -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) +@ stdcall LookupPrivilegeValueA(str str ptr) +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) @ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @@ -681,17 +681,17 @@ @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) @ stdcall -import RegRestoreKeyW(long wstr long) -@ stdcall RegSaveKeyA(long ptr ptr) +@ stdcall RegSaveKeyA(long str ptr) @ stdcall -import RegSaveKeyExA(long str ptr long) @ stdcall -import RegSaveKeyExW(long wstr ptr long) -@ stdcall RegSaveKeyW(long ptr ptr) +@ stdcall RegSaveKeyW(long wstr ptr) @ stdcall -import RegSetKeySecurity(long long ptr) @ stdcall -import RegSetKeyValueA(long str str long ptr long) @ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long) -@ stdcall RegSetValueA(long str long ptr long) +@ stdcall RegSetValueA(long str long str long) @ stdcall -import RegSetValueExA(long str long long ptr long) @ stdcall -import RegSetValueExW(long wstr long long ptr long) -@ stdcall RegSetValueW(long wstr long ptr long) +@ stdcall RegSetValueW(long wstr long wstr long) @ stdcall -import RegUnLoadKeyA(long str) @ stdcall -import RegUnLoadKeyW(long wstr) @ stdcall RegisterEventSourceA(str str) diff --git a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec index 6d63dd997ff..17cd6e79311 100644 --- a/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec +++ b/dlls/api-ms-win-core-registry-l2-1-0/api-ms-win-core-registry-l2-1-0.spec @@ -25,9 +25,9 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW @ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec index 6d9ae1f4048..7710da384c5 100644 --- a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -23,7 +23,7 @@ @ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW @ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA @ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW -@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA -@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW -@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA -@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW +@ stdcall RegSaveKeyA(long str ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long wstr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long str long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long wstr long) advapi32.RegSetValueW diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec index 25b293939df..c1c3cd8e2aa 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -1,6 +1,6 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec index 1a0ed04ace4..c06b1435333 100644 --- a/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l2-1-1/api-ms-win-security-lsalookup-l2-1-1.spec @@ -1,7 +1,7 @@ @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) advapi32.LookupPrivilegeValueW @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains @ stub LsaManageSidNameMapping -- 2.25.1

1 0

Wine staging 7.0-rc6 release
by Alistair Leslie-Hughes 15 Jan '22

15 Jan '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.0-rc6 (555 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * nvcuda-CUDA_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH vkd3d 1/5] tests: Separate the compile_shader function from the shader_test parser.
by Zebediah Figura 14 Jan '22

14 Jan '22

In essence, the goal is to separate the d3d12 backend. Just separate the compiler first, though, to make the diff easier to read. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Members of this patch series conflict with other in-flight patches... Makefile.am | 42 +- include/private/vkd3d_test.h | 19 +- ...{shader_runner_d3d12.c => shader_runner.c} | 31 +- tests/shader_runner.h | 29 + tests/shader_runner_d3d12.c | 847 +----------------- 5 files changed, 98 insertions(+), 870 deletions(-) copy tests/{shader_runner_d3d12.c => shader_runner.c} (97%) create mode 100644 tests/shader_runner.h diff --git a/Makefile.am b/Makefile.am index 20fee06d0..e6d20e700 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,9 +50,6 @@ vkd3d_cross_tests = \ tests/d3d12_invalid_usage \ tests/hlsl_d3d12 -vkd3d_shader_runners = \ - tests/shader_runner_d3d12 - vkd3d_shader_tests = \ tests/abs.shader_test \ tests/cast-to-float.shader_test \ @@ -113,7 +110,9 @@ vkd3d_shader_tests = \ vkd3d_test_headers = \ tests/d3d12_crosstest.h \ - tests/d3d12_test_utils.h + tests/d3d12_test_utils.h \ + tests/shader_runner.h \ + tests/utils.h vkd3d_demos = \ demos/vkd3d-gears \ @@ -273,15 +272,18 @@ AM_DEFAULT_SOURCE_EXT = .c TEST_EXTENSIONS = .shader_test if BUILD_TESTS -check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_runners) +check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) tests/shader_runner TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_SOURCES = \ + tests/shader_runner.c \ + tests/shader_runner_d3d12.c tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la -SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 +SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ @@ -388,14 +390,17 @@ CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/i CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) +shader_runner_cross_sources = \ + $(srcdir)/tests/shader_runner.c \ + $(srcdir)/tests/shader_runner_d3d12.c + if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) \ - $(vkd3d_shader_runners:=.cross32.exe) -CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe CLEANFILES += $(CROSS32_FILES) crosstest32: $(CROSS32_FILES) @@ -411,6 +416,12 @@ $(CROSS32_EXEFILES): %.cross32.exe: %.c $(CROSS32_IMPLIBS) $(widl_headers) $(AM_V_CCLD)depbase=`echo $@ | $(SED) 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ $(am__mv) $$depbase.Tpo $$depbase.Po + +tests/shader_runner.cross32.exe: $(shader_runner_cross_sources) $(CROSS32_IMPLIBS) $(widl_headers) + $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ + $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $(shader_runner_cross_sources) $(CROSS32_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ + $(am__mv) $$depbase.Tpo $$depbase.Po + else crosstest32: endif @@ -420,9 +431,8 @@ CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) \ - $(vkd3d_shader_runners:=.cross64.exe) -CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) + $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe CLEANFILES += $(CROSS64_FILES) crosstest64: $(CROSS64_FILES) @@ -438,6 +448,12 @@ $(CROSS64_EXEFILES): %.cross64.exe: %.c $(CROSS64_IMPLIBS) $(widl_headers) $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ $(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS64_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ $(am__mv) $$depbase.Tpo $$depbase.Po + +tests/shader_runner.cross64.exe: $(shader_runner_cross_sources) $(CROSS64_IMPLIBS) $(widl_headers) + $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ + $(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $(shader_runner_cross_sources) $(CROSS64_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \ + $(am__mv) $$depbase.Tpo $$depbase.Po + else crosstest64: endif diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 6b8763dde..0cc7fe4f3 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -28,16 +28,15 @@ #include <stdlib.h> #include <string.h> -static void vkd3d_test_main(int argc, char **argv); -static const char *vkd3d_test_name; -static const char *vkd3d_test_platform = "other"; +extern const char *vkd3d_test_name; +extern const char *vkd3d_test_platform; static void vkd3d_test_start_todo(bool is_todo); static int vkd3d_test_loop_todo(void); static void vkd3d_test_end_todo(void); #define START_TEST(name) \ - static const char *vkd3d_test_name = #name; \ + const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) /* @@ -100,7 +99,7 @@ static void vkd3d_test_end_todo(void); #define todo todo_if(true) -static struct +struct vkd3d_test_state { LONG success_count; LONG failure_count; @@ -120,7 +119,8 @@ static struct const char *test_name_filter; char context[1024]; -} vkd3d_test_state; +}; +extern struct vkd3d_test_state vkd3d_test_state; static bool vkd3d_test_platform_is_windows(void) @@ -253,6 +253,12 @@ vkd3d_test_debug(const char *fmt, ...) printf("%s\n", buffer); } +#ifndef VKD3D_TEST_NO_DEFS +const char *vkd3d_test_platform = "other"; +struct vkd3d_test_state vkd3d_test_state; + +static void vkd3d_test_main(int argc, char **argv); + int main(int argc, char **argv) { const char *test_filter = getenv("VKD3D_TEST_FILTER"); @@ -339,6 +345,7 @@ int wmain(int argc, WCHAR **wargv) return ret; } #endif /* _WIN32 */ +#endif /* VKD3D_TEST_NO_DEFS */ typedef void (*vkd3d_test_pfn)(void); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner.c similarity index 97% copy from tests/shader_runner_d3d12.c copy to tests/shader_runner.c index 47f419b96..df4344881 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner.c @@ -1,5 +1,5 @@ /* - * Copyright 2020 Zebediah Figura for CodeWeavers + * Copyright 2020-2021 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,6 +43,7 @@ */ #include "d3d12_crosstest.h" +#include "shader_runner.h" #include <errno.h> static void VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2) fatal_error(const char *format, ...) @@ -117,6 +118,8 @@ struct texture struct shader_context { + const struct shader_runner_ops *ops; + struct test_context c; ID3D10Blob *ps_code; @@ -131,22 +134,6 @@ struct shader_context size_t sampler_count; }; -static ID3D10Blob *compile_shader(const char *source, const char *target) -{ - ID3D10Blob *blob = NULL, *errors = NULL; - HRESULT hr; - - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); - ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); - if (errors) - { - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); - } - return blob; -} - static void free_texture(struct texture *texture) { ID3D12DescriptorHeap_Release(texture->heap); @@ -603,7 +590,7 @@ static struct texture *get_texture(struct shader_context *context, unsigned int return NULL; } -START_TEST(shader_runner_d3d12) +void run_shader_tests(int argc, char **argv, const struct shader_runner_ops *ops) { static const struct test_context_desc desc = { @@ -649,6 +636,7 @@ START_TEST(shader_runner_d3d12) } memset(&context, 0, sizeof(context)); + context.ops = ops; init_test_context(&context.c, &desc); for (;;) @@ -668,7 +656,7 @@ START_TEST(shader_runner_d3d12) break; case STATE_SHADER_PIXEL: - if (!(context.ps_code = compile_shader(shader_source, "ps_4_0"))) + if (!(context.ps_code = context.ops->compile_shader(shader_source))) return; shader_source_len = 0; break; @@ -867,3 +855,8 @@ START_TEST(shader_runner_d3d12) fclose(f); } + +START_TEST(shader_runner) +{ + run_shader_tests_d3d12(argc, argv); +} diff --git a/tests/shader_runner.h b/tests/shader_runner.h new file mode 100644 index 000000000..5178c6544 --- /dev/null +++ b/tests/shader_runner.h @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Zebediah Figura 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 + */ + +#include "vkd3d_windows.h" +#include "vkd3d_d3dcommon.h" + +struct shader_runner_ops +{ + ID3D10Blob *(*compile_shader)(const char *source); +}; + +void run_shader_tests(int argc, char **argv, const struct shader_runner_ops *ops); + +void run_shader_tests_d3d12(int argc, char **argv); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 47f419b96..6246c8701 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -1,5 +1,5 @@ /* - * Copyright 2020 Zebediah Figura for CodeWeavers + * Copyright 2020-2021 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,127 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * This application contains code derived from piglit, the license for which - * follows: - * - * Copyright © 2010 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include "d3d12_crosstest.h" -#include <errno.h> - -static void VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2) fatal_error(const char *format, ...) -{ - va_list args; - - va_start(args, format); - vfprintf(stderr, format, args); - va_end(args); - exit(1); -} - -static bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) -{ - size_t new_capacity, max_capacity; - void *new_elements; - - if (element_count <= *capacity) - return true; - - max_capacity = ~(size_t)0 / element_size; - if (max_capacity < element_count) - return false; - - new_capacity = max(*capacity, 4); - while (new_capacity < element_count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - - if (new_capacity < element_count) - new_capacity = element_count; - - if (!(new_elements = realloc(*elements, new_capacity * element_size))) - return false; - - *elements = new_elements; - *capacity = new_capacity; - - return true; -} - -enum texture_data_type -{ - TEXTURE_DATA_FLOAT, - TEXTURE_DATA_SINT, - TEXTURE_DATA_UINT, -}; +#define COBJMACROS +#define CONST_VTABLE +#define VKD3D_TEST_NO_DEFS +#include "vkd3d_windows.h" +#include "vkd3d_d3dcommon.h" +#include "vkd3d_d3dcompiler.h" +#include "vkd3d_test.h" +#include "shader_runner.h" -struct sampler -{ - unsigned int slot; - - D3D12_FILTER filter; - D3D12_TEXTURE_ADDRESS_MODE u_address, v_address, w_address; -}; - -struct texture -{ - unsigned int slot; - - DXGI_FORMAT format; - enum texture_data_type data_type; - unsigned int texel_size; - unsigned int width, height; - uint8_t *data; - size_t data_size, data_capacity; - - D3D12_DESCRIPTOR_RANGE descriptor_range; - ID3D12DescriptorHeap *heap; - ID3D12Resource *resource; - unsigned int root_index; -}; - -struct shader_context -{ - struct test_context c; - - ID3D10Blob *ps_code; - - uint32_t *uniforms; - size_t uniform_count; - - struct texture *textures; - size_t texture_count; - - struct sampler *samplers; - size_t sampler_count; -}; - -static ID3D10Blob *compile_shader(const char *source, const char *target) +static ID3D10Blob *d3d12_runner_compile_shader(const char *source) { ID3D10Blob *blob = NULL, *errors = NULL; HRESULT hr; - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); if (errors) { @@ -147,723 +41,12 @@ static ID3D10Blob *compile_shader(const char *source, const char *target) return blob; } -static void free_texture(struct texture *texture) +static const struct shader_runner_ops d3d12_runner_ops = { - ID3D12DescriptorHeap_Release(texture->heap); - ID3D12Resource_Release(texture->resource); - free(texture->data); - memset(texture, 0, sizeof(*texture)); -} - -enum parse_state -{ - STATE_NONE, - STATE_PREPROC, - STATE_PREPROC_INVALID, - STATE_SAMPLER, - STATE_SHADER_INVALID_PIXEL, - STATE_SHADER_PIXEL, - STATE_TEXTURE, - STATE_TEST, + .compile_shader = d3d12_runner_compile_shader, }; -static bool match_string(const char *line, const char *token, const char **const rest) -{ - size_t len = strlen(token); - - if (strncmp(line, token, len) || !isspace(line[len])) - return false; - if (rest) - { - *rest = line + len; - while (isspace(**rest)) - ++*rest; - } - return true; -} - -static void parse_texture_format(struct texture *texture, const char *line) -{ - static const struct - { - const char *string; - enum texture_data_type data_type; - unsigned int texel_size; - DXGI_FORMAT format; - } - formats[] = - { - {"r32g32b32a32 float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT}, - {"r32g32 uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT}, - {"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT}, - {"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT}, - }; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(formats); ++i) - { - if (match_string(line, formats[i].string, &line)) - { - texture->format = formats[i].format; - texture->data_type = formats[i].data_type; - texture->texel_size = formats[i].texel_size; - return; - } - } - - fatal_error("Unknown format '%s'.\n", line); -} - -static D3D12_TEXTURE_ADDRESS_MODE parse_sampler_address_mode(const char *line, const char **rest) -{ - if (match_string(line, "border", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_BORDER; - if (match_string(line, "clamp", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - if (match_string(line, "mirror_once", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE; - if (match_string(line, "mirror", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_MIRROR; - if (match_string(line, "wrap", rest)) - return D3D12_TEXTURE_ADDRESS_MODE_WRAP; - - fatal_error("Unknown sampler address mode '%s'.\n", line); -} - -static void parse_sampler_directive(struct sampler *sampler, const char *line) -{ - if (match_string(line, "address", &line)) - { - sampler->u_address = parse_sampler_address_mode(line, &line); - sampler->v_address = parse_sampler_address_mode(line, &line); - sampler->w_address = parse_sampler_address_mode(line, &line); - } - else if (match_string(line, "filter", &line)) - { - static const struct - { - const char *string; - D3D12_FILTER filter; - } - filters[] = - { - {"point point point", D3D12_FILTER_MIN_MAG_MIP_POINT}, - {"point point linear", D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR}, - {"point linear point", D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT}, - {"point linear linear", D3D12_FILTER_MIN_POINT_MAG_MIP_LINEAR}, - {"linear point point", D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT}, - {"linear point linear", D3D12_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR}, - {"linear linear point", D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT}, - {"linear linear linear", D3D12_FILTER_MIN_MAG_MIP_LINEAR}, - }; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(filters); ++i) - { - if (match_string(line, filters[i].string, &line)) - { - sampler->filter = filters[i].filter; - return; - } - } - - fatal_error("Unknown sampler filter '%s'.\n", line); - } - else - { - fatal_error("Unknown sampler directive '%s'.\n", line); - } -} - -static void parse_texture_directive(struct texture *texture, const char *line) -{ - int ret; - - if (match_string(line, "format", &line)) - { - parse_texture_format(texture, line); - } - else if (match_string(line, "size", &line)) - { - ret = sscanf(line, "( %u , %u )", &texture->width, &texture->height); - if (ret < 2) - fatal_error("Malformed texture size '%s'.\n", line); - } - else - { - union - { - float f; - int32_t i; - uint32_t u; - } u; - char *rest; - - u.u = 0; - - for (;;) - { - switch (texture->data_type) - { - case TEXTURE_DATA_FLOAT: - u.f = strtof(line, &rest); - break; - - case TEXTURE_DATA_SINT: - u.i = strtol(line, &rest, 10); - break; - - case TEXTURE_DATA_UINT: - u.u = strtoul(line, &rest, 10); - break; - } - - if (rest == line) - break; - - vkd3d_array_reserve((void **)&texture->data, &texture->data_capacity, texture->data_size + sizeof(u), 1); - memcpy(texture->data + texture->data_size, &u, sizeof(u)); - texture->data_size += sizeof(u); - line = rest; - } - } -} - -static void parse_test_directive(struct shader_context *context, const char *line) -{ - if (match_string(line, "draw quad", &line)) - { - D3D12_SHADER_BYTECODE ps - = {ID3D10Blob_GetBufferPointer(context->ps_code), ID3D10Blob_GetBufferSize(context->ps_code)}; - ID3D12GraphicsCommandList *command_list = context->c.list; - D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; - D3D12_ROOT_PARAMETER root_params[3], *root_param; - D3D12_STATIC_SAMPLER_DESC static_samplers[1]; - static const float clear_color[4]; - unsigned int uniform_index; - ID3D12PipelineState *pso; - HRESULT hr; - size_t i; - - root_signature_desc.NumParameters = 0; - root_signature_desc.pParameters = root_params; - root_signature_desc.NumStaticSamplers = 0; - root_signature_desc.pStaticSamplers = static_samplers; - - if (context->uniform_count) - { - uniform_index = root_signature_desc.NumParameters++; - root_param = &root_params[uniform_index]; - root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; - root_param->Constants.ShaderRegister = 0; - root_param->Constants.RegisterSpace = 0; - root_param->Constants.Num32BitValues = context->uniform_count; - root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - } - - for (i = 0; i < context->texture_count; ++i) - { - struct texture *texture = &context->textures[i]; - D3D12_DESCRIPTOR_RANGE *range = &texture->descriptor_range; - D3D12_SUBRESOURCE_DATA resource_data; - - texture->root_index = root_signature_desc.NumParameters++; - root_param = &root_params[texture->root_index]; - root_param->ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; - root_param->DescriptorTable.NumDescriptorRanges = 1; - root_param->DescriptorTable.pDescriptorRanges = range; - root_param->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - - range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; - range->NumDescriptors = 1; - range->BaseShaderRegister = texture->slot; - range->RegisterSpace = 0; - range->OffsetInDescriptorsFromTableStart = 0; - - if (!texture->resource) - { - texture->heap = create_gpu_descriptor_heap(context->c.device, - D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); - texture->resource = create_default_texture(context->c.device, texture->width, texture->height, - texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); - resource_data.pData = texture->data; - resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size; - upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list); - reset_command_list(command_list, context->c.allocator); - transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, - D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); - ID3D12Device_CreateShaderResourceView(context->c.device, texture->resource, - NULL, get_cpu_descriptor_handle(&context->c, texture->heap, 0)); - } - } - - assert(root_signature_desc.NumParameters <= ARRAY_SIZE(root_params)); - - for (i = 0; i < context->sampler_count; ++i) - { - D3D12_STATIC_SAMPLER_DESC *sampler_desc = &static_samplers[root_signature_desc.NumStaticSamplers++]; - const struct sampler *sampler = &context->samplers[i]; - - memset(sampler_desc, 0, sizeof(*sampler_desc)); - sampler_desc->Filter = sampler->filter; - sampler_desc->AddressU = sampler->u_address; - sampler_desc->AddressV = sampler->v_address; - sampler_desc->AddressW = sampler->w_address; - sampler_desc->ShaderRegister = sampler->slot; - sampler_desc->RegisterSpace = 0; - sampler_desc->ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; - } - - if (context->c.root_signature) - ID3D12RootSignature_Release(context->c.root_signature); - hr = create_root_signature(context->c.device, &root_signature_desc, &context->c.root_signature); - ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - - pso = create_pipeline_state(context->c.device, context->c.root_signature, context->c.render_target_desc.Format, - NULL, &ps, NULL); - if (!pso) - return; - vkd3d_array_reserve((void **)&context->c.pso, &context->c.pso_capacity, context->c.pso_count + 1, sizeof(*context->c.pso)); - context->c.pso[context->c.pso_count++] = pso; - - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->c.root_signature); - if (context->uniform_count) - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, uniform_index, - context->uniform_count, context->uniforms, 0); - for (i = 0; i < context->texture_count; ++i) - ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, context->textures[i].root_index, - get_gpu_descriptor_handle(&context->c, context->textures[i].heap, 0)); - - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->c.rtv, false, NULL); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->c.scissor_rect); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->c.viewport); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->c.rtv, clear_color, 0, NULL); - ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - transition_resource_state(command_list, context->c.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - } - else if (match_string(line, "probe all rgba", &line)) - { - unsigned int ulps; - struct vec4 v; - int ret; - - ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); - if (ret < 4) - fatal_error("Malformed probe arguments '%s'.\n", line); - if (ret < 5) - ulps = 0; - check_sub_resource_vec4(context->c.render_target, 0, context->c.queue, context->c.list, &v, ulps); - reset_command_list(context->c.list, context->c.allocator); - } - else if (match_string(line, "probe rect rgba", &line)) - { - unsigned int x, y, w, h, ulps; - struct resource_readback rb; - struct vec4 v; - RECT rect; - int ret; - - ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f ) %u", - &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w, &ulps); - if (ret < 8) - fatal_error("Malformed probe arguments '%s'.\n", line); - if (ret < 9) - ulps = 0; - - get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); - rect.left = x; - rect.right = x + w; - rect.top = y; - rect.bottom = y + h; - check_readback_data_vec4(&rb, &rect, &v, ulps); - release_resource_readback(&rb); - reset_command_list(context->c.list, context->c.allocator); - } - else if (match_string(line, "probe rgba", &line)) - { - struct resource_readback rb; - unsigned int x, y, ulps; - struct vec4 v; - RECT rect; - int ret; - - ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); - if (ret < 6) - fatal_error("Malformed probe arguments '%s'.\n", line); - if (ret < 7) - ulps = 0; - - get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); - rect.left = x; - rect.right = x + 1; - rect.top = y; - rect.bottom = y + 1; - check_readback_data_vec4(&rb, &rect, &v, ulps); - release_resource_readback(&rb); - reset_command_list(context->c.list, context->c.allocator); - } - else if (match_string(line, "uniform", &line)) - { - unsigned int offset; - - if (!sscanf(line, "%u", &offset)) - fatal_error("Unknown uniform type '%s'.\n", line); - line = strchr(line, ' ') + 1; - - if (match_string(line, "float4", &line)) - { - struct vec4 v; - - if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4) - fatal_error("Malformed float4 constant '%s'.\n", line); - if (offset + 4 > context->uniform_count) - { - context->uniform_count = offset + 4; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &v, sizeof(v)); - } - else if (match_string(line, "float", &line)) - { - float f; - - if (sscanf(line, "%f", &f) < 1) - fatal_error("Malformed float constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &f, sizeof(f)); - } - else if (match_string(line, "int", &line)) - { - int i; - - if (sscanf(line, "%i", &i) < 1) - fatal_error("Malformed int constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &i, sizeof(i)); - } - else if (match_string(line, "uint", &line)) - { - unsigned int u; - - if (sscanf(line, "%u", &u) < 1) - fatal_error("Malformed uint constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &u, sizeof(u)); - } - } - else - { - fatal_error("Unknown test directive '%s'.\n", line); - } -} - -static struct sampler *get_sampler(struct shader_context *context, unsigned int slot) -{ - struct sampler *sampler; - size_t i; - - for (i = 0; i < context->sampler_count; ++i) - { - sampler = &context->samplers[i]; - - if (sampler->slot == slot) - return sampler; - } - - return NULL; -} - -static struct texture *get_texture(struct shader_context *context, unsigned int slot) -{ - struct texture *texture; - size_t i; - - for (i = 0; i < context->texture_count; ++i) - { - texture = &context->textures[i]; - if (texture->slot == slot) - return texture; - } - - return NULL; -} - -START_TEST(shader_runner_d3d12) +void run_shader_tests_d3d12(int argc, char **argv) { - static const struct test_context_desc desc = - { - .rt_width = 640, - .rt_height = 480, - .no_root_signature = true, - .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, - }; - size_t shader_source_size = 0, shader_source_len = 0; - struct sampler *current_sampler = NULL; - struct texture *current_texture = NULL; - enum parse_state state = STATE_NONE; - unsigned int i, line_number = 0; - struct shader_context context; - const char *filename = NULL; - char *shader_source = NULL; - char line[256]; - FILE *f; - - parse_args(argc, argv); - enable_d3d12_debug_layer(argc, argv); - init_adapter_info(); - - for (i = 1; i < argc; ++i) - { - if (argv[i][0] != '-') - { - filename = argv[i]; - break; - } - } - - if (!filename) - { - fprintf(stderr, "Usage: %s [file]\n", argv[0]); - return; - } - - if (!(f = fopen(filename, "r"))) - { - fatal_error("Unable to open '%s' for reading: %s\n", argv[1], strerror(errno)); - return; - } - - memset(&context, 0, sizeof(context)); - init_test_context(&context.c, &desc); - - for (;;) - { - char *ret = fgets(line, sizeof(line), f); - - ++line_number; - - if (!ret || line[0] == '[') - { - switch (state) - { - case STATE_NONE: - case STATE_SAMPLER: - case STATE_TEST: - case STATE_TEXTURE: - break; - - case STATE_SHADER_PIXEL: - if (!(context.ps_code = compile_shader(shader_source, "ps_4_0"))) - return; - shader_source_len = 0; - break; - - case STATE_SHADER_INVALID_PIXEL: - { - ID3D10Blob *blob = NULL, *errors = NULL; - HRESULT hr; - - hr = D3DCompile(shader_source, strlen(shader_source), NULL, - NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - ok(!blob, "Expected no compiled shader blob.\n"); - ok(!!errors, "Expected non-NULL error blob.\n"); - if (!errors) - return; - - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); - - shader_source_len = 0; - break; - } - - case STATE_PREPROC_INVALID: - { - ID3D10Blob *blob = NULL, *errors = NULL; - HRESULT hr; - - hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - ok(!blob, "Expected no compiled shader blob.\n"); - ok(!!errors, "Expected non-NULL error blob.\n"); - - if (errors) - { - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); - } - - shader_source_len = 0; - break; - } - - case STATE_PREPROC: - { - ID3D10Blob *blob = NULL, *errors = NULL; - SIZE_T size; - HRESULT hr; - char *text; - - hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr == S_OK) - { - if (errors) - { - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); - } - - text = ID3D10Blob_GetBufferPointer(blob); - size = ID3D10Blob_GetBufferSize(blob); - ok(vkd3d_memmem(text, size, "pass", strlen("pass")), - "'pass' not found in preprocessed shader.\n"); - ok(!vkd3d_memmem(text, size, "fail", strlen("fail")), - "'fail' found in preprocessed shader.\n"); - ID3D10Blob_Release(blob); - } - - shader_source_len = 0; - break; - } - } - } - - if (!ret) - break; - - if (line[0] == '[') - { - unsigned int index; - - if (!strcmp(line, "[pixel shader]\n")) - { - state = STATE_SHADER_PIXEL; - - if (context.ps_code) - ID3D10Blob_Release(context.ps_code); - context.ps_code = NULL; - } - else if (!strcmp(line, "[pixel shader fail]\n")) - { - state = STATE_SHADER_INVALID_PIXEL; - } - else if (sscanf(line, "[sampler %u]\n", &index)) - { - state = STATE_SAMPLER; - - if ((current_sampler = get_sampler(&context, index))) - { - memset(current_sampler, 0, sizeof(*current_sampler)); - } - else - { - context.samplers = realloc(context.samplers, - ++context.sampler_count * sizeof(*context.samplers)); - current_sampler = &context.samplers[context.sampler_count - 1]; - memset(current_sampler, 0, sizeof(*current_sampler)); - } - current_sampler->slot = index; - current_sampler->filter = D3D12_FILTER_MIN_MAG_MIP_POINT; - current_sampler->u_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - current_sampler->v_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - current_sampler->w_address = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - } - else if (sscanf(line, "[texture %u]\n", &index)) - { - state = STATE_TEXTURE; - - if ((current_texture = get_texture(&context, index))) - { - free_texture(current_texture); - } - else - { - context.textures = realloc(context.textures, - ++context.texture_count * sizeof(*context.textures)); - current_texture = &context.textures[context.texture_count - 1]; - memset(current_texture, 0, sizeof(*current_texture)); - } - current_texture->slot = index; - current_texture->format = DXGI_FORMAT_R32G32B32A32_FLOAT; - current_texture->data_type = TEXTURE_DATA_FLOAT; - current_texture->texel_size = 16; - } - else if (!strcmp(line, "[test]\n")) - { - state = STATE_TEST; - } - else if (!strcmp(line, "[preproc]\n")) - { - state = STATE_PREPROC; - } - else if (!strcmp(line, "[preproc fail]\n")) - { - state = STATE_PREPROC_INVALID; - } - - vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); - } - else if (line[0] != '%' && line[0] != '\n') - { - switch (state) - { - case STATE_NONE: - fatal_error("Malformed line '%s'.\n", line); - break; - - case STATE_PREPROC: - case STATE_PREPROC_INVALID: - case STATE_SHADER_INVALID_PIXEL: - case STATE_SHADER_PIXEL: - { - size_t len = strlen(line); - - vkd3d_array_reserve((void **)&shader_source, &shader_source_size, shader_source_len + len + 1, 1); - memcpy(shader_source + shader_source_len, line, len + 1); - shader_source_len += len; - break; - } - - case STATE_SAMPLER: - parse_sampler_directive(current_sampler, line); - break; - - case STATE_TEXTURE: - parse_texture_directive(current_texture, line); - break; - - case STATE_TEST: - parse_test_directive(&context, line); - break; - } - } - } - - if (context.ps_code) - ID3D10Blob_Release(context.ps_code); - for (i = 0; i < context.texture_count; ++i) - free_texture(&context.textures[i]); - destroy_test_context(&context.c); - - fclose(f); + run_shader_tests(argc, argv, &d3d12_runner_ops); } -- 2.34.1

3 7

[PATCH vkd3d 1/2] vkd3d: Store the vkd3d format in resource objects.
by Conor McCarthy 14 Jan '22

14 Jan '22

Resource formats are immutable and the format object is static data. Storing it saves a function call and error check in many locations. The current implementation for finding a format iterates over the entire list of formats. The format is checked for NULL during resource initialisation, so accessing the format object is safe where buffers are excluded. In some cases the format query effectively excluded buffers, so an explicit check is needed. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 72 ++++++++++---------------------------- libs/vkd3d/device.c | 4 +-- libs/vkd3d/resource.c | 35 +++++++++--------- libs/vkd3d/vkd3d_private.h | 4 ++- 4 files changed, 39 insertions(+), 76 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3e252aee..5f107384 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2116,17 +2116,10 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; - const struct vkd3d_format *format; VkImageMemoryBarrier barrier; assert(d3d12_resource_is_texture(resource)); - if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) - { - ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); - return; - } - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -2146,7 +2139,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = resource->u.vk_image; - barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; barrier.subresourceRange.baseMipLevel = 0; barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; barrier.subresourceRange.baseArrayLayer = 0; @@ -3531,22 +3524,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic else if (src->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX && dst->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX) { - assert(d3d12_resource_is_texture(dst_resource)); - assert(d3d12_resource_is_texture(src_resource)); - - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &src_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!d3d12_resource_is_texture(dst_resource) || !d3d12_resource_is_texture(src_resource)) { - WARN("Invalid format %#x.\n", src_resource->desc.Format); + WARN("Both dst and src must contain textures.\n"); return; } + dst_format = dst_resource->format; + src_format = src_resource->format; + if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); @@ -3580,7 +3566,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); struct d3d12_resource *dst_resource, *src_resource; - const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; VkBufferCopy vk_buffer_copy; VkImageCopy vk_image_copy; @@ -3612,30 +3597,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm } else { - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &src_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!d3d12_resource_is_texture(dst_resource) || !d3d12_resource_is_texture(src_resource)) { - WARN("Invalid format %#x.\n", src_resource->desc.Format); + WARN("Both dst and src must be textures.\n"); return; } layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc); - assert(d3d12_resource_is_texture(dst_resource)); - assert(d3d12_resource_is_texture(src_resource)); assert(dst_resource->desc.MipLevels == src_resource->desc.MipLevels); assert(layer_count == d3d12_resource_desc_get_layer_count(&src_resource->desc)); for (i = 0; i < dst_resource->desc.MipLevels; ++i) { - vk_image_copy_from_d3d12(&vk_image_copy, i, i, - &src_resource->desc, &dst_resource->desc, src_format, dst_format, NULL, 0, 0, 0); + vk_image_copy_from_d3d12(&vk_image_copy, i, i, &src_resource->desc, &dst_resource->desc, + src_resource->format, dst_resource->format, NULL, 0, 0, 0); vk_image_copy.dstSubresource.layerCount = layer_count; vk_image_copy.srcSubresource.layerCount = layer_count; VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image, @@ -3676,24 +3652,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi dst_resource = unsafe_impl_from_ID3D12Resource(dst); src_resource = unsafe_impl_from_ID3D12Resource(src); - assert(d3d12_resource_is_texture(dst_resource)); - assert(d3d12_resource_is_texture(src_resource)); + if (!d3d12_resource_is_texture(dst_resource) || !d3d12_resource_is_texture(src_resource)) + { + WARN("Both dst and src must be textures.\n"); + return; + } d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); d3d12_command_list_end_current_render_pass(list); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(device, &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(device, &src_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", src_resource->desc.Format); - return; - } + dst_format = dst_resource->format; + src_format = src_resource->format; if (dst_format->type == VKD3D_FORMAT_TYPE_TYPELESS || src_format->type == VKD3D_FORMAT_TYPE_TYPELESS) { @@ -4064,15 +4035,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } else { - const struct vkd3d_format *format; VkImageMemoryBarrier vk_barrier; - if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) - { - ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); - continue; - } - vk_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = src_access_mask; @@ -4083,7 +4047,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.image = resource->u.vk_image; - vk_barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + vk_barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; if (sub_resource_idx == D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES) { vk_barrier.subresourceRange.baseMipLevel = 0; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4ce3ed81..5012c91c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3394,7 +3394,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour desc = &resource_descs[0]; - if (FAILED(d3d12_resource_validate_desc(desc, device))) + if (FAILED(d3d12_resource_validate_desc(desc, NULL, device))) { WARN("Invalid resource desc.\n"); goto invalid; @@ -3688,7 +3688,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (FAILED(d3d12_resource_validate_desc(desc, device))) + if (FAILED(d3d12_resource_validate_desc(desc, NULL, device))) { WARN("Invalid resource desc.\n"); return; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78b32bde..2ac7ad95 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -855,7 +855,11 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, VkImageCreateInfo image_info; VkResult vr; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + if (resource) + { + format = resource->format; + } + else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid DXGI format %#x.\n", desc->Format); return E_INVALIDARG; @@ -1001,7 +1005,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, HRESULT hr; assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER); - assert(d3d12_resource_validate_desc(desc, device) == S_OK); + assert(d3d12_resource_validate_desc(desc, NULL, device) == S_OK); if (!desc->MipLevels) { @@ -1076,7 +1080,6 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, unsigned int sub_resource_idx, const D3D12_BOX *box) { unsigned int mip_level = sub_resource_idx % resource->desc.MipLevels; - struct d3d12_device *device = resource->device; const struct vkd3d_format *vkd3d_format; uint32_t width_mask, height_mask; uint64_t width, height, depth; @@ -1085,7 +1088,7 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, height = d3d12_resource_desc_get_height(&resource->desc, mip_level); depth = d3d12_resource_desc_get_depth(&resource->desc, mip_level); - vkd3d_format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0); + vkd3d_format = resource->format; assert(vkd3d_format); width_mask = vkd3d_format->block_width - 1; height_mask = vkd3d_format->block_height - 1; @@ -1350,11 +1353,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc device = resource->device; vk_procs = &device->vk_procs; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) - { - ERR("Invalid DXGI format %#x.\n", resource->desc.Format); - return E_INVALIDARG; - } + format = resource->format; if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { FIXME("Not supported for format %#x.\n", format->dxgi_format); @@ -1442,11 +1441,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour device = resource->device; vk_procs = &device->vk_procs; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) - { - ERR("Invalid DXGI format %#x.\n", resource->desc.Format); - return E_INVALIDARG; - } + format = resource->format; if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { FIXME("Not supported for format %#x.\n", format->dxgi_format); @@ -1649,10 +1644,9 @@ static bool d3d12_resource_validate_texture_alignment(const D3D12_RESOURCE_DESC return true; } -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, const struct vkd3d_format *format, + struct d3d12_device *device) { - const struct vkd3d_format *format; - switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -1687,7 +1681,7 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d return E_INVALIDARG; } - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + if (!format && !(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid format %#x.\n", desc->Format); return E_INVALIDARG; @@ -1775,7 +1769,9 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->gpu_address = 0; resource->flags = 0; - if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) + resource->format = (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) ? NULL + : vkd3d_format_from_d3d12_resource_desc(device, desc, 0); + if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, resource->format, device))) return hr; switch (desc->Dimension) @@ -2030,6 +2026,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; + object->format = vkd3d_format_from_d3d12_resource_desc(d3d12_device, &create_info->desc, 0); object->u.vk_image = create_info->vk_image; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 047f4a29..b1291804 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -427,6 +427,7 @@ struct d3d12_resource LONG internal_refcount; D3D12_RESOURCE_DESC desc; + const struct vkd3d_format *format; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; union @@ -460,7 +461,8 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour } bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource); -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device); +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, const struct vkd3d_format *format, + struct d3d12_device *device); HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, -- 2.34.1

2 3

[PATCH vkd3d v2 1/3] tests: Avoid -Wstringop-overread warnings from GCC 11.1+.
by Conor McCarthy 14 Jan '22

14 Jan '22

It's technically correct in warning about overwriting the entire vec4 from the address of .x, if a bit overzealous. It's probably a good warning to keep enabled. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2507974f..b611448d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4737,7 +4737,7 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, (const float *)&array_colors[i], 0, NULL); } transition_resource_state(command_list, resource, @@ -4768,7 +4768,7 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, (const float *)&array_colors[i], 0, NULL); } transition_resource_state(command_list, resource, @@ -5703,7 +5703,7 @@ static void test_unknown_rtv_format(void) create_render_target(&context, &desc, &render_targets[1], &rtvs[2]); for (i = 0; i < ARRAY_SIZE(rtvs); ++i) - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], (const float *)&white, 0, NULL); /* NULL RTV */ memset(&rtv_desc, 0, sizeof(rtv_desc)); @@ -14123,7 +14123,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14161,7 +14161,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_offset, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14199,7 +14199,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_green, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14237,7 +14237,7 @@ static void test_gather(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_po, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14273,7 +14273,7 @@ static void test_gather(void) constants.offset_x = 0; constants.offset_y = 0; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14463,7 +14463,7 @@ static void test_gather_c(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_c, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14501,7 +14501,7 @@ static void test_gather_c(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &ps_gather4_po_c, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -14537,7 +14537,7 @@ static void test_gather_c(void) constants.offset_x = 0; constants.offset_y = 0; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, &white.x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, (const float *)&white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -15388,7 +15388,7 @@ static void test_multisample_array_texture(void) rtv_desc.Texture2DMSArray.ArraySize = 1; ID3D12Device_CreateRenderTargetView(device, texture, &rtv_desc, cpu_handle); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, &colors[i].x, 0, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, (const float *)&colors[i], 0, NULL); } transition_resource_state(command_list, texture, -- 2.34.1

3 5

[PATCH] winepulse.drv: Fix memory leak.
by Andrew Eikum 14 Jan '22

14 Jan '22

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index bd886e0d879..356f68e0db2 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -928,6 +928,7 @@ static NTSTATUS pulse_release_stream(void *args) { struct release_stream_params *params = args; struct pulse_stream *stream = params->stream; + SIZE_T size; if(params->timer) { stream->please_quit = TRUE; @@ -944,12 +945,16 @@ static NTSTATUS pulse_release_stream(void *args) pa_stream_unref(stream->stream); pulse_unlock(); - if (stream->tmp_buffer) + if (stream->tmp_buffer) { + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_bytes, MEM_RELEASE); - if (stream->local_buffer) + &size, MEM_RELEASE); + } + if (stream->local_buffer) { + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - &stream->alloc_size, MEM_RELEASE); + &size, MEM_RELEASE); + } free(stream->peek_buffer); free(stream); return STATUS_SUCCESS; @@ -1514,13 +1519,16 @@ static NTSTATUS pulse_reset(void *args) static BOOL alloc_tmp_buffer(struct pulse_stream *stream, SIZE_T bytes) { + SIZE_T size; + if (stream->tmp_buffer_bytes >= bytes) return TRUE; if (stream->tmp_buffer) { + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_bytes, MEM_RELEASE); + &size, MEM_RELEASE); stream->tmp_buffer = NULL; stream->tmp_buffer_bytes = 0; } -- 2.34.1

1 0

[PATCH] winecoreaudio.drv: Fix memory leak.
by Andrew Eikum 14 Jan '22

14 Jan '22

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 3f694b95a49..a2bbc3e45c9 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -709,6 +709,7 @@ static NTSTATUS release_stream( void *args ) { struct release_stream_params *params = args; struct coreaudio_stream *stream = params->stream; + SIZE_T size; if(stream->unit){ AudioOutputUnitStop(stream->unit); @@ -719,12 +720,16 @@ static NTSTATUS release_stream( void *args ) free(stream->resamp_buffer); free(stream->wrap_buffer); free(stream->cap_buffer); - if(stream->local_buffer) + if(stream->local_buffer){ + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - &stream->local_buffer_size, MEM_RELEASE); - if(stream->tmp_buffer) + &size, MEM_RELEASE); + } + if(stream->tmp_buffer){ + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_size, MEM_RELEASE); + &size, MEM_RELEASE); + } free(stream->fmt); free(stream); params->result = S_OK; @@ -1354,8 +1359,9 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ if(stream->tmp_buffer){ + SIZE_T size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - &stream->tmp_buffer_size, MEM_RELEASE); + &size, MEM_RELEASE); stream->tmp_buffer = NULL; } stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; -- 2.34.1

1 0

[PATCH v2] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf 14 Jan '22

14 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: -Add architecture-specific assembly (Credit: Zebediah Figura) -Update copyright year -Add basic unit test -Explicitly declare function takes no parameters Note: I compared the native wdscore to this one in both Wine and Windows. The functions behaved identically. --- configure.ac | 1 + dlls/wdscore/Makefile.in | 3 ++ dlls/wdscore/main.c | 55 ++++++++++++++++++++++++++++++++++ dlls/wdscore/tests/Makefile.in | 5 ++++ dlls/wdscore/tests/main.c | 37 +++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c create mode 100644 dlls/wdscore/tests/Makefile.in create mode 100644 dlls/wdscore/tests/main.c diff --git a/configure.ac b/configure.ac index b42cb8a5346..a50881cc2fb 100644 --- a/configure.ac +++ b/configure.ac @@ -3347,6 +3347,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) WINE_CONFIG_MAKEFILE(dlls/wdscore) +WINE_CONFIG_MAKEFILE(dlls/wdscore/tests) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/websocket) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..1ed860e02ea --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,55 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * 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 + */ + +#include <stdarg.h> +#include <stdint.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +#ifdef __i386__ +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movl 0(%esp), %eax\n\t" + "ret" ) +#elif defined(__x86_64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movq 0(%rsp), %rax\n\t" + "ret" ) +#elif defined(__arm__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov lr, r0\n\t" + "bx lr" ) +#elif defined(__aarch64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov lr, x0\n\t" + "ret" ) +#else +int WINAPI CurrentIP(void) +{ + FIXME( "not implemented\n" ); + return 0; +} +#endif diff --git a/dlls/wdscore/tests/Makefile.in b/dlls/wdscore/tests/Makefile.in new file mode 100644 index 00000000000..f0606d902d5 --- /dev/null +++ b/dlls/wdscore/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wdscore.dll +IMPORTS = wdscore + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/tests/main.c b/dlls/wdscore/tests/main.c new file mode 100644 index 00000000000..262c75641af --- /dev/null +++ b/dlls/wdscore/tests/main.c @@ -0,0 +1,37 @@ +/* + * Unit test suite for wdscore + * + * Copyright 2022 Mohamad Al-Jaf + * + * 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 + * + */ + +#include "wine/test.h" +#include "winbase.h" + +static void test_CurrentIP(void) +{ + int ret; + + ret = CurrentIP(); + trace("CurrentIP() = %d\n", ret); + ok(ret != 0, "Unsupported architecture\n"); +} + +START_TEST(main) +{ + test_CurrentIP(); +} diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..8b6febe6b3b 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ stdcall CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask -- 2.34.1

3 2

[PATCH] wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang 14 Jan '22

14 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/wineboot/wineboot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4a18265c1de..e7a508beb12 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -826,7 +826,9 @@ static void create_computer_name_keys(void) if (gethostname( buffer, sizeof(buffer) )) return; hints.ai_flags = AI_CANONNAME; - if (!getaddrinfo( buffer, NULL, &hints, &res )) name = res->ai_canonname; + if (!getaddrinfo( buffer, NULL, &hints, &res ) && + res->ai_canonname && strcasecmp(res->ai_canonname, "localhost") != 0) + name = res->ai_canonname; dot = strchr( name, '.' ); if (dot) *dot++ = 0; else dot = name + strlen(name); -- 2.31.1

1 0

[PATCH 1/2] ws2_32: Cast timeval fields to LONGLONG before multiplying.
by Zebediah Figura 14 Jan '22

14 Jan '22

WXWORK passes 300 seconds, which overflows 32-bit multiplication. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52383 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0c8f4a72d0..87fa3629b1c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2409,7 +2409,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, } if (timeout) - params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; + params->timeout = (LONGLONG)timeout->tv_sec * -10000000 + (LONGLONG)timeout->tv_usec * -10; else params->timeout = TIMEOUT_INFINITE; -- 2.34.1

2 3

[PATCH vkd3d v2 08/10] vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer.
by Francisco Casas 13 Jan '22

13 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 98 +++++++++++++++------------------------- 1 file changed, 37 insertions(+), 61 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a89e4432..69ae48a1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1326,25 +1326,13 @@ static void numeric_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *va } } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, +static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer) { struct hlsl_type *type = var->data_type; struct hlsl_struct_field *field; unsigned int i = 0; - if (initializer_size(initializer) != hlsl_type_component_count(type)) - { - hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", - hlsl_type_component_count(type), initializer_size(initializer)); - free_parse_initializer(initializer); - return; - } - - list_move_tail(list, initializer->instrs); - vkd3d_free(initializer->instrs); - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -1358,19 +1346,41 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru { if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) break; - list_add_tail(list, &c->node.entry); + list_add_tail(initializer->instrs, &c->node.entry); if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) break; - list_add_tail(list, &store->node.entry); + list_add_tail(initializer->instrs, &store->node.entry); } else { hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); } } +} - vkd3d_free(initializer->args); +static void generic_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_variable_def *v, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_i, struct list *instrs) +{ + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + numeric_var_initializer(ctx, var, v, reg_offset, type, initializer_i, v->initializer.instrs); + } + else if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, var, &v->initializer); + } + else if (type->type == HLSL_CLASS_ARRAY) + { + hlsl_fixme(ctx, &v->loc, "Initializers for arrays not supported yet."); + return; + } + else if (type->type == HLSL_CLASS_OBJECT) + { + hlsl_fixme(ctx, &var->loc, "Initializers for objects not supported yet.\n"); + return; + } } static void free_parse_variable_def(struct parse_variable_def *v) @@ -1498,50 +1508,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { unsigned int size = initializer_size(&v->initializer); - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) - { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - } - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } - if (v->arrays.count) - { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v); - continue; - } - if (type->type <= HLSL_CLASS_LAST_NUMERIC && size == 1) { struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); @@ -1553,7 +1519,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { unsigned int initializer_i = 0; - numeric_var_initializer(ctx, var, v, 0, type, &initializer_i, v->initializer.instrs); + if (hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v); + continue; + } + + generic_var_initializer(ctx, var, v, 0, type, &initializer_i, v->initializer.instrs); } if (modifiers & HLSL_STORAGE_STATIC) -- 2.25.1

2 1

[PATCH 1/6] mf/samplegrabber: Always release cancellation key when timer is invoked.
by Derek Lesho 13 Jan '22

13 Jan '22

The sample grabber currently leaks the key on the last invokation of the timer, as it is only released when stream_schedule_sample is called. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index e0287e1e1db..dd48973b7b6 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -729,6 +729,12 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba EnterCriticalSection(&grabber->cs); + if (grabber->cancel_key) + { + IUnknown_Release(grabber->cancel_key); + grabber->cancel_key = NULL; + } + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &grabber->items, struct scheduled_item, entry) { if (item->type == ITEM_TYPE_MARKER) -- 2.33.1

3 22

[PATCH v5 1/6] ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only if window is not in foreground.
by Gabriel Ivăncescu 13 Jan '22

13 Jan '22

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The current tests were testing a hidden window only, which ddraw treats as "inactive" (but not d3d8/d3d9ex). Tests were added to show that even visible windows, but not foreground, are not set to topmost, while foreground ones are. This is ddraw specific. d3d8 and d3d9ex treat hidden windows as "active" for the purposes of window changes (so only visible windows, if inactive, prevent changes). We have existing tests for that. Unfortunately, most of the tests are still todo_wine, even though the WS_EX_TOPMOST style matches (except when exiting, that's fixed on 3rd patch). That's because we don't have WS_EX_WINDOWEDGE on fullscreen windows (long-standing issue), but the topmost bit is set correctly. dlls/ddraw/ddraw.c | 6 ++-- dlls/ddraw/tests/ddraw1.c | 66 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 66 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 66 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 66 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 264 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5b70bb4..77172d4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -583,8 +583,10 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH - | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + + if (window != GetForegroundWindow()) + swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index efbecf0..e6d08ce 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2585,14 +2585,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2636,6 +2638,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 65ac21d..cbdd4ce 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2663,14 +2663,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw2 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2714,6 +2716,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ce2333d..839bc3d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2899,14 +2899,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw4 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2950,6 +2952,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4cf57bf..eb258ce 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2564,14 +2564,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw7 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2615,6 +2617,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); -- 2.34.1

3 16

[PATCH vkd3d] vkd3d-shader/preproc: Allow capital U and L after integer constants as well.
by Zebediah Figura 13 Jan '22

13 Jan '22

Technically we shouldn't allow "uu" or "ll" either, but we also don't really handle preprocessor parsing errors the way we should. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/preproc.l | 7 ++++--- tests/preproc-if-expr.shader_test | 33 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index bf4d669f3..54542331b 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -57,6 +57,7 @@ static void update_location(struct preproc_ctx *ctx); NEWLINE \r?\n WS [ \t] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* +INT_SUFFIX [uUlL]{0,2} %% @@ -92,9 +93,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL,LINE>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} -<INITIAL,LINE>0[0-7]*[ul]{0,2} {return T_INTEGER;} -<INITIAL,LINE>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[xX][0-9a-fA-f]+{INT_SUFFIX} {return T_INTEGER;} +<INITIAL,LINE>0[0-7]*{INT_SUFFIX} {return T_INTEGER;} +<INITIAL,LINE>[1-9][0-9]*{INT_SUFFIX} {return T_INTEGER;} <INITIAL>## {return T_CONCAT;} diff --git a/tests/preproc-if-expr.shader_test b/tests/preproc-if-expr.shader_test index 61c5a397d..823b9b0e3 100644 --- a/tests/preproc-if-expr.shader_test +++ b/tests/preproc-if-expr.shader_test @@ -99,6 +99,39 @@ pass pass #endif +[preproc] +#if 2u == 2 +pass +#else +fail +#endif + +[preproc] +#if 2l == 2 +pass +#else +fail +#endif + +[preproc] +#if 2Ul == 2 +pass +#else +fail +#endif + +[preproc] +#if 2uL == 2 +pass +#else +fail +#endif + +[preproc] +#if 012lu == 10 +pass +#endif + [preproc] /* All math is done using unsigned 32-bit integers. */ #if 8 / -3 == 2 -- 2.34.1

3 3

[PATCH vkd3d 1/2] vkd3d-shader: Use a designated initializer for the shader_opcode_names array.
by Zebediah Figura 13 Jan '22

13 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 516 +++++++++++++++++++------------------- 1 file changed, 258 insertions(+), 258 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 1250503fa..e4a1884cf 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -29,264 +29,264 @@ static const char * const shader_opcode_names[] = { - /* VKD3DSIH_ABS */ "abs", - /* VKD3DSIH_ADD */ "add", - /* VKD3DSIH_AND */ "and", - /* VKD3DSIH_ATOMIC_AND */ "atomic_and", - /* VKD3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", - /* VKD3DSIH_ATOMIC_IADD */ "atomic_iadd", - /* VKD3DSIH_ATOMIC_IMAX */ "atomic_imax", - /* VKD3DSIH_ATOMIC_IMIN */ "atomic_imin", - /* VKD3DSIH_ATOMIC_OR */ "atomic_or", - /* VKD3DSIH_ATOMIC_UMAX */ "atomic_umax", - /* VKD3DSIH_ATOMIC_UMIN */ "atomic_umin", - /* VKD3DSIH_ATOMIC_XOR */ "atomic_xor", - /* VKD3DSIH_BEM */ "bem", - /* VKD3DSIH_BFI */ "bfi", - /* VKD3DSIH_BFREV */ "bfrev", - /* VKD3DSIH_BREAK */ "break", - /* VKD3DSIH_BREAKC */ "breakc", - /* VKD3DSIH_BREAKP */ "breakp", - /* VKD3DSIH_BUFINFO */ "bufinfo", - /* VKD3DSIH_CALL */ "call", - /* VKD3DSIH_CALLNZ */ "callnz", - /* VKD3DSIH_CASE */ "case", - /* VKD3DSIH_CMP */ "cmp", - /* VKD3DSIH_CND */ "cnd", - /* VKD3DSIH_CONTINUE */ "continue", - /* VKD3DSIH_CONTINUEP */ "continuec", - /* VKD3DSIH_COUNTBITS */ "countbits", - /* VKD3DSIH_CRS */ "crs", - /* VKD3DSIH_CUT */ "cut", - /* VKD3DSIH_CUT_STREAM */ "cut_stream", - /* VKD3DSIH_DADD */ "dadd", - /* VKD3DSIH_DCL */ "dcl", - /* VKD3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", - /* VKD3DSIH_DCL_FUNCTION_BODY */ "dcl_function_body", - /* VKD3DSIH_DCL_FUNCTION_TABLE */ "dcl_function_table", - /* VKD3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", - /* VKD3DSIH_DCL_GS_INSTANCES */ "dcl_gs_instances", - /* VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", - /* VKD3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT */ "dcl_hs_join_phase_instance_count", - /* VKD3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", - /* VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", - /* VKD3DSIH_DCL_INDEX_RANGE */ "dcl_index_range", - /* VKD3DSIH_DCL_INDEXABLE_TEMP */ "dcl_indexableTemp", - /* VKD3DSIH_DCL_INPUT */ "dcl_input", - /* VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", - /* VKD3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", - /* VKD3DSIH_DCL_INPUT_PS */ "dcl_input_ps", - /* VKD3DSIH_DCL_INPUT_PS_SGV */ "dcl_input_ps_sgv", - /* VKD3DSIH_DCL_INPUT_PS_SIV */ "dcl_input_ps_siv", - /* VKD3DSIH_DCL_INPUT_SGV */ "dcl_input_sgv", - /* VKD3DSIH_DCL_INPUT_SIV */ "dcl_input_siv", - /* VKD3DSIH_DCL_INTERFACE */ "dcl_interface", - /* VKD3DSIH_DCL_OUTPUT */ "dcl_output", - /* VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ "dcl_output_control_point_count", - /* VKD3DSIH_DCL_OUTPUT_SIV */ "dcl_output_siv", - /* VKD3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", - /* VKD3DSIH_DCL_RESOURCE_RAW */ "dcl_resource_raw", - /* VKD3DSIH_DCL_RESOURCE_STRUCTURED */ "dcl_resource_structured", - /* VKD3DSIH_DCL_SAMPLER */ "dcl_sampler", - /* VKD3DSIH_DCL_STREAM */ "dcl_stream", - /* VKD3DSIH_DCL_TEMPS */ "dcl_temps", - /* VKD3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", - /* VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", - /* VKD3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", - /* VKD3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", - /* VKD3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", - /* VKD3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", - /* VKD3DSIH_DCL_UAV_RAW */ "dcl_uav_raw", - /* VKD3DSIH_DCL_UAV_STRUCTURED */ "dcl_uav_structured", - /* VKD3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", - /* VKD3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", - /* VKD3DSIH_DDIV */ "ddiv", - /* VKD3DSIH_DEF */ "def", - /* VKD3DSIH_DEFAULT */ "default", - /* VKD3DSIH_DEFB */ "defb", - /* VKD3DSIH_DEFI */ "defi", - /* VKD3DSIH_DEQ */ "deq", - /* VKD3DSIH_DFMA */ "dfma", - /* VKD3DSIH_DGE */ "dge", - /* VKD3DSIH_DIV */ "div", - /* VKD3DSIH_DLT */ "dlt", - /* VKD3DSIH_DMAX */ "dmax", - /* VKD3DSIH_DMIN */ "dmin", - /* VKD3DSIH_DMOV */ "dmov", - /* VKD3DSIH_DMOVC */ "dmovc", - /* VKD3DSIH_DMUL */ "dmul", - /* VKD3DSIH_DNE */ "dne", - /* VKD3DSIH_DP2 */ "dp2", - /* VKD3DSIH_DP2ADD */ "dp2add", - /* VKD3DSIH_DP3 */ "dp3", - /* VKD3DSIH_DP4 */ "dp4", - /* VKD3DSIH_DRCP */ "drcp", - /* VKD3DSIH_DST */ "dst", - /* VKD3DSIH_DSX */ "dsx", - /* VKD3DSIH_DSX_COARSE */ "deriv_rtx_coarse", - /* VKD3DSIH_DSX_FINE */ "deriv_rtx_fine", - /* VKD3DSIH_DSY */ "dsy", - /* VKD3DSIH_DSY_COARSE */ "deriv_rty_coarse", - /* VKD3DSIH_DSY_FINE */ "deriv_rty_fine", - /* VKD3DSIH_DTOF */ "dtof", - /* VKD3DSIH_DTOI */ "dtoi", - /* VKD3DSIH_DTOU */ "dtou", - /* VKD3DSIH_ELSE */ "else", - /* VKD3DSIH_EMIT */ "emit", - /* VKD3DSIH_EMIT_STREAM */ "emit_stream", - /* VKD3DSIH_ENDIF */ "endif", - /* VKD3DSIH_ENDLOOP */ "endloop", - /* VKD3DSIH_ENDREP */ "endrep", - /* VKD3DSIH_ENDSWITCH */ "endswitch", - /* VKD3DSIH_EQ */ "eq", - /* VKD3DSIH_EVAL_CENTROID */ "eval_centroid", - /* VKD3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", - /* VKD3DSIH_EXP */ "exp", - /* VKD3DSIH_EXPP */ "expp", - /* VKD3DSIH_F16TOF32 */ "f16tof32", - /* VKD3DSIH_F32TOF16 */ "f32tof16", - /* VKD3DSIH_FCALL */ "fcall", - /* VKD3DSIH_FIRSTBIT_HI */ "firstbit_hi", - /* VKD3DSIH_FIRSTBIT_LO */ "firstbit_lo", - /* VKD3DSIH_FIRSTBIT_SHI */ "firstbit_shi", - /* VKD3DSIH_FRC */ "frc", - /* VKD3DSIH_FTOD */ "ftod", - /* VKD3DSIH_FTOI */ "ftoi", - /* VKD3DSIH_FTOU */ "ftou", - /* VKD3DSIH_GATHER4 */ "gather4", - /* VKD3DSIH_GATHER4_C */ "gather4_c", - /* VKD3DSIH_GATHER4_PO */ "gather4_po", - /* VKD3DSIH_GATHER4_PO_C */ "gather4_po_c", - /* VKD3DSIH_GE */ "ge", - /* VKD3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", - /* VKD3DSIH_HS_DECLS */ "hs_decls", - /* VKD3DSIH_HS_FORK_PHASE */ "hs_fork_phase", - /* VKD3DSIH_HS_JOIN_PHASE */ "hs_join_phase", - /* VKD3DSIH_IADD */ "iadd", - /* VKD3DSIH_IBFE */ "ibfe", - /* VKD3DSIH_IEQ */ "ieq", - /* VKD3DSIH_IF */ "if", - /* VKD3DSIH_IFC */ "ifc", - /* VKD3DSIH_IGE */ "ige", - /* VKD3DSIH_ILT */ "ilt", - /* VKD3DSIH_IMAD */ "imad", - /* VKD3DSIH_IMAX */ "imax", - /* VKD3DSIH_IMIN */ "imin", - /* VKD3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", - /* VKD3DSIH_IMM_ATOMIC_AND */ "imm_atomic_and", - /* VKD3DSIH_IMM_ATOMIC_CMP_EXCH */ "imm_atomic_cmp_exch", - /* VKD3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", - /* VKD3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", - /* VKD3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", - /* VKD3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax", - /* VKD3DSIH_IMM_ATOMIC_IMIN */ "imm_atomic_imin", - /* VKD3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", - /* VKD3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", - /* VKD3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", - /* VKD3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", - /* VKD3DSIH_IMUL */ "imul", - /* VKD3DSIH_INE */ "ine", - /* VKD3DSIH_INEG */ "ineg", - /* VKD3DSIH_ISHL */ "ishl", - /* VKD3DSIH_ISHR */ "ishr", - /* VKD3DSIH_ITOD */ "itod", - /* VKD3DSIH_ITOF */ "itof", - /* VKD3DSIH_LABEL */ "label", - /* VKD3DSIH_LD */ "ld", - /* VKD3DSIH_LD2DMS */ "ld2dms", - /* VKD3DSIH_LD_RAW */ "ld_raw", - /* VKD3DSIH_LD_STRUCTURED */ "ld_structured", - /* VKD3DSIH_LD_UAV_TYPED */ "ld_uav_typed", - /* VKD3DSIH_LIT */ "lit", - /* VKD3DSIH_LOD */ "lod", - /* VKD3DSIH_LOG */ "log", - /* VKD3DSIH_LOGP */ "logp", - /* VKD3DSIH_LOOP */ "loop", - /* VKD3DSIH_LRP */ "lrp", - /* VKD3DSIH_LT */ "lt", - /* VKD3DSIH_M3x2 */ "m3x2", - /* VKD3DSIH_M3x3 */ "m3x3", - /* VKD3DSIH_M3x4 */ "m3x4", - /* VKD3DSIH_M4x3 */ "m4x3", - /* VKD3DSIH_M4x4 */ "m4x4", - /* VKD3DSIH_MAD */ "mad", - /* VKD3DSIH_MAX */ "max", - /* VKD3DSIH_MIN */ "min", - /* VKD3DSIH_MOV */ "mov", - /* VKD3DSIH_MOVA */ "mova", - /* VKD3DSIH_MOVC */ "movc", - /* VKD3DSIH_MUL */ "mul", - /* VKD3DSIH_NE */ "ne", - /* VKD3DSIH_NOP */ "nop", - /* VKD3DSIH_NOT */ "not", - /* VKD3DSIH_NRM */ "nrm", - /* VKD3DSIH_OR */ "or", - /* VKD3DSIH_PHASE */ "phase", - /* VKD3DSIH_POW */ "pow", - /* VKD3DSIH_RCP */ "rcp", - /* VKD3DSIH_REP */ "rep", - /* VKD3DSIH_RESINFO */ "resinfo", - /* VKD3DSIH_RET */ "ret", - /* VKD3DSIH_RETP */ "retp", - /* VKD3DSIH_ROUND_NE */ "round_ne", - /* VKD3DSIH_ROUND_NI */ "round_ni", - /* VKD3DSIH_ROUND_PI */ "round_pi", - /* VKD3DSIH_ROUND_Z */ "round_z", - /* VKD3DSIH_RSQ */ "rsq", - /* VKD3DSIH_SAMPLE */ "sample", - /* VKD3DSIH_SAMPLE_B */ "sample_b", - /* VKD3DSIH_SAMPLE_C */ "sample_c", - /* VKD3DSIH_SAMPLE_C_LZ */ "sample_c_lz", - /* VKD3DSIH_SAMPLE_GRAD */ "sample_d", - /* VKD3DSIH_SAMPLE_INFO */ "sample_info", - /* VKD3DSIH_SAMPLE_LOD */ "sample_l", - /* VKD3DSIH_SAMPLE_POS */ "sample_pos", - /* VKD3DSIH_SETP */ "setp", - /* VKD3DSIH_SGE */ "sge", - /* VKD3DSIH_SGN */ "sgn", - /* VKD3DSIH_SINCOS */ "sincos", - /* VKD3DSIH_SLT */ "slt", - /* VKD3DSIH_SQRT */ "sqrt", - /* VKD3DSIH_STORE_RAW */ "store_raw", - /* VKD3DSIH_STORE_STRUCTURED */ "store_structured", - /* VKD3DSIH_STORE_UAV_TYPED */ "store_uav_typed", - /* VKD3DSIH_SUB */ "sub", - /* VKD3DSIH_SWAPC */ "swapc", - /* VKD3DSIH_SWITCH */ "switch", - /* VKD3DSIH_SYNC */ "sync", - /* VKD3DSIH_TEX */ "texld", - /* VKD3DSIH_TEXBEM */ "texbem", - /* VKD3DSIH_TEXBEML */ "texbeml", - /* VKD3DSIH_TEXCOORD */ "texcrd", - /* VKD3DSIH_TEXDEPTH */ "texdepth", - /* VKD3DSIH_TEXDP3 */ "texdp3", - /* VKD3DSIH_TEXDP3TEX */ "texdp3tex", - /* VKD3DSIH_TEXKILL */ "texkill", - /* VKD3DSIH_TEXLDD */ "texldd", - /* VKD3DSIH_TEXLDL */ "texldl", - /* VKD3DSIH_TEXM3x2DEPTH */ "texm3x2depth", - /* VKD3DSIH_TEXM3x2PAD */ "texm3x2pad", - /* VKD3DSIH_TEXM3x2TEX */ "texm3x2tex", - /* VKD3DSIH_TEXM3x3 */ "texm3x3", - /* VKD3DSIH_TEXM3x3DIFF */ "texm3x3diff", - /* VKD3DSIH_TEXM3x3PAD */ "texm3x3pad", - /* VKD3DSIH_TEXM3x3SPEC */ "texm3x3spec", - /* VKD3DSIH_TEXM3x3TEX */ "texm3x3tex", - /* VKD3DSIH_TEXM3x3VSPEC */ "texm3x3vspec", - /* VKD3DSIH_TEXREG2AR */ "texreg2ar", - /* VKD3DSIH_TEXREG2GB */ "texreg2gb", - /* VKD3DSIH_TEXREG2RGB */ "texreg2rgb", - /* VKD3DSIH_UBFE */ "ubfe", - /* VKD3DSIH_UDIV */ "udiv", - /* VKD3DSIH_UGE */ "uge", - /* VKD3DSIH_ULT */ "ult", - /* VKD3DSIH_UMAX */ "umax", - /* VKD3DSIH_UMIN */ "umin", - /* VKD3DSIH_UMUL */ "umul", - /* VKD3DSIH_USHR */ "ushr", - /* VKD3DSIH_UTOD */ "utod", - /* VKD3DSIH_UTOF */ "utof", - /* VKD3DSIH_XOR */ "xor", + [VKD3DSIH_ABS ] = "abs", + [VKD3DSIH_ADD ] = "add", + [VKD3DSIH_AND ] = "and", + [VKD3DSIH_ATOMIC_AND ] = "atomic_and", + [VKD3DSIH_ATOMIC_CMP_STORE ] = "atomic_cmp_store", + [VKD3DSIH_ATOMIC_IADD ] = "atomic_iadd", + [VKD3DSIH_ATOMIC_IMAX ] = "atomic_imax", + [VKD3DSIH_ATOMIC_IMIN ] = "atomic_imin", + [VKD3DSIH_ATOMIC_OR ] = "atomic_or", + [VKD3DSIH_ATOMIC_UMAX ] = "atomic_umax", + [VKD3DSIH_ATOMIC_UMIN ] = "atomic_umin", + [VKD3DSIH_ATOMIC_XOR ] = "atomic_xor", + [VKD3DSIH_BEM ] = "bem", + [VKD3DSIH_BFI ] = "bfi", + [VKD3DSIH_BFREV ] = "bfrev", + [VKD3DSIH_BREAK ] = "break", + [VKD3DSIH_BREAKC ] = "breakc", + [VKD3DSIH_BREAKP ] = "breakp", + [VKD3DSIH_BUFINFO ] = "bufinfo", + [VKD3DSIH_CALL ] = "call", + [VKD3DSIH_CALLNZ ] = "callnz", + [VKD3DSIH_CASE ] = "case", + [VKD3DSIH_CMP ] = "cmp", + [VKD3DSIH_CND ] = "cnd", + [VKD3DSIH_CONTINUE ] = "continue", + [VKD3DSIH_CONTINUEP ] = "continuec", + [VKD3DSIH_COUNTBITS ] = "countbits", + [VKD3DSIH_CRS ] = "crs", + [VKD3DSIH_CUT ] = "cut", + [VKD3DSIH_CUT_STREAM ] = "cut_stream", + [VKD3DSIH_DADD ] = "dadd", + [VKD3DSIH_DCL ] = "dcl", + [VKD3DSIH_DCL_CONSTANT_BUFFER ] = "dcl_constantBuffer", + [VKD3DSIH_DCL_FUNCTION_BODY ] = "dcl_function_body", + [VKD3DSIH_DCL_FUNCTION_TABLE ] = "dcl_function_table", + [VKD3DSIH_DCL_GLOBAL_FLAGS ] = "dcl_globalFlags", + [VKD3DSIH_DCL_GS_INSTANCES ] = "dcl_gs_instances", + [VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT] = "dcl_hs_fork_phase_instance_count", + [VKD3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT] = "dcl_hs_join_phase_instance_count", + [VKD3DSIH_DCL_HS_MAX_TESSFACTOR ] = "dcl_hs_max_tessfactor", + [VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER ] = "dcl_immediateConstantBuffer", + [VKD3DSIH_DCL_INDEX_RANGE ] = "dcl_index_range", + [VKD3DSIH_DCL_INDEXABLE_TEMP ] = "dcl_indexableTemp", + [VKD3DSIH_DCL_INPUT ] = "dcl_input", + [VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT ] = "dcl_input_control_point_count", + [VKD3DSIH_DCL_INPUT_PRIMITIVE ] = "dcl_inputPrimitive", + [VKD3DSIH_DCL_INPUT_PS ] = "dcl_input_ps", + [VKD3DSIH_DCL_INPUT_PS_SGV ] = "dcl_input_ps_sgv", + [VKD3DSIH_DCL_INPUT_PS_SIV ] = "dcl_input_ps_siv", + [VKD3DSIH_DCL_INPUT_SGV ] = "dcl_input_sgv", + [VKD3DSIH_DCL_INPUT_SIV ] = "dcl_input_siv", + [VKD3DSIH_DCL_INTERFACE ] = "dcl_interface", + [VKD3DSIH_DCL_OUTPUT ] = "dcl_output", + [VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT ] = "dcl_output_control_point_count", + [VKD3DSIH_DCL_OUTPUT_SIV ] = "dcl_output_siv", + [VKD3DSIH_DCL_OUTPUT_TOPOLOGY ] = "dcl_outputTopology", + [VKD3DSIH_DCL_RESOURCE_RAW ] = "dcl_resource_raw", + [VKD3DSIH_DCL_RESOURCE_STRUCTURED ] = "dcl_resource_structured", + [VKD3DSIH_DCL_SAMPLER ] = "dcl_sampler", + [VKD3DSIH_DCL_STREAM ] = "dcl_stream", + [VKD3DSIH_DCL_TEMPS ] = "dcl_temps", + [VKD3DSIH_DCL_TESSELLATOR_DOMAIN ] = "dcl_tessellator_domain", + [VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE] = "dcl_tessellator_output_primitive", + [VKD3DSIH_DCL_TESSELLATOR_PARTITIONING ] = "dcl_tessellator_partitioning", + [VKD3DSIH_DCL_TGSM_RAW ] = "dcl_tgsm_raw", + [VKD3DSIH_DCL_TGSM_STRUCTURED ] = "dcl_tgsm_structured", + [VKD3DSIH_DCL_THREAD_GROUP ] = "dcl_thread_group", + [VKD3DSIH_DCL_UAV_RAW ] = "dcl_uav_raw", + [VKD3DSIH_DCL_UAV_STRUCTURED ] = "dcl_uav_structured", + [VKD3DSIH_DCL_UAV_TYPED ] = "dcl_uav_typed", + [VKD3DSIH_DCL_VERTICES_OUT ] = "dcl_maxOutputVertexCount", + [VKD3DSIH_DDIV ] = "ddiv", + [VKD3DSIH_DEF ] = "def", + [VKD3DSIH_DEFAULT ] = "default", + [VKD3DSIH_DEFB ] = "defb", + [VKD3DSIH_DEFI ] = "defi", + [VKD3DSIH_DEQ ] = "deq", + [VKD3DSIH_DFMA ] = "dfma", + [VKD3DSIH_DGE ] = "dge", + [VKD3DSIH_DIV ] = "div", + [VKD3DSIH_DLT ] = "dlt", + [VKD3DSIH_DMAX ] = "dmax", + [VKD3DSIH_DMIN ] = "dmin", + [VKD3DSIH_DMOV ] = "dmov", + [VKD3DSIH_DMOVC ] = "dmovc", + [VKD3DSIH_DMUL ] = "dmul", + [VKD3DSIH_DNE ] = "dne", + [VKD3DSIH_DP2 ] = "dp2", + [VKD3DSIH_DP2ADD ] = "dp2add", + [VKD3DSIH_DP3 ] = "dp3", + [VKD3DSIH_DP4 ] = "dp4", + [VKD3DSIH_DRCP ] = "drcp", + [VKD3DSIH_DST ] = "dst", + [VKD3DSIH_DSX ] = "dsx", + [VKD3DSIH_DSX_COARSE ] = "deriv_rtx_coarse", + [VKD3DSIH_DSX_FINE ] = "deriv_rtx_fine", + [VKD3DSIH_DSY ] = "dsy", + [VKD3DSIH_DSY_COARSE ] = "deriv_rty_coarse", + [VKD3DSIH_DSY_FINE ] = "deriv_rty_fine", + [VKD3DSIH_DTOF ] = "dtof", + [VKD3DSIH_DTOI ] = "dtoi", + [VKD3DSIH_DTOU ] = "dtou", + [VKD3DSIH_ELSE ] = "else", + [VKD3DSIH_EMIT ] = "emit", + [VKD3DSIH_EMIT_STREAM ] = "emit_stream", + [VKD3DSIH_ENDIF ] = "endif", + [VKD3DSIH_ENDLOOP ] = "endloop", + [VKD3DSIH_ENDREP ] = "endrep", + [VKD3DSIH_ENDSWITCH ] = "endswitch", + [VKD3DSIH_EQ ] = "eq", + [VKD3DSIH_EVAL_CENTROID ] = "eval_centroid", + [VKD3DSIH_EVAL_SAMPLE_INDEX ] = "eval_sample_index", + [VKD3DSIH_EXP ] = "exp", + [VKD3DSIH_EXPP ] = "expp", + [VKD3DSIH_F16TOF32 ] = "f16tof32", + [VKD3DSIH_F32TOF16 ] = "f32tof16", + [VKD3DSIH_FCALL ] = "fcall", + [VKD3DSIH_FIRSTBIT_HI ] = "firstbit_hi", + [VKD3DSIH_FIRSTBIT_LO ] = "firstbit_lo", + [VKD3DSIH_FIRSTBIT_SHI ] = "firstbit_shi", + [VKD3DSIH_FRC ] = "frc", + [VKD3DSIH_FTOD ] = "ftod", + [VKD3DSIH_FTOI ] = "ftoi", + [VKD3DSIH_FTOU ] = "ftou", + [VKD3DSIH_GATHER4 ] = "gather4", + [VKD3DSIH_GATHER4_C ] = "gather4_c", + [VKD3DSIH_GATHER4_PO ] = "gather4_po", + [VKD3DSIH_GATHER4_PO_C ] = "gather4_po_c", + [VKD3DSIH_GE ] = "ge", + [VKD3DSIH_HS_CONTROL_POINT_PHASE ] = "hs_control_point_phase", + [VKD3DSIH_HS_DECLS ] = "hs_decls", + [VKD3DSIH_HS_FORK_PHASE ] = "hs_fork_phase", + [VKD3DSIH_HS_JOIN_PHASE ] = "hs_join_phase", + [VKD3DSIH_IADD ] = "iadd", + [VKD3DSIH_IBFE ] = "ibfe", + [VKD3DSIH_IEQ ] = "ieq", + [VKD3DSIH_IF ] = "if", + [VKD3DSIH_IFC ] = "ifc", + [VKD3DSIH_IGE ] = "ige", + [VKD3DSIH_ILT ] = "ilt", + [VKD3DSIH_IMAD ] = "imad", + [VKD3DSIH_IMAX ] = "imax", + [VKD3DSIH_IMIN ] = "imin", + [VKD3DSIH_IMM_ATOMIC_ALLOC ] = "imm_atomic_alloc", + [VKD3DSIH_IMM_ATOMIC_AND ] = "imm_atomic_and", + [VKD3DSIH_IMM_ATOMIC_CMP_EXCH ] = "imm_atomic_cmp_exch", + [VKD3DSIH_IMM_ATOMIC_CONSUME ] = "imm_atomic_consume", + [VKD3DSIH_IMM_ATOMIC_EXCH ] = "imm_atomic_exch", + [VKD3DSIH_IMM_ATOMIC_IADD ] = "imm_atomic_iadd", + [VKD3DSIH_IMM_ATOMIC_IMAX ] = "imm_atomic_imax", + [VKD3DSIH_IMM_ATOMIC_IMIN ] = "imm_atomic_imin", + [VKD3DSIH_IMM_ATOMIC_OR ] = "imm_atomic_or", + [VKD3DSIH_IMM_ATOMIC_UMAX ] = "imm_atomic_umax", + [VKD3DSIH_IMM_ATOMIC_UMIN ] = "imm_atomic_umin", + [VKD3DSIH_IMM_ATOMIC_XOR ] = "imm_atomic_xor", + [VKD3DSIH_IMUL ] = "imul", + [VKD3DSIH_INE ] = "ine", + [VKD3DSIH_INEG ] = "ineg", + [VKD3DSIH_ISHL ] = "ishl", + [VKD3DSIH_ISHR ] = "ishr", + [VKD3DSIH_ITOD ] = "itod", + [VKD3DSIH_ITOF ] = "itof", + [VKD3DSIH_LABEL ] = "label", + [VKD3DSIH_LD ] = "ld", + [VKD3DSIH_LD2DMS ] = "ld2dms", + [VKD3DSIH_LD_RAW ] = "ld_raw", + [VKD3DSIH_LD_STRUCTURED ] = "ld_structured", + [VKD3DSIH_LD_UAV_TYPED ] = "ld_uav_typed", + [VKD3DSIH_LIT ] = "lit", + [VKD3DSIH_LOD ] = "lod", + [VKD3DSIH_LOG ] = "log", + [VKD3DSIH_LOGP ] = "logp", + [VKD3DSIH_LOOP ] = "loop", + [VKD3DSIH_LRP ] = "lrp", + [VKD3DSIH_LT ] = "lt", + [VKD3DSIH_M3x2 ] = "m3x2", + [VKD3DSIH_M3x3 ] = "m3x3", + [VKD3DSIH_M3x4 ] = "m3x4", + [VKD3DSIH_M4x3 ] = "m4x3", + [VKD3DSIH_M4x4 ] = "m4x4", + [VKD3DSIH_MAD ] = "mad", + [VKD3DSIH_MAX ] = "max", + [VKD3DSIH_MIN ] = "min", + [VKD3DSIH_MOV ] = "mov", + [VKD3DSIH_MOVA ] = "mova", + [VKD3DSIH_MOVC ] = "movc", + [VKD3DSIH_MUL ] = "mul", + [VKD3DSIH_NE ] = "ne", + [VKD3DSIH_NOP ] = "nop", + [VKD3DSIH_NOT ] = "not", + [VKD3DSIH_NRM ] = "nrm", + [VKD3DSIH_OR ] = "or", + [VKD3DSIH_PHASE ] = "phase", + [VKD3DSIH_POW ] = "pow", + [VKD3DSIH_RCP ] = "rcp", + [VKD3DSIH_REP ] = "rep", + [VKD3DSIH_RESINFO ] = "resinfo", + [VKD3DSIH_RET ] = "ret", + [VKD3DSIH_RETP ] = "retp", + [VKD3DSIH_ROUND_NE ] = "round_ne", + [VKD3DSIH_ROUND_NI ] = "round_ni", + [VKD3DSIH_ROUND_PI ] = "round_pi", + [VKD3DSIH_ROUND_Z ] = "round_z", + [VKD3DSIH_RSQ ] = "rsq", + [VKD3DSIH_SAMPLE ] = "sample", + [VKD3DSIH_SAMPLE_B ] = "sample_b", + [VKD3DSIH_SAMPLE_C ] = "sample_c", + [VKD3DSIH_SAMPLE_C_LZ ] = "sample_c_lz", + [VKD3DSIH_SAMPLE_GRAD ] = "sample_d", + [VKD3DSIH_SAMPLE_INFO ] = "sample_info", + [VKD3DSIH_SAMPLE_LOD ] = "sample_l", + [VKD3DSIH_SAMPLE_POS ] = "sample_pos", + [VKD3DSIH_SETP ] = "setp", + [VKD3DSIH_SGE ] = "sge", + [VKD3DSIH_SGN ] = "sgn", + [VKD3DSIH_SINCOS ] = "sincos", + [VKD3DSIH_SLT ] = "slt", + [VKD3DSIH_SQRT ] = "sqrt", + [VKD3DSIH_STORE_RAW ] = "store_raw", + [VKD3DSIH_STORE_STRUCTURED ] = "store_structured", + [VKD3DSIH_STORE_UAV_TYPED ] = "store_uav_typed", + [VKD3DSIH_SUB ] = "sub", + [VKD3DSIH_SWAPC ] = "swapc", + [VKD3DSIH_SWITCH ] = "switch", + [VKD3DSIH_SYNC ] = "sync", + [VKD3DSIH_TEX ] = "texld", + [VKD3DSIH_TEXBEM ] = "texbem", + [VKD3DSIH_TEXBEML ] = "texbeml", + [VKD3DSIH_TEXCOORD ] = "texcrd", + [VKD3DSIH_TEXDEPTH ] = "texdepth", + [VKD3DSIH_TEXDP3 ] = "texdp3", + [VKD3DSIH_TEXDP3TEX ] = "texdp3tex", + [VKD3DSIH_TEXKILL ] = "texkill", + [VKD3DSIH_TEXLDD ] = "texldd", + [VKD3DSIH_TEXLDL ] = "texldl", + [VKD3DSIH_TEXM3x2DEPTH ] = "texm3x2depth", + [VKD3DSIH_TEXM3x2PAD ] = "texm3x2pad", + [VKD3DSIH_TEXM3x2TEX ] = "texm3x2tex", + [VKD3DSIH_TEXM3x3 ] = "texm3x3", + [VKD3DSIH_TEXM3x3DIFF ] = "texm3x3diff", + [VKD3DSIH_TEXM3x3PAD ] = "texm3x3pad", + [VKD3DSIH_TEXM3x3SPEC ] = "texm3x3spec", + [VKD3DSIH_TEXM3x3TEX ] = "texm3x3tex", + [VKD3DSIH_TEXM3x3VSPEC ] = "texm3x3vspec", + [VKD3DSIH_TEXREG2AR ] = "texreg2ar", + [VKD3DSIH_TEXREG2GB ] = "texreg2gb", + [VKD3DSIH_TEXREG2RGB ] = "texreg2rgb", + [VKD3DSIH_UBFE ] = "ubfe", + [VKD3DSIH_UDIV ] = "udiv", + [VKD3DSIH_UGE ] = "uge", + [VKD3DSIH_ULT ] = "ult", + [VKD3DSIH_UMAX ] = "umax", + [VKD3DSIH_UMIN ] = "umin", + [VKD3DSIH_UMUL ] = "umul", + [VKD3DSIH_USHR ] = "ushr", + [VKD3DSIH_UTOD ] = "utod", + [VKD3DSIH_UTOF ] = "utof", + [VKD3DSIH_XOR ] = "xor", }; static const struct -- 2.34.1

4 7

[PATCH vkd3d 1/5] vkd3d: Return S_OK from ID3D12CommandQueue::GetClockCalibration().
by Conor McCarthy 13 Jan '22

13 Jan '22

UE4, at least in Psychonauts 2, catches failure of this function. It works if zeros are returned. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9fbde800..6ad4fa18 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6225,10 +6225,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D1 static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetClockCalibration(ID3D12CommandQueue *iface, UINT64 *gpu_timestamp, UINT64 *cpu_timestamp) { - FIXME("iface %p, gpu_timestamp %p, cpu_timestamp %p stub!\n", + TRACE("iface %p, gpu_timestamp %p, cpu_timestamp %p.\n", iface, gpu_timestamp, cpu_timestamp); - return E_NOTIMPL; + WARN("Setting timestamps to zero.\n"); + *gpu_timestamp = 0; + *cpu_timestamp = 0; + + return S_OK; } static D3D12_COMMAND_QUEUE_DESC * STDMETHODCALLTYPE d3d12_command_queue_GetDesc(ID3D12CommandQueue *iface, -- 2.34.1

3 10

[PATCH 1/2] dwrite/tests: Add some tests for Segoe UI font family.
by Dmitry Timoshkov 13 Jan '22

13 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/tests/layout.c | 139 +++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3fe149927ca..c242155cce3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6489,6 +6489,144 @@ if (SUCCEEDED(hr)) IDWriteFactory_Release(factory); } +#define get_font_name(a, b, c) get_font_name_(a, b, c, __LINE__) +static void get_font_name_(IDWriteFont *font, WCHAR *name, UINT32 size, int line) +{ + HRESULT hr; + IDWriteFontFamily *family; + IDWriteLocalizedStrings *names; + UINT32 index; + BOOL exists; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + ok_(__FILE__, line)(index != UINT_MAX && exists, "name was not found\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_SegoeUI(void) +{ + static const WCHAR *families[] = { L"Tahoma", L"Segoe UI", NULL }; + static const WCHAR text[] = { 0x25d4, 0 }; + HRESULT hr; + IDWriteFactory2 *factory; + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFont *font; + IDWriteFontFallback *fallback; + UINT32 index, count, i, mappedlength; + WCHAR name[256]; + BOOL exists, found; + FLOAT scale; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, (IUnknown **)&factory); + if (hr != S_OK) + { + win_skip("IDWriteFactory2 is not supported\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", &index, &exists); + ok(hr == S_OK, "got %#x\n", hr); + if (!exists) + { + skip("Segoe UI is not installed\n"); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); + return; + } + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got %#x\n", hr); + + count = IDWriteFontFamily_GetFontCount(family); + trace("family Segoe UI has %u fonts\n", count); + + found = FALSE; + + for (i = 0; i < count; i++) + { + hr = IDWriteFontFamily_GetFont(family, i, &font); + ok(hr == S_OK, "got %#x\n", hr); + + get_font_name(font, name, ARRAY_SIZE(name)); + if (!wcscmp(name, L"Segoe UI Symbol")) + found = TRUE; + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); + ok(!exists, "%u: %s has character 0x25d4\n", i, wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); + + IDWriteFontFamily_Release(family); + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "got %#x\n", hr); + + g_source = text; + + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, L"Segoe UI", DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got %#x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + + for (i = 0; i < ARRAY_SIZE(families); i++) + { + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine_if(families[i] == NULL) + ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); + if (hr != S_OK) continue; + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); +todo_wine + ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6544,6 +6682,7 @@ START_TEST(layout) test_text_format_axes(); test_layout_range_length(); test_HitTestTextRange(); + test_SegoeUI(); IDWriteFactory_Release(factory); } -- 2.34.1

2 6

[PATCH 1/7] mfplat: Remove duplicated space in spec
by André Zwing 13 Jan '22

13 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/mfplat/mfplat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 6cc3fb07105..61091a0d8a3 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -162,7 +162,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) +@ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stdcall MFTRegisterLocalByCLSID(ptr ptr wstr long long ptr long ptr) @ stdcall MFTUnregister(int128) @ stdcall MFTUnregisterLocal(ptr) -- 2.25.1

2 7

[PATCH] comctl32: LVM_INSERTITEM handler should send the LVN_ITEMCHANGING/LVN_ITEMCHANGED notifications.
by Dmitry Timoshkov 13 Jan '22

13 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/listview.c | 9 +++------ dlls/comctl32/tests/listview.c | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9e35f7879b7..414bd686f27 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4259,11 +4259,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - /* Send LVN_ITEMCHANGING notification, if the item is not being inserted - and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications + /* Send LVN_ITEMCHANGING notification: + if we are _NOT_ virtual (LVS_OWNERDATA), and change notifications are enabled. Even nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) + if (lpItem && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4351,9 +4351,6 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } } - /* if we're inserting the item, we're done */ - if (isNew) return TRUE; - /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..ea3a8b9bcde 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -422,6 +422,13 @@ static const struct message parent_insert_focused_seq[] = { { 0 } }; +static const struct message parent_insert_selected_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + static const struct message parent_report_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, @@ -5942,7 +5949,7 @@ static void test_insertitem(void) ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -5959,6 +5966,19 @@ static void test_insertitem(void) state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* insert item 3 */ + item.mask = LVIF_STATE; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + item.iItem = 3; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 3, "got %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", FALSE); + DestroyWindow(hwnd); } -- 2.34.1

2 2

[PATCH v2] crypt32: Increase maximum object encode length.
by Paul Gofman 13 Jan '22

13 Jan '22

E. g., DigiCert CRL file is currently 35MB. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - add a FIXME if limit checks fails. dlls/crypt32/decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6873cebeae4..d4a13a55a1b 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -47,7 +47,7 @@ #include "crypt32_private.h" /* This is a bit arbitrary, but to set some limit: */ -#define MAX_ENCODED_LEN 0x02000000 +#define MAX_ENCODED_LEN 0x04000000 #define ASN_FLAGS_MASK 0xe0 #define ASN_TYPE_MASK 0x1f @@ -6411,6 +6411,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, } if (cbEncoded > MAX_ENCODED_LEN) { + FIXME_(crypt)("Returning CRYPT_E_ASN1_LARGE, cbEncoded %u.\n", cbEncoded); SetLastError(CRYPT_E_ASN1_LARGE); return FALSE; } -- 2.34.1

1 0

[PATCH] wined3d: Do not iterate over multiple layers when clearing 3D UAVs.
by Zebediah Figura 13 Jan '22

13 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52390 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I'd argue this demonstrates overloading the layer_count parameter as depth is error-prone, and we should probably avoid it... dlls/wined3d/view.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d6f58309b32..efa98ea13eb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1504,11 +1504,20 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view format_gl = wined3d_format_gl(resource->format); texture_gl = wined3d_texture_gl(texture_from_resource(resource)); - layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; - base_layer = view_gl->v.desc.u.texture.layer_idx; base_level = view_gl->v.desc.u.texture.level_idx; + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + layer_count = 1; + base_layer = 0; + } + else + { + layer_count = view_gl->v.desc.u.texture.layer_count; + base_layer = view_gl->v.desc.u.texture.layer_idx; + } + if (format_gl->f.byte_count <= 4 && !fp) { gl_format = format_gl->format; -- 2.34.1

3 2

[PATCH] dxgi: Handle WINED3D_BIND_UNORDERED_ACCESS in dxgi_usage_from_wined3d_bind_flags().
by Andrey Gusev 13 Jan '22

13 Jan '22

Used by Deus Ex: Human Revolution. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dxgi/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 35beaa4be1f..ee891e70b10 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -493,8 +493,10 @@ DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) dxgi_usage |= DXGI_USAGE_SHADER_INPUT; if (wined3d_bind_flags & WINED3D_BIND_RENDER_TARGET) dxgi_usage |= DXGI_USAGE_RENDER_TARGET_OUTPUT; + if (wined3d_bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + dxgi_usage |= DXGI_USAGE_UNORDERED_ACCESS; - wined3d_bind_flags &= ~(WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_RENDER_TARGET); + wined3d_bind_flags &= ~(WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_UNORDERED_ACCESS); if (wined3d_bind_flags) FIXME("Unhandled wined3d bind flags %#x.\n", wined3d_bind_flags); return dxgi_usage; -- 2.34.1

3 2

[PATCH] d3d11/tests: Test UAV clears of 3D view with nontrivial depth.
by Zebediah Figura 13 Jan '22

13 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4a6da94aaae..2d26558568c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16555,8 +16555,7 @@ static void test_clear_image_unordered_access_view(void) { {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2D, FALSE}, {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2DARRAY, TRUE }, - /* Expected behaviour with partial layer coverage is unclear. */ - {D3D11_RESOURCE_DIMENSION_TEXTURE3D, D3D11_UAV_DIMENSION_TEXTURE3D, FALSE}, + {D3D11_RESOURCE_DIMENSION_TEXTURE3D, D3D11_UAV_DIMENSION_TEXTURE3D, TRUE }, }; if (!init_test_context(&test_context, NULL)) @@ -16575,13 +16574,15 @@ static void test_clear_image_unordered_access_view(void) { for (i = 0; i < ARRAY_SIZE(tests); ++i) { - winetest_push_context("Dim %u, Test %u", d, i); - if (tests[i].image_layers > 1 && !uav_dimensions[d].is_layered) - { - winetest_pop_context(); continue; - } + + /* Expected behaviour with partial layer coverage is unclear. */ + if (uav_dimensions[d].view_dim == D3D11_UAV_DIMENSION_TEXTURE3D + && tests[i].image_layers != tests[i].layer_count) + continue; + + winetest_push_context("Dim %u, Test %u", d, i); resource_desc.dimension = uav_dimensions[d].resource_dim; resource_desc.depth_or_array_size = tests[i].image_layers; -- 2.34.1

3 2

[PATCH] dinput: Reset button state for each report read.
by Rémi Bernon 13 Jan '22

13 Jan '22

As we loop on ReadFile success we may read multiple reports at once, but we never reset buttons in the enumeration params. The pressed buttons are returned by HidP_GetUsagesEx and any other button must be cleared. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52387 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 29cf3afcdd4..3e47ec9e23c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1213,8 +1213,8 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, index, count, report_len = impl->caps.InputReportByteLength; DIDATAFORMAT *format = impl->base.device_format; - struct parse_device_state_params params = {{0}}; char *report_buf = impl->input_report_buf; + struct parse_device_state_params params; struct hid_joystick_effect *effect; DWORD device_state, effect_state; USAGE_AND_PAGE *usages; @@ -1252,6 +1252,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) params.time = GetCurrentTime(); params.seq = impl->base.dinput->evsequence++; memcpy( params.old_state, impl->base.device_state, format->dwDataSize ); + memset( params.buttons, 0, sizeof(params.buttons) ); memset( impl->base.device_state, 0, format->dwDataSize ); while (count--) -- 2.34.1

1 0

[PATCH] crypt32: Increase maximum object encode length.
by Paul Gofman 13 Jan '22

13 Jan '22

E. g., DigiCert CRL file is currently 35MB. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6873cebeae4..a7f7af82911 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -47,7 +47,7 @@ #include "crypt32_private.h" /* This is a bit arbitrary, but to set some limit: */ -#define MAX_ENCODED_LEN 0x02000000 +#define MAX_ENCODED_LEN 0x04000000 #define ASN_FLAGS_MASK 0xe0 #define ASN_TYPE_MASK 0x1f -- 2.34.1

1 0

[PATCH v3 1/4] dinput/tests: Add some tests for DIERR_INPUTLOST conditions.
by Rémi Bernon 13 Jan '22

13 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: * Keep STATUS_UNPLUGGED after all, window foreground loss doesn't cause DIERR_INPUTLOST to be returned (as mouse tests suggest). * Set STATUS_UNPLUGGED and return DIERR_INPUTLOST only when device read fails, split the patch to make it more obvious that only the HID joystick logic is changed. dlls/dinput/tests/joystick8.c | 126 ++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d06b56cbf8c..7590835fe55 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2741,6 +2742,127 @@ done: return device != NULL; } +static void test_input_lost( DWORD version ) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 1, + }; + static const DIPROPDWORD buffer_size = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }, + .dwData = UINT_MAX, + }; + + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device = NULL; + ULONG ref, count, size; + DIJOYSTATE2 state; + HRESULT hr; + + winetest_push_context( "%#x", version ); + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND ); + ok( hr == DI_OK, "SetCooperativeLevel returned %#x\n", hr ); + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &buffer_size.diph ); + ok( hr == DI_OK, "SetProperty returned %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DI_OK, "GetDeviceState returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + count = 1; + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( count == 0, "got %u expected %u\n", count, 0 ); + + pnp_driver_stop(); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Poll( device ); + todo_wine + ok( hr == DIERR_INPUTLOST, "Poll returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); + + dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + winetest_pop_context(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -2758,6 +2880,10 @@ START_TEST( joystick8 ) test_simple_joystick( 0x500 ); test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + + test_input_lost( 0x500 ); + test_input_lost( 0x700 ); + test_input_lost( 0x800 ); } CoUninitialize(); -- 2.34.1

1 3

[PATCH v2 1/3] dinput/tests: Add some tests for DIERR_INPUTLOST conditions.
by Rémi Bernon 13 Jan '22

13 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 126 ++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d06b56cbf8c..7590835fe55 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2741,6 +2742,127 @@ done: return device != NULL; } +static void test_input_lost( DWORD version ) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 1, + }; + static const DIPROPDWORD buffer_size = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }, + .dwData = UINT_MAX, + }; + + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device = NULL; + ULONG ref, count, size; + DIJOYSTATE2 state; + HRESULT hr; + + winetest_push_context( "%#x", version ); + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND ); + ok( hr == DI_OK, "SetCooperativeLevel returned %#x\n", hr ); + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &buffer_size.diph ); + ok( hr == DI_OK, "SetProperty returned %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DI_OK, "GetDeviceState returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + count = 1; + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( count == 0, "got %u expected %u\n", count, 0 ); + + pnp_driver_stop(); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Poll( device ); + todo_wine + ok( hr == DIERR_INPUTLOST, "Poll returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); + + dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + winetest_pop_context(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -2758,6 +2880,10 @@ START_TEST( joystick8 ) test_simple_joystick( 0x500 ); test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + + test_input_lost( 0x500 ); + test_input_lost( 0x700 ); + test_input_lost( 0x800 ); } CoUninitialize(); -- 2.34.1

2 4

[PATCH 1/3] dinput/tests: Add some tests for DIERR_INPUTLOST conditions.
by Rémi Bernon 13 Jan '22

13 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 126 ++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d06b56cbf8c..7590835fe55 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2741,6 +2742,127 @@ done: return device != NULL; } +static void test_input_lost( DWORD version ) +{ +#include "psh_hid_macros.h" + static const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 1, + }; + static const DIPROPDWORD buffer_size = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }, + .dwData = UINT_MAX, + }; + + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device = NULL; + ULONG ref, count, size; + DIJOYSTATE2 state; + HRESULT hr; + + winetest_push_context( "%#x", version ); + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND ); + ok( hr == DI_OK, "SetCooperativeLevel returned %#x\n", hr ); + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &buffer_size.diph ); + ok( hr == DI_OK, "SetProperty returned %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DI_OK, "GetDeviceState returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + count = 1; + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( count == 0, "got %u expected %u\n", count, 0 ); + + pnp_driver_stop(); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Poll( device ); + todo_wine + ok( hr == DIERR_INPUTLOST, "Poll returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); + + dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + winetest_pop_context(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -2758,6 +2880,10 @@ START_TEST( joystick8 ) test_simple_joystick( 0x500 ); test_simple_joystick( 0x700 ); test_simple_joystick( 0x800 ); + + test_input_lost( 0x500 ); + test_input_lost( 0x700 ); + test_input_lost( 0x800 ); } CoUninitialize(); -- 2.34.1

2 4

[PATCH] mfplat: Add MECapture* events to tracing.
by Nikolay Sivov 13 Jan '22

13 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 6 ++++++ include/mfobjects.idl | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 978340a7ece..f36c960f852 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2134,6 +2134,12 @@ static const char *debugstr_eventid(DWORD event) X(MEAudioSessionFormatChanged), X(MEAudioSessionDisconnected), X(MEAudioSessionExclusiveModeOverride), + X(MECaptureAudioSessionVolumeChanged), + X(MECaptureAudioSessionDeviceRemoved), + X(MECaptureAudioSessionFormatChanged), + X(MECaptureAudioSessionDisconnected), + X(MECaptureAudioSessionExclusiveModeOverride), + X(MECaptureAudioSessionServerShutdown), X(METrustUnknown), X(MEPolicyChanged), X(MEContentProtectionMessage), diff --git a/include/mfobjects.idl b/include/mfobjects.idl index b2d0e5d06ec..640cae88af6 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -579,6 +579,13 @@ enum { MEAudioSessionDisconnected = 320, MEAudioSessionExclusiveModeOverride = 321, MESinkV1Anchor = MEAudioSessionExclusiveModeOverride, + MECaptureAudioSessionVolumeChanged = 322, + MECaptureAudioSessionDeviceRemoved = 323, + MECaptureAudioSessionFormatChanged = 324, + MECaptureAudioSessionDisconnected = 325, + MECaptureAudioSessionExclusiveModeOverride = 326, + MECaptureAudioSessionServerShutdown = 327, + MESinkV2Anchor = MECaptureAudioSessionServerShutdown, METrustUnknown = 400, MEPolicyChanged = 401, MEContentProtectionMessage = 402, -- 2.34.1

1 0

[PATCH] wininet/tests: Add more tests for InternetTimeToSystemTime().
by Ziqing Hui 13 Jan '22

13 Jan '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/wininet/tests/internet.c | 105 +++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8513aabe174..4c2facb635a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -28,6 +28,7 @@ #include "winineti.h" #include "winerror.h" #include "winreg.h" +#include "winnls.h" #include "wine/test.h" @@ -896,60 +897,73 @@ static void InternetTimeFromSystemTimeW_test(void) error ); } -static void InternetTimeToSystemTimeA_test(void) +static void test_InternetTimeToSystemTime(void) { BOOL ret; + unsigned int i; SYSTEMTIME time; - static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 }; - static const char string[] = "Fri, 07 Jan 2005 12:06:35 GMT"; - static const char string2[] = " fri 7 jan 2005 12 06 35"; + WCHAR buffer[64]; + static const SYSTEMTIME expect1 = { 2005, 1, 5, 7, 12, 6, 35, 0 }; + static const SYSTEMTIME expect2 = { 2022, 1, 2, 11, 11, 13, 5, 0 }; - ret = pInternetTimeToSystemTimeA( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); + static const struct test_data + { + const char *string; + const SYSTEMTIME *expect; + BOOL match; + BOOL todo; + } + test_data[] = + { + { "Fri, 07 Jan 2005 12:06:35 GMT", &expect1, TRUE }, + { " fri, 7 jan 2005 12 06 35", &expect1, TRUE }, + { "Fri, 07-01-2005 12:06:35", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE, TRUE }, + { "2, 11 01 2022 11 13 05", &expect2, TRUE, TRUE }, + { "2, 11-01-2022 11#13^05", &expect2, TRUE, TRUE }, + { "2, 11*01/2022 11+13=05", &expect2, TRUE, TRUE }, + { "2, 11-Jan-2022 11:13:05", &expect2, TRUE, TRUE }, + { "Fr", NULL, FALSE }, + }; - ret = pInternetTimeToSystemTimeA( string2, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); -} + ret = pInternetTimeToSystemTimeA(NULL, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeA(NULL, &time, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeW(NULL, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); + ret = pInternetTimeToSystemTimeW(NULL, &time, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); -static void InternetTimeToSystemTimeW_test(void) -{ - BOOL ret; - SYSTEMTIME time; - static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 }; - static const WCHAR string[] = { 'F','r','i',',',' ','0','7',' ','J','a','n',' ','2','0','0','5',' ', - '1','2',':','0','6',':','3','5',' ','G','M','T',0 }; - static const WCHAR string2[] = { ' ','f','r','i',' ','7',' ','j','a','n',' ','2','0','0','5',' ', - '1','2',' ','0','6',' ','3','5',0 }; - static const WCHAR string3[] = { 'F','r',0 }; - - ret = pInternetTimeToSystemTimeW( NULL, NULL, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeW( NULL, &time, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeW( string, NULL, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + const struct test_data *test = &test_data[i]; + winetest_push_context("Test %u", i); - ret = pInternetTimeToSystemTimeW( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + memset(&time, 0, sizeof(time)); + ret = pInternetTimeToSystemTimeA(test->string, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeA(test->string, &time, 0); + ok(ret, "InternetTimeToSystemTimeA failed: %u.\n", GetLastError()); + todo_wine_if(test->todo) + ok(!test->match || !memcmp(&time, test->expect, sizeof(*test->expect)), + "Got unexpected system time.\n"); - ret = pInternetTimeToSystemTimeW( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + MultiByteToWideChar(CP_ACP, 0, test->string, -1, buffer, ARRAY_SIZE(buffer)); - ret = pInternetTimeToSystemTimeW( string2, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + memset(&time, 0, sizeof(time)); + ret = pInternetTimeToSystemTimeW(buffer, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); + ret = pInternetTimeToSystemTimeW(buffer, &time, 0); + ok(ret, "InternetTimeToSystemTimeW failed: %u.\n", GetLastError()); + todo_wine_if(test->todo) + ok(!test->match || !memcmp(&time, test->expect, sizeof(*test->expect)), + "Got unexpected system time.\n"); - ret = pInternetTimeToSystemTimeW( string3, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + winetest_pop_context(); + } } static void test_IsDomainLegalCookieDomainW(void) @@ -1922,8 +1936,7 @@ START_TEST(internet) { InternetTimeFromSystemTimeA_test(); InternetTimeFromSystemTimeW_test(); - InternetTimeToSystemTimeA_test(); - InternetTimeToSystemTimeW_test(); + test_InternetTimeToSystemTime(); } if (pIsDomainLegalCookieDomainW && ((void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA || -- 2.25.1

1 0

[PATCH] opencl: Use types with consistent alignment for unixlib params structures.
by Zebediah Figura 13 Jan '22

13 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52389 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/opencl/make_opencl | 54 +++++--- dlls/opencl/unixlib.h | 278 ++++++++++++++++++++-------------------- 2 files changed, 173 insertions(+), 159 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 7e88b6daaaf..088120c8081 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -37,21 +37,22 @@ my %core_categories = (); my %arg_types = ( - "cl_bitfield" => [ "int64", "wine_dbgstr_longlong(%s)" ], - "double" => [ "double", "%.16e" ], - "float" => [ "float", "%.8e" ], - "int" => [ "long", "%d" ], - "int8_t" => [ "long", "%d" ], - "int16_t" => [ "long", "%d" ], - "int32_t" => [ "long", "%d" ], - "int64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], - "intptr_t" => [ "long", "%Id" ], - "size_t" => [ "long", "%Iu" ], - "uint8_t" => [ "long", "%u" ], - "uint16_t" => [ "long", "%u" ], - "uint32_t" => [ "long", "%u" ], - "uint64_t" => [ "int64", "wine_dbgstr_longlong(%s)" ], - "unsigned int" => [ "long", "%u" ], + # spec unixlib format + "cl_bitfield" => [ "int64", "ULONGLONG", "wine_dbgstr_longlong(%s)" ], + "double" => [ "double", "DOUBLE", "%.16e" ], + "float" => [ "float", "float", "%.8e" ], + "int" => [ "long", "int", "%d" ], + "int8_t" => [ "long", "int8_t", "%d" ], + "int16_t" => [ "long", "int16_t", "%d" ], + "int32_t" => [ "long", "int32_t", "%d" ], + "int64_t" => [ "int64", "LONGLONG", "wine_dbgstr_longlong(%s)" ], + "intptr_t" => [ "long", "INT_PTR", "%Id" ], + "size_t" => [ "long", "SIZE_T", "%Iu" ], + "uint8_t" => [ "long", "uint8_t", "%u" ], + "uint16_t" => [ "long", "uint16_t", "%u" ], + "uint32_t" => [ "long", "uint32_t", "%u" ], + "uint64_t" => [ "int64", "ULONGLONG", "wine_dbgstr_longlong(%s)" ], + "unsigned int" => [ "long", "unsigned int", "%u" ], ); my %unsupported_extensions = @@ -99,7 +100,7 @@ sub generate_pe_thunk($$) } elsif (defined $arg_types{$ptype}) { - my $format = ${$arg_types{$ptype}}[1]; + my $format = ${$arg_types{$ptype}}[2]; $trace_arg .= ", " . ($format =~ /^%/ ? $format : "%s"); $trace_call_arg .= ", " . sprintf $format =~ /^%/ ? "%s" : $format, $pname; } @@ -220,10 +221,23 @@ sub get_func_params($$) $params .= " $proto* __retval;\n" unless $proto eq "cl_int"; foreach my $arg (@{$func->[1]}) { + my $ptype = get_arg_type( $arg ); next unless $arg->findnodes("./name"); - (my $argtext = $arg->textContent()) =~ s/ +/ /g; - $argtext =~ s/CL_CALLBACK/WINAPI/g; - $params .= " $argtext;\n"; + my $pname = get_arg_name( $arg ); + (my $param = $arg->textContent()) =~ s/ +/ /g; + $param =~ s/CL_CALLBACK/WINAPI/g; + if ($param =~ /[[*]/) + { + $params .= " $param;\n"; + } + elsif (defined $arg_types{$ptype}) + { + $params .= " ${$arg_types{$ptype}}[1] $pname;\n"; + } + else + { + die "Unknown type %s in %s\n", $param, $name; + } } return $params . "};\n"; } @@ -398,7 +412,7 @@ sub parse_file($) my $basetype = @{$type->findnodes("./type")}[0]; if ($type->textContent() =~ /[[*]/) { - $arg_types{$name} = ["ptr", "%p"]; + $arg_types{$name} = ["ptr", $name, "%p"]; } elsif (defined($basetype) and defined($arg_types{$basetype->textContent})) { diff --git a/dlls/opencl/unixlib.h b/dlls/opencl/unixlib.h index 79968a4daf1..5a9b1556a04 100644 --- a/dlls/opencl/unixlib.h +++ b/dlls/opencl/unixlib.h @@ -3,7 +3,7 @@ struct clBuildProgram_params { cl_program program; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* options; void (WINAPI* pfn_notify)(cl_program program, void* user_data); @@ -13,10 +13,10 @@ struct clBuildProgram_params struct clCompileProgram_params { cl_program program; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* options; - cl_uint num_input_headers; + uint32_t num_input_headers; const cl_program* input_headers; const char** header_include_names; void (WINAPI* pfn_notify)(cl_program program, void* user_data); @@ -27,8 +27,8 @@ struct clCreateBuffer_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; - size_t size; + ULONGLONG flags; + SIZE_T size; void* host_ptr; cl_int* errcode_ret; }; @@ -38,7 +38,7 @@ struct clCreateCommandQueue_params cl_command_queue* __retval; cl_context context; cl_device_id device; - cl_command_queue_properties properties; + ULONGLONG properties; cl_int* errcode_ret; }; @@ -46,7 +46,7 @@ struct clCreateContext_params { cl_context* __retval; const cl_context_properties* properties; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* devices; void (WINAPI* pfn_notify)(const char* errinfo, const void* private_info, size_t cb, void* user_data); void* user_data; @@ -57,7 +57,7 @@ struct clCreateContextFromType_params { cl_context* __retval; const cl_context_properties* properties; - cl_device_type device_type; + ULONGLONG device_type; void (WINAPI* pfn_notify)(const char* errinfo, const void* private_info, size_t cb, void* user_data); void* user_data; cl_int* errcode_ret; @@ -67,7 +67,7 @@ struct clCreateImage_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; + ULONGLONG flags; const cl_image_format* image_format; const cl_image_desc* image_desc; void* host_ptr; @@ -78,11 +78,11 @@ struct clCreateImage2D_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; + ULONGLONG flags; const cl_image_format* image_format; - size_t image_width; - size_t image_height; - size_t image_row_pitch; + SIZE_T image_width; + SIZE_T image_height; + SIZE_T image_row_pitch; void* host_ptr; cl_int* errcode_ret; }; @@ -91,13 +91,13 @@ struct clCreateImage3D_params { cl_mem* __retval; cl_context context; - cl_mem_flags flags; + ULONGLONG flags; const cl_image_format* image_format; - size_t image_width; - size_t image_height; - size_t image_depth; - size_t image_row_pitch; - size_t image_slice_pitch; + SIZE_T image_width; + SIZE_T image_height; + SIZE_T image_depth; + SIZE_T image_row_pitch; + SIZE_T image_slice_pitch; void* host_ptr; cl_int* errcode_ret; }; @@ -113,7 +113,7 @@ struct clCreateKernel_params struct clCreateKernelsInProgram_params { cl_program program; - cl_uint num_kernels; + uint32_t num_kernels; cl_kernel* kernels; cl_uint* num_kernels_ret; }; @@ -122,7 +122,7 @@ struct clCreateProgramWithBinary_params { cl_program* __retval; cl_context context; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const size_t* lengths; const unsigned char** binaries; @@ -134,7 +134,7 @@ struct clCreateProgramWithBuiltInKernels_params { cl_program* __retval; cl_context context; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* kernel_names; cl_int* errcode_ret; @@ -144,7 +144,7 @@ struct clCreateProgramWithSource_params { cl_program* __retval; cl_context context; - cl_uint count; + uint32_t count; const char** strings; const size_t* lengths; cl_int* errcode_ret; @@ -154,9 +154,9 @@ struct clCreateSampler_params { cl_sampler* __retval; cl_context context; - cl_bool normalized_coords; - cl_addressing_mode addressing_mode; - cl_filter_mode filter_mode; + uint32_t normalized_coords; + uint32_t addressing_mode; + uint32_t filter_mode; cl_int* errcode_ret; }; @@ -164,8 +164,8 @@ struct clCreateSubBuffer_params { cl_mem* __retval; cl_mem buffer; - cl_mem_flags flags; - cl_buffer_create_type buffer_create_type; + ULONGLONG flags; + uint32_t buffer_create_type; const void* buffer_create_info; cl_int* errcode_ret; }; @@ -174,7 +174,7 @@ struct clCreateSubDevices_params { cl_device_id in_device; const cl_device_partition_property* properties; - cl_uint num_devices; + uint32_t num_devices; cl_device_id* out_devices; cl_uint* num_devices_ret; }; @@ -194,7 +194,7 @@ struct clEnqueueBarrier_params struct clEnqueueBarrierWithWaitList_params { cl_command_queue command_queue; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -204,10 +204,10 @@ struct clEnqueueCopyBuffer_params cl_command_queue command_queue; cl_mem src_buffer; cl_mem dst_buffer; - size_t src_offset; - size_t dst_offset; - size_t size; - cl_uint num_events_in_wait_list; + SIZE_T src_offset; + SIZE_T dst_offset; + SIZE_T size; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -220,11 +220,11 @@ struct clEnqueueCopyBufferRect_params const size_t* src_origin; const size_t* dst_origin; const size_t* region; - size_t src_row_pitch; - size_t src_slice_pitch; - size_t dst_row_pitch; - size_t dst_slice_pitch; - cl_uint num_events_in_wait_list; + SIZE_T src_row_pitch; + SIZE_T src_slice_pitch; + SIZE_T dst_row_pitch; + SIZE_T dst_slice_pitch; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -234,10 +234,10 @@ struct clEnqueueCopyBufferToImage_params cl_command_queue command_queue; cl_mem src_buffer; cl_mem dst_image; - size_t src_offset; + SIZE_T src_offset; const size_t* dst_origin; const size_t* region; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -250,7 +250,7 @@ struct clEnqueueCopyImage_params const size_t* src_origin; const size_t* dst_origin; const size_t* region; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -262,8 +262,8 @@ struct clEnqueueCopyImageToBuffer_params cl_mem dst_buffer; const size_t* src_origin; const size_t* region; - size_t dst_offset; - cl_uint num_events_in_wait_list; + SIZE_T dst_offset; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -273,10 +273,10 @@ struct clEnqueueFillBuffer_params cl_command_queue command_queue; cl_mem buffer; const void* pattern; - size_t pattern_size; - size_t offset; - size_t size; - cl_uint num_events_in_wait_list; + SIZE_T pattern_size; + SIZE_T offset; + SIZE_T size; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -288,7 +288,7 @@ struct clEnqueueFillImage_params const void* fill_color; const size_t* origin; const size_t* region; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -298,11 +298,11 @@ struct clEnqueueMapBuffer_params void** __retval; cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_map; - cl_map_flags map_flags; - size_t offset; - size_t size; - cl_uint num_events_in_wait_list; + uint32_t blocking_map; + ULONGLONG map_flags; + SIZE_T offset; + SIZE_T size; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; cl_int* errcode_ret; @@ -313,13 +313,13 @@ struct clEnqueueMapImage_params void** __retval; cl_command_queue command_queue; cl_mem image; - cl_bool blocking_map; - cl_map_flags map_flags; + uint32_t blocking_map; + ULONGLONG map_flags; const size_t* origin; const size_t* region; size_t* image_row_pitch; size_t* image_slice_pitch; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; cl_int* errcode_ret; @@ -334,7 +334,7 @@ struct clEnqueueMarker_params struct clEnqueueMarkerWithWaitList_params { cl_command_queue command_queue; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -342,10 +342,10 @@ struct clEnqueueMarkerWithWaitList_params struct clEnqueueMigrateMemObjects_params { cl_command_queue command_queue; - cl_uint num_mem_objects; + uint32_t num_mem_objects; const cl_mem* mem_objects; - cl_mem_migration_flags flags; - cl_uint num_events_in_wait_list; + ULONGLONG flags; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -354,11 +354,11 @@ struct clEnqueueNDRangeKernel_params { cl_command_queue command_queue; cl_kernel kernel; - cl_uint work_dim; + uint32_t work_dim; const size_t* global_work_offset; const size_t* global_work_size; const size_t* local_work_size; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -368,11 +368,11 @@ struct clEnqueueNativeKernel_params cl_command_queue command_queue; void (WINAPI* user_func)(void*); void* args; - size_t cb_args; - cl_uint num_mem_objects; + SIZE_T cb_args; + uint32_t num_mem_objects; const cl_mem* mem_list; const void** args_mem_loc; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -381,11 +381,11 @@ struct clEnqueueReadBuffer_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_read; - size_t offset; - size_t size; + uint32_t blocking_read; + SIZE_T offset; + SIZE_T size; void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -394,16 +394,16 @@ struct clEnqueueReadBufferRect_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_read; + uint32_t blocking_read; const size_t* buffer_origin; const size_t* host_origin; const size_t* region; - size_t buffer_row_pitch; - size_t buffer_slice_pitch; - size_t host_row_pitch; - size_t host_slice_pitch; + SIZE_T buffer_row_pitch; + SIZE_T buffer_slice_pitch; + SIZE_T host_row_pitch; + SIZE_T host_slice_pitch; void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -412,13 +412,13 @@ struct clEnqueueReadImage_params { cl_command_queue command_queue; cl_mem image; - cl_bool blocking_read; + uint32_t blocking_read; const size_t* origin; const size_t* region; - size_t row_pitch; - size_t slice_pitch; + SIZE_T row_pitch; + SIZE_T slice_pitch; void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -427,7 +427,7 @@ struct clEnqueueTask_params { cl_command_queue command_queue; cl_kernel kernel; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -437,7 +437,7 @@ struct clEnqueueUnmapMemObject_params cl_command_queue command_queue; cl_mem memobj; void* mapped_ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -445,7 +445,7 @@ struct clEnqueueUnmapMemObject_params struct clEnqueueWaitForEvents_params { cl_command_queue command_queue; - cl_uint num_events; + uint32_t num_events; const cl_event* event_list; }; @@ -453,11 +453,11 @@ struct clEnqueueWriteBuffer_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_write; - size_t offset; - size_t size; + uint32_t blocking_write; + SIZE_T offset; + SIZE_T size; const void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -466,16 +466,16 @@ struct clEnqueueWriteBufferRect_params { cl_command_queue command_queue; cl_mem buffer; - cl_bool blocking_write; + uint32_t blocking_write; const size_t* buffer_origin; const size_t* host_origin; const size_t* region; - size_t buffer_row_pitch; - size_t buffer_slice_pitch; - size_t host_row_pitch; - size_t host_slice_pitch; + SIZE_T buffer_row_pitch; + SIZE_T buffer_slice_pitch; + SIZE_T host_row_pitch; + SIZE_T host_slice_pitch; const void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -484,13 +484,13 @@ struct clEnqueueWriteImage_params { cl_command_queue command_queue; cl_mem image; - cl_bool blocking_write; + uint32_t blocking_write; const size_t* origin; const size_t* region; - size_t input_row_pitch; - size_t input_slice_pitch; + SIZE_T input_row_pitch; + SIZE_T input_slice_pitch; const void* ptr; - cl_uint num_events_in_wait_list; + uint32_t num_events_in_wait_list; const cl_event* event_wait_list; cl_event* event; }; @@ -508,8 +508,8 @@ struct clFlush_params struct clGetCommandQueueInfo_params { cl_command_queue command_queue; - cl_command_queue_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -517,8 +517,8 @@ struct clGetCommandQueueInfo_params struct clGetContextInfo_params { cl_context context; - cl_context_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -526,8 +526,8 @@ struct clGetContextInfo_params struct clGetDeviceIDs_params { cl_platform_id platform; - cl_device_type device_type; - cl_uint num_entries; + ULONGLONG device_type; + uint32_t num_entries; cl_device_id* devices; cl_uint* num_devices; }; @@ -535,8 +535,8 @@ struct clGetDeviceIDs_params struct clGetDeviceInfo_params { cl_device_id device; - cl_device_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -544,8 +544,8 @@ struct clGetDeviceInfo_params struct clGetEventInfo_params { cl_event event; - cl_event_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -553,8 +553,8 @@ struct clGetEventInfo_params struct clGetEventProfilingInfo_params { cl_event event; - cl_profiling_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -562,8 +562,8 @@ struct clGetEventProfilingInfo_params struct clGetImageInfo_params { cl_mem image; - cl_image_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -571,9 +571,9 @@ struct clGetImageInfo_params struct clGetKernelArgInfo_params { cl_kernel kernel; - cl_uint arg_index; - cl_kernel_arg_info param_name; - size_t param_value_size; + uint32_t arg_index; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -581,8 +581,8 @@ struct clGetKernelArgInfo_params struct clGetKernelInfo_params { cl_kernel kernel; - cl_kernel_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -591,8 +591,8 @@ struct clGetKernelWorkGroupInfo_params { cl_kernel kernel; cl_device_id device; - cl_kernel_work_group_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -600,15 +600,15 @@ struct clGetKernelWorkGroupInfo_params struct clGetMemObjectInfo_params { cl_mem memobj; - cl_mem_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; struct clGetPlatformIDs_params { - cl_uint num_entries; + uint32_t num_entries; cl_platform_id* platforms; cl_uint* num_platforms; }; @@ -616,8 +616,8 @@ struct clGetPlatformIDs_params struct clGetPlatformInfo_params { cl_platform_id platform; - cl_platform_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -626,8 +626,8 @@ struct clGetProgramBuildInfo_params { cl_program program; cl_device_id device; - cl_program_build_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -635,8 +635,8 @@ struct clGetProgramBuildInfo_params struct clGetProgramInfo_params { cl_program program; - cl_program_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -644,8 +644,8 @@ struct clGetProgramInfo_params struct clGetSamplerInfo_params { cl_sampler sampler; - cl_sampler_info param_name; - size_t param_value_size; + uint32_t param_name; + SIZE_T param_value_size; void* param_value; size_t* param_value_size_ret; }; @@ -653,9 +653,9 @@ struct clGetSamplerInfo_params struct clGetSupportedImageFormats_params { cl_context context; - cl_mem_flags flags; - cl_mem_object_type image_type; - cl_uint num_entries; + ULONGLONG flags; + uint32_t image_type; + uint32_t num_entries; cl_image_format* image_formats; cl_uint* num_image_formats; }; @@ -664,10 +664,10 @@ struct clLinkProgram_params { cl_program* __retval; cl_context context; - cl_uint num_devices; + uint32_t num_devices; const cl_device_id* device_list; const char* options; - cl_uint num_input_programs; + uint32_t num_input_programs; const cl_program* input_programs; void (WINAPI* pfn_notify)(cl_program program, void* user_data); void* user_data; @@ -757,7 +757,7 @@ struct clRetainSampler_params struct clSetEventCallback_params { cl_event event; - cl_int command_exec_callback_type; + int32_t command_exec_callback_type; void (WINAPI* pfn_notify)(cl_event event, cl_int event_command_status, void *user_data); void* user_data; }; @@ -765,8 +765,8 @@ struct clSetEventCallback_params struct clSetKernelArg_params { cl_kernel kernel; - cl_uint arg_index; - size_t arg_size; + uint32_t arg_index; + SIZE_T arg_size; const void* arg_value; }; @@ -780,7 +780,7 @@ struct clSetMemObjectDestructorCallback_params struct clSetUserEventStatus_params { cl_event event; - cl_int execution_status; + int32_t execution_status; }; struct clUnloadCompiler_params @@ -794,7 +794,7 @@ struct clUnloadPlatformCompiler_params struct clWaitForEvents_params { - cl_uint num_events; + uint32_t num_events; const cl_event* event_list; }; -- 2.34.1

1 0

[PATCH 1/2] d3d10core/tests: Run test_generate_mips separately.
by Stefan Dösinger 12 Jan '22

12 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Similar problem as test_instanced_draw, but much less reliable. I suspect it is behind test failures like http://test.winehq.org/data/695c320507f89539378b93bcf8221b1bc8965325/win200… --- dlls/d3d10core/tests/d3d10core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 287292ebb5f..ffab5cbfca3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19319,7 +19319,6 @@ START_TEST(d3d10core) queue_test(test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); - queue_test(test_generate_mips); queue_test(test_alpha_to_coverage); queue_test(test_unbound_multisample_texture); queue_test(test_multiple_viewports); @@ -19338,11 +19337,10 @@ START_TEST(d3d10core) run_queued_tests(); - /* There should be no reason this test can't be run in parallel with the - * others, yet it fails when doing so. (AMD Radeon HD 6310, Windows 7) */ + /* There should be no reason these tests can't be run in parallel with the + * others, yet they randomly fail or crash when doing so. + * (AMD Radeon HD 6310, Radeon 560, Windows 7 and Windows 10) */ test_stream_output_vs(); - /* Same here, this test fails randomly on Win10 when run together with - * others on Radeon GPUs. Radeon 560 (0x1002:0x67ef), both on the testbot - * and Stefan's macbook. */ test_instanced_draw(); + test_generate_mips(); } -- 2.34.1

3 4

[PATCH v2 0/8] Fix infinite loop for END_OPEN figures with coincident last/first vertex
by Stefan Brüns 12 Jan '22

12 Jan '22

This is an attempt to fix https://bugs.winehq.org/show_bug.cgi?id=51139 The first two patches just increase the coverage for stroking and StrokeContains, and proved helpful during development of the actual fix. The third patch fixes a small issue in the segment comparision helper. The fourth patch adds the test case triggering bug 51139. As the test causes a hang, the critical part is commented out instead of using the regular wine_todo. The fifth patch is preparative refactoring, so the bugfix itself is more self-contained. The sixth patch is the actual fix, and patch 7 reenables the critical test case parts. The last patch is just some minor, final cleanup. This patch series obsoletes the previous attempt: "d2d: Suppress last empty segment also for D2D1_FIGURE_END_OPEN", which avoided the infinite loop, but also caused several regressions. --- v2: Patch 2: Update reference to Windows CI output, add some slack for minor rendering differences between Wine and Windows Patch 4: Remove leftover debug trace, add some tolerance for GetBounds on bezier segment Patch 6: Remove a spurious whitespace change Stefan Brüns (8): d2d1/tests: Test StrokeContains when last segment is bezier and closes the path d2d1/tests: Add test for single quadratic bezier segment d2d1/tests: Avoid out-of-bounds access when comparing segments d2d1/tests: Test coincident last/first vertex for both OPEN and CLOSED d2d1: Refactor outline generation as preparation for new TYPE_END vertex d2d1: Use special vertex TYPE_END when last/first coincede d2d1/tests: Reenable tests formerly causing infinite loop d2d1: remove extraneous checks for last vertex dlls/d2d1/geometry.c | 215 +++++++++++++++-------------------------- dlls/d2d1/tests/d2d1.c | 170 ++++++++++++++++++++++++++++++-- 2 files changed, 242 insertions(+), 143 deletions(-) -- 2.34.1

4 18

[PATCH v2 1/4] dinput/tests: Check that InputReportByteLength bytes are read.
by Rémi Bernon 12 Jan '22

12 Jan '22

Regardless of how long the driver packet is. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/hid.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index f8e8a275b09..d6232d578ca 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2110,6 +2110,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; send_hid_input( file, expect, sizeof(expect) ); @@ -2190,6 +2200,21 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle value, (report_id ? 3 : 4) ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + send_hid_input( file, expect_small, sizeof(expect_small) ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == report_id ? 2 : caps.InputReportByteLength - 1, + "got length %u, expected %u\n", value, report_id ? 2 : caps.InputReportByteLength - 1 ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } @@ -2212,6 +2237,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; overlapped.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); overlapped2.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2269,6 +2304,19 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( !memcmp( buffer + off, buffer + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + send_hid_input( file, expect_small, sizeof(expect_small) ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + todo_wine_if( report_id ) + ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } -- 2.34.1

2 4

Missing v7.0-rc5 tag in wine-staging git repository?
by Olivier F. R. Dierick 12 Jan '22

12 Jan '22

Hello, I updated my local wine-staging repository today. There is a release commit for v7.0-rc5 but the tags stops at v7.0-rc4. Can you check that? Regards. -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

3 4

[PATCH] api-ms-win-security-lsalookup-ansi-l2-1-0: Add dll.
by Andrey Gusev 12 Jan '22

12 Jan '22

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure.ac | 1 + dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-ansi-l2-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 4 files changed, 8 insertions(+) create mode 100644 dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in create mode 100644 dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec diff --git a/configure.ac b/configure.ac index b42cb8a5346..712e3b9b06c 100644 --- a/configure.ac +++ b/configure.ac @@ -2545,6 +2545,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-ansi-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l2-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in new file mode 100644 index 00000000000..3a880198bd7 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-ansi-l2-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec new file mode 100644 index 00000000000..9881da665da --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) advapi32.LookupAccountNameA +@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidA +@ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) advapi32.LookupPrivilegeDisplayNameA +@ stdcall LookupPrivilegeNameA(str ptr ptr ptr) advapi32.LookupPrivilegeNameA +@ stdcall LookupPrivilegeValueA(ptr ptr ptr) advapi32.LookupPrivilegeValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index b5e6443dd3c..594e01396db 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-cryptoapi-l1-1-0", + "api-ms-win-security-lsalookup-ansi-l2-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-0", -- 2.34.1

1 0

[PATCH 0/8] Fix infinite loop for END_OPEN figures with coincident last/first vertex
by Stefan Brüns 12 Jan '22

12 Jan '22

This is an attempt to fix https://bugs.winehq.org/show_bug.cgi?id=51139 The first two patches just increase the coverage for stroking and StrokeContains, and proved helpful during development of the actual fix. The third patch fixes a small issue in the segment comparision helper. The fourth patch adds the test case triggering bug 51139. As the test causes a hang, the critical part is commented out instead of using the regular wine_todo. The fifth patch is preparative refactoring, so the bugfix itself is more self-contained. The sixth patch is the actual fix, and patch 7 reenables the critical test case parts. The last patch is just some minor, final cleanup. This patch series obsoletes the previous attempt: "d2d: Suppress last empty segment also for D2D1_FIGURE_END_OPEN", which avoided the infinite loop, but also caused several regressions. Stefan Brüns (8): d2d1/tests: Test StrokeContains when last segment is bezier and closes the path d2d1/tests: Add test for single quadratic bezier segment d2d1/tests: Avoid out-of-bounds access when comparing segments d2d1/tests: Test coincident last/first vertex for both OPEN and CLOSED d2d1: Refactor outline generation as preparation for new TYPE_END vertex d2d1: Use special vertex TYPE_END when last/first coincede d2d1/tests: Reenable tests formerly causing infinite loop d2d1: remove extraneous checks for last vertex dlls/d2d1/geometry.c | 215 +++++++++++++++-------------------------- dlls/d2d1/tests/d2d1.c | 171 ++++++++++++++++++++++++++++++-- 2 files changed, 244 insertions(+), 142 deletions(-) -- 2.34.1

4 27

[PATCH 1/4] dinput/tests: Check that InputReportByteLength bytes are read.
by Rémi Bernon 12 Jan '22

12 Jan '22

Regardless of how long the driver packet is. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/hid.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index f8e8a275b09..d6232d578ca 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2110,6 +2110,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; send_hid_input( file, expect, sizeof(expect) ); @@ -2190,6 +2200,21 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle value, (report_id ? 3 : 4) ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + send_hid_input( file, expect_small, sizeof(expect_small) ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == report_id ? 2 : caps.InputReportByteLength - 1, + "got length %u, expected %u\n", value, report_id ? 2 : caps.InputReportByteLength - 1 ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } @@ -2212,6 +2237,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; overlapped.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); overlapped2.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2269,6 +2304,19 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( !memcmp( buffer + off, buffer + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + send_hid_input( file, expect_small, sizeof(expect_small) ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + todo_wine_if( report_id ) + ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } -- 2.34.1

1 4

[PATCH 1/4] include: Always use the WS_* prefix on Unix.
by Zebediah Figura 12 Jan '22

12 Jan '22

From: Alexandre Julliard <julliard(a)winehq.org> This removes the ability to use Windows sockets on Unix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52250 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Extended from the original revision to include all headers that interpret USE_WS_PREFIX, not just the main socket ones. Note that in particular inaddr.h can be included by iphlpapi.h without requiring winsock.h or winsock2.h. It seems more than a little tempting to define a Wine-internal header to take care of both this and defining the WS() macro... include/af_irda.h | 4 ++++ include/in6addr.h | 4 ++++ include/inaddr.h | 4 ++++ include/mswsock.h | 4 ++++ include/winsock.h | 4 ++++ include/winsock2.h | 4 ++++ include/wsipx.h | 4 ++++ include/wsnwlink.h | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/include/af_irda.h b/include/af_irda.h index 3be5b39af02..6a6dca83079 100644 --- a/include/af_irda.h +++ b/include/af_irda.h @@ -18,6 +18,10 @@ #ifndef AF_IRDA_H #define AF_IRDA_H +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + typedef struct _IRDA_DEVICE_INFO { UCHAR irdaDeviceID[4]; diff --git a/include/in6addr.h b/include/in6addr.h index a745bd249fa..663478fea12 100644 --- a/include/in6addr.h +++ b/include/in6addr.h @@ -19,6 +19,10 @@ #ifndef __IN6ADDR__ #define __IN6ADDR__ +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + #ifdef USE_WS_PREFIX #define WS(x) WS_##x #else diff --git a/include/inaddr.h b/include/inaddr.h index 72a50284092..078c031ad0d 100644 --- a/include/inaddr.h +++ b/include/inaddr.h @@ -20,6 +20,10 @@ #ifndef __INADDR_H__ #define __INADDR_H__ +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + #ifdef USE_WS_PREFIX #define WS(x) WS_##x #else diff --git a/include/mswsock.h b/include/mswsock.h index fa97d5bf04d..4afd8a7ceb1 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -18,6 +18,10 @@ #ifndef _MSWSOCK_ #define _MSWSOCK_ +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ diff --git a/include/winsock.h b/include/winsock.h index b8a7a4ec400..6afe00e8bd7 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -24,6 +24,10 @@ # error Please use winsock2 in Wine #endif +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + #ifndef __WINE_WINSOCKAPI_STDLIB_H #define __WINE_WINSOCKAPI_STDLIB_H diff --git a/include/winsock2.h b/include/winsock2.h index f1d43acad40..9923ea0f6d1 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -19,6 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + #ifndef __WINE_WINSOCKAPI_STDLIB_H #define __WINE_WINSOCKAPI_STDLIB_H diff --git a/include/wsipx.h b/include/wsipx.h index 671e7563470..56395e26456 100644 --- a/include/wsipx.h +++ b/include/wsipx.h @@ -19,6 +19,10 @@ #ifndef _WINE_WSIPX_ #define _WINE_WSIPX_ +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + #ifdef USE_WS_PREFIX # define WS(x) WS_##x #else diff --git a/include/wsnwlink.h b/include/wsnwlink.h index f237f0d1de5..161f9366df8 100644 --- a/include/wsnwlink.h +++ b/include/wsnwlink.h @@ -19,6 +19,10 @@ #ifndef _WSNWLINK_ #define _WSNWLINK_ +#if !defined(USE_WS_PREFIX) && !defined(__MINGW32__) && !defined (_MSC_VER) && !defined(__WINE_USE_MSVCRT) +#define USE_WS_PREFIX +#endif + #ifdef USE_WS_PREFIX #define WS(x) WS_##x #else -- 2.34.1

3 6

[PATCH v4 1/6] d3d8/tests: Test for window changes when it's not active.
by Gabriel Ivăncescu 12 Jan '22

12 Jan '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I'm sending these tests first to show the behavior across d3d versions. I do not plan to fix them during code freeze, except for ddraw, since I'm not aware of any regressions due to them. I might fix them after code freeze though. dlls/d3d8/tests/device.c | 195 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fc94dca..3d58628 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3943,6 +3943,7 @@ static void test_window_style(void) struct device_desc device_desc; LONG style, expected_style; IDirect3DDevice8 *device; + HWND active_window; IDirect3D8 *d3d8; HRESULT hr; ULONG ref; @@ -4055,6 +4056,200 @@ static void test_window_style(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(device_window); + DestroyWindow(focus_window); + + /* Window changes are done only if the current thread has the foreground window at creation */ + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + active_window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 20, 30, 40, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + ret = SetForegroundWindow(active_window); + ok(ret, "Failed to set foreground window.\n"); + ok(GetActiveWindow() == active_window, "Unexpected active window.\n"); + + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + device = create_device(d3d8, focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style || broken(style == (expected_style & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ShowWindow(device_window, SW_SHOWNOACTIVATE); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style || broken(style == (expected_style & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", expected_style, style); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(active_window); + DestroyWindow(device_window); + DestroyWindow(focus_window); + + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(focus_window); + ok(GetActiveWindow() == focus_window, "Unexpected active window.\n"); + + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + device = create_device(d3d8, focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + ShowWindow(device_window, SW_SHOWNOACTIVATE); + + /* Windows 8 and some versions of Windows 10 have some pretty + inconsistent behavior but topmost is set even when inactive. */ + style = GetWindowLongA(device_window, GWL_EXSTYLE); + if (broken(style & WS_EX_TOPMOST)) + { + win_skip("topmost set when inactive due to inconsistent behavior, skipping related tests...\n"); + goto skip_inactive; + } + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(focus_window); + ok(GetActiveWindow() == focus_window, "Unexpected active window."); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + SetForegroundWindow(focus_window); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(device_window); + DestroyWindow(focus_window); + + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(device_window); + ok(GetActiveWindow() == device_window, "Unexpected active window.\n"); + + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + device = create_device(d3d8, focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + ShowWindow(device_window, SW_SHOWNOACTIVATE); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + +skip_inactive: + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); done: IDirect3D8_Release(d3d8); -- 2.34.1

3 16

[PATCH v4] combase: Reorder hstring_private elements.
by Bernhard Kölbl 12 Jan '22

12 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51017 Debugging sessions and the official WinRT SDK show, that hstrings are aligned differently in memory, than they are currently used in Wine. E.g. The string buffer is stored at the end of hstring_private. Also if a string reference is created with WindowsCreateStringReference, a seperate pointer is used to point at the string-source. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v4: Remove leftover debugging TRACE and minor style changes. v3: Add nested hstring_header struct to hstring_private and add a test for both. v2: I was mistaken about no reference counting being used. --- dlls/combase/string.c | 126 ++++++++++++++++++++++-------------- dlls/combase/tests/string.c | 73 ++++++++++++++++++++- 2 files changed, 150 insertions(+), 49 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 2092e4360a3..1677915c244 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -26,44 +26,58 @@ WINE_DEFAULT_DEBUG_CHANNEL(winstring); -struct hstring_private +#define HSTRING_REFERENCE_FLAG 1 + +struct hstring_header { - LPWSTR buffer; + UINT32 flags; UINT32 length; - BOOL reference; - LONG refcount; + UINT32 padding1; + UINT32 padding2; + const WCHAR *ptr; }; +struct hstring_private +{ + struct hstring_header header; + LONG refcount; + WCHAR buffer[1]; +}; + + static const WCHAR empty[1]; -C_ASSERT(sizeof(struct hstring_private) <= sizeof(HSTRING_HEADER)); +C_ASSERT(sizeof(struct hstring_header) <= sizeof(HSTRING_HEADER)); static inline struct hstring_private *impl_from_HSTRING(HSTRING string) { - return (struct hstring_private *)string; + return (struct hstring_private *)string; } static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *header) { - return (struct hstring_private *)header; + return CONTAINING_RECORD(header, struct hstring_private, header); } static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer) { - return (struct hstring_private *)buffer; + return CONTAINING_RECORD(buffer, struct hstring_private, buffer); } static BOOL alloc_string(UINT32 len, HSTRING *out) { struct hstring_private *priv; - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + (len + 1) * sizeof(*priv->buffer)); + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv) + len * sizeof(*priv->buffer)); if (!priv) return FALSE; - priv->buffer = (LPWSTR)(priv + 1); - priv->length = len; - priv->reference = FALSE; + + priv->header.flags = 0; + priv->header.length = len; + priv->header.ptr = priv->buffer; + priv->refcount = 1; priv->buffer[len] = '\0'; + *out = (HSTRING)priv; return TRUE; } @@ -115,10 +129,12 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, } if (ptr == NULL) return E_POINTER; - priv->buffer = (LPWSTR)ptr; - priv->length = len; - priv->reference = TRUE; - *out = (HSTRING)header; + + priv->header.ptr = (LPWSTR)ptr; + priv->header.length = len; + priv->header.flags = HSTRING_REFERENCE_FLAG; + + *out = (HSTRING)priv; return S_OK; } @@ -127,16 +143,21 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len, */ HRESULT WINAPI WindowsDeleteString(HSTRING str) { - struct hstring_private *priv = impl_from_HSTRING(str); + struct hstring_private *priv; TRACE("(%p)\n", str); if (str == NULL) return S_OK; - if (priv->reference) + + priv = impl_from_HSTRING(str); + + if(priv->header.flags == HSTRING_REFERENCE_FLAG) return S_OK; + if (InterlockedDecrement(&priv->refcount) == 0) HeapFree(GetProcessHeap(), 0, priv); + return S_OK; } @@ -156,8 +177,8 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) *out = NULL; return S_OK; } - if (priv->reference) - return WindowsCreateString(priv->buffer, priv->length, out); + if (priv->header.flags == HSTRING_REFERENCE_FLAG) + return WindowsCreateString(priv->header.ptr, priv->header.length, out); InterlockedIncrement(&priv->refcount); *out = str; return S_OK; @@ -187,7 +208,7 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, return E_OUTOFMEMORY; priv = impl_from_HSTRING(str); *outptr = priv->buffer; - *out = (HSTRING_BUFFER)str; + *out = (HSTRING_BUFFER)&priv->buffer; return S_OK; } @@ -196,9 +217,17 @@ HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, */ HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) { + + struct hstring_private *priv; + TRACE("(%p)\n", buf); - return WindowsDeleteString((HSTRING)buf); + if(buf) + priv = impl_from_HSTRING_BUFFER(buf); + else + priv = NULL; + + return WindowsDeleteString((HSTRING)priv); } /*********************************************************************** @@ -217,9 +246,9 @@ HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) *out = NULL; return S_OK; } - if (priv->buffer[priv->length] != 0 || priv->reference || priv->refcount != 1) + if (priv->buffer[priv->header.length] != 0 || priv->header.flags == HSTRING_REFERENCE_FLAG || priv->refcount != 1) return E_INVALIDARG; - *out = (HSTRING)buf; + *out = (HSTRING)priv; return S_OK; } @@ -234,7 +263,7 @@ UINT32 WINAPI WindowsGetStringLen(HSTRING str) if (str == NULL) return 0; - return priv->length; + return priv->header.length; } /*********************************************************************** @@ -253,8 +282,9 @@ LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) return empty; } if (len) - *len = priv->length; - return priv->buffer; + *len = priv->header.length; + + return priv->header.ptr; } /*********************************************************************** @@ -274,9 +304,9 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) *out = FALSE; return S_OK; } - for (i = 0; i < priv->length; i++) + for (i = 0; i < (priv->header.length); i++) { - if (priv->buffer[i] == '\0') + if (priv->header.ptr[i] == '\0') { *out = TRUE; return S_OK; @@ -305,7 +335,7 @@ HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len - start, out); + return WindowsCreateString(&priv->header.ptr[start], len - start, out); } /*********************************************************************** @@ -327,7 +357,7 @@ HRESULT WINAPI WindowsSubstringWithSpecifiedLength(HSTRING str, UINT32 start, UI *out = NULL; return S_OK; } - return WindowsCreateString(&priv->buffer[start], len, out); + return WindowsCreateString(&priv->header.ptr[start], len, out); } /*********************************************************************** @@ -347,16 +377,16 @@ HRESULT WINAPI WindowsConcatString(HSTRING str1, HSTRING str2, HSTRING *out) return WindowsDuplicateString(str2, out); if (str2 == NULL) return WindowsDuplicateString(str1, out); - if (!priv1->length && !priv2->length) + if (!priv1->header.length && !priv2->header.length) { *out = NULL; return S_OK; } - if (!alloc_string(priv1->length + priv2->length, out)) + if (!alloc_string(priv1->header.length + priv2->header.length, out)) return E_OUTOFMEMORY; priv = impl_from_HSTRING(*out); - memcpy(priv->buffer, priv1->buffer, priv1->length * sizeof(*priv1->buffer)); - memcpy(priv->buffer + priv1->length, priv2->buffer, priv2->length * sizeof(*priv2->buffer)); + memcpy(priv->buffer, priv1->header.ptr, priv1->header.length * sizeof(*priv1->buffer)); + memcpy(priv->buffer + priv1->header.length, priv2->header.ptr, priv2->header.length * sizeof(*priv2->buffer)); return S_OK; } @@ -371,7 +401,7 @@ BOOL WINAPI WindowsIsStringEmpty(HSTRING str) if (str == NULL) return TRUE; - return priv->length == 0; + return priv->header.length == 0; } /*********************************************************************** @@ -395,13 +425,13 @@ HRESULT WINAPI WindowsCompareStringOrdinal(HSTRING str1, HSTRING str2, INT32 *re } if (str1) { - buf1 = priv1->buffer; - len1 = priv1->length; + buf1 = priv1->header.ptr; + len1 = priv1->header.length; } if (str2) { - buf2 = priv2->buffer; - len2 = priv2->length; + buf2 = priv2->header.ptr; + len2 = priv2->header.length; } *res = CompareStringOrdinal(buf1, len1, buf2, len2, FALSE) - CSTR_EQUAL; return S_OK; @@ -418,19 +448,19 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) TRACE("(%p, %p, %p)\n", str1, str2, out); - if (!out || !str2 || !priv2->length) + if (!out || !str2 || !priv2->header.length) return E_INVALIDARG; if (!str1) { *out = NULL; return S_OK; } - for (start = 0; start < priv1->length; start++) + for (start = 0; start < priv1->header.length; start++) { - if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length)) + if (!wmemchr(priv2->header.ptr, priv1->header.ptr[start], priv2->header.length)) break; } - return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : + return start ? WindowsCreateString(&priv1->header.ptr[start], priv1->header.length - start, out) : WindowsDuplicateString(str1, out); } @@ -445,18 +475,18 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) TRACE("(%p, %p, %p)\n", str1, str2, out); - if (!out || !str2 || !priv2->length) + if (!out || !str2 || !priv2->header.length) return E_INVALIDARG; if (!str1) { *out = NULL; return S_OK; } - for (len = priv1->length; len > 0; len--) + for (len = priv1->header.length; len > 0; len--) { - if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + if (!wmemchr(priv2->header.ptr, priv1->header.ptr[len - 1], priv2->header.length)) break; } - return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) : + return (len < priv1->header.length) ? WindowsCreateString(priv1->header.ptr, len, out) : WindowsDuplicateString(str1, out); } diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 5ebf669a426..bb477503a4b 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -37,7 +37,7 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, ok_(__FILE__, line)(WindowsIsStringEmpty(str) == empty, "WindowsIsStringEmpty failed\n"); ok_(__FILE__, line)(WindowsStringHasEmbeddedNull(str, &out_null) == S_OK, "WindowsStringHasEmbeddedNull failed\n"); - ok_(__FILE__, line)(out_null == has_null, "WindowsStringHasEmbeddedNull failed\n"); + ok_(__FILE__, line)(out_null == has_null, "WindowsStringHasEmbeddedNull failed. %d != %d \n", out_null, has_null); ok_(__FILE__, line)(WindowsGetStringLen(str) == length, "WindowsGetStringLen failed\n"); ptr = WindowsGetStringRawBuffer(str, &out_length); /* WindowsGetStringRawBuffer should return a non-null, null terminated empty string @@ -479,6 +479,76 @@ static void test_trim(void) ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n"); } +static void test_hstring_struct(void) +{ + struct hstring_header + { + UINT32 flags; + UINT32 length; + UINT32 padding1; + UINT32 padding2; + const WCHAR *ptr; + }; + + struct hstring_private + { + struct hstring_header header; + LONG refcount; + WCHAR buffer[1]; + }; + + HSTRING str; + HSTRING str2; + HSTRING_HEADER hdr; + struct hstring_private* prv; + struct hstring_private* prv2; + + BOOL arch64 = (sizeof(void*) == 8); + + ok(arch64 ? (sizeof(prv->header) == 24) : (sizeof(prv->header) == 20), "hstring_header size incorrect.\n"); + + ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string.\n"); + + prv = CONTAINING_RECORD(str, struct hstring_private, header); + + ok(prv->header.flags == 0, "Expected 0 in flags field, got 0x%x.\n", prv->header.flags); + ok(prv->header.length == 6, "Expected 6 in length field, got %d.\n", prv->header.length); + ok(prv->header.ptr != NULL, "Unexpected nullptr in ptr field.\n"); + ok(prv->refcount == 1, "Expected 1 in refcount, got %d.\n", prv->refcount); + ok(prv->header.ptr == prv->buffer, "Expected ptr to point at buffer, instead pointing at %p.\n", prv->header.ptr); + ok(wcscmp(input_string, prv->buffer) == 0, "Strings didn't match.\n"); + + trace("hstr ptr(%p), flags(%d), length(%d), padding1(%p), padding2(%p), ptr(%p), refcount(%d), str(%ls)->addr(%p)\n", + prv, prv->header.flags, prv->header.length, &prv->header.padding1, &prv->header.padding2, + prv->header.ptr, prv->refcount, prv->buffer, prv->buffer); + + ok(WindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string.\n"); + + prv2 = CONTAINING_RECORD(str2, struct hstring_private, header); + + ok(prv->refcount == 2, "Expected 2 in refcount, got %d.\n", prv->refcount); + ok(prv2->refcount == 2, "Expected 2 in refcount, got %d.\n", prv2->refcount); + ok(wcscmp(input_string, prv2->buffer) == 0, "Strings didn't match.\n"); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); + + ok(prv->refcount == 1, "Expected 1 in refcount, got %d.\n", prv->refcount); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); + + ok(WindowsCreateStringReference(input_string, 6, &hdr, &str) == S_OK, "Failed to create string ref.\n"); + + prv = CONTAINING_RECORD(&hdr, struct hstring_private, header); + prv2 = CONTAINING_RECORD(str, struct hstring_private, header); + + ok(prv == prv2, "Pointers not identical.\n"); + ok(prv2->header.flags == 1, "HSTRING_REFERENCE_FLAG not set.\n"); + ok(prv2->header.length == 6, "Length incorrect.\n"); + ok(prv2->header.ptr == input_string, "Pointer not pointing at input string.\n"); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref.\n"); +} + START_TEST(string) { test_create_delete(); @@ -489,4 +559,5 @@ START_TEST(string) test_concat(); test_compare(); test_trim(); + test_hstring_struct(); } -- 2.34.1

2 1

[PATCH 3/3] server: Strip terminating '\0' from the registry key name.
by Dmitry Timoshkov 12 Jan '22

12 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 445c05a02e1..956df02fae4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -456,6 +456,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -630,13 +638,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index 2a2bc9a4e68..6a03a41a9de 100644 --- a/server/registry.c +++ b/server/registry.c @@ -477,6 +477,8 @@ static inline void get_req_path( struct unicode_str *str ) { str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); } /* return the next token in a given path */ -- 2.34.1

1 0

[PATCH 2/3] server: Use normal key path handling also for the '\Registry' prefix.
by Dmitry Timoshkov 12 Jan '22

12 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 3 --- server/registry.c | 50 ++++++++++++------------------------------ 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..445c05a02e1 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -386,7 +386,6 @@ todo_wine key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); -todo_wine ok(!key, "key = %p\n", key); pRtlFreeUnicodeString( &str ); @@ -417,7 +416,6 @@ todo_wine pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); pNtClose( key ); pRtlFreeUnicodeString( &str ); @@ -569,7 +567,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); diff --git a/server/registry.c b/server/registry.c index b00abdbc004..2a2bc9a4e68 100644 --- a/server/registry.c +++ b/server/registry.c @@ -127,7 +127,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; -static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -411,7 +411,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) { static const WCHAR backslash = '\\'; struct key *key = (struct key *) obj; - data_size_t len = sizeof(root_name) - sizeof(WCHAR); + data_size_t len = 0; char *ret; if (key->flags & KEY_DELETED) @@ -431,7 +431,6 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } - memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); return (WCHAR *)ret; } @@ -474,16 +473,10 @@ static void key_destroy( struct object *obj ) } /* get the request vararg as registry path */ -static inline void get_req_path( struct unicode_str *str, int skip_root ) +static inline void get_req_path( struct unicode_str *str ) { str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); - - if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) - { - str->str += ARRAY_SIZE( root_name ); - str->len -= sizeof(root_name); - } } /* return the next token in a given path */ @@ -494,19 +487,22 @@ static struct unicode_str *get_path_token( const struct unicode_str *path, struc if (!token->str) /* first time */ { - /* path cannot start with a backslash */ + /* if path starts with a backslash it must be the Registry root */ if (len && path->str[0] == '\\') { - set_error( STATUS_OBJECT_PATH_INVALID ); - return NULL; + if (path->len < sizeof(root_name) || memicmp_strW( path->str, root_name, sizeof(root_name) )) + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return NULL; + } } } else { i = token->str - path->str; i += token->len / sizeof(WCHAR); - while (i < len && path->str[i] == '\\') i++; } + while (i < len && path->str[i] == '\\') i++; token->str = path->str + i; while (i < len && path->str[i] != '\\') i++; token->len = (path->str + i - token->str) * sizeof(WCHAR); @@ -730,10 +726,6 @@ static struct key *follow_symlink( struct key *key, int iteration ) path.str = value->data; path.len = (value->len / sizeof(WCHAR)) * sizeof(WCHAR); - if (path.len <= sizeof(root_name)) return NULL; - if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; - path.str += ARRAY_SIZE( root_name ); - path.len -= sizeof(root_name); key = root_key; token.str = NULL; @@ -1842,8 +1834,8 @@ static void init_supported_machines(void) /* registry initialisation */ void init_registry(void) { - static const WCHAR HKLM[] = { 'M','a','c','h','i','n','e' }; - static const WCHAR HKU_default[] = { 'U','s','e','r','\\','.','D','e','f','a','u','l','t' }; + static const WCHAR HKLM[] = { '\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e' }; + static const WCHAR HKU_default[] = { '\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\','.','D','e','f','a','u','l','t' }; static const WCHAR classes_i386[] = {'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\', 'W','o','w','6','4','3','2','N','o','d','e'}; @@ -2151,13 +2143,6 @@ DECL_HANDLER(create_key) class.str = get_req_data_after_objattr( objattr, &class.len ); class.len = (class.len / sizeof(WCHAR)) * sizeof(WCHAR); - if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmp_strW( name.str, root_name, sizeof(root_name) )) - { - name.str += ARRAY_SIZE( root_name ); - name.len -= sizeof(root_name); - } - /* NOTE: no access rights are required from the parent handle to create a key */ if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { @@ -2184,7 +2169,7 @@ DECL_HANDLER(open_key) /* NOTE: no access rights are required to open the parent key, only the child key */ if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + get_req_path( &name ); if ((key = open_key( parent, &name, access, req->attributes ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); @@ -2309,13 +2294,6 @@ DECL_HANDLER(load_registry) return; } - if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmp_strW( name.str, root_name, sizeof(root_name) )) - { - name.str += ARRAY_SIZE( root_name ); - name.len -= sizeof(root_name); - } - if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { int dummy; @@ -2344,7 +2322,7 @@ DECL_HANDLER(unload_registry) if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + get_req_path( &name ); if ((key = open_key( parent, &name, access, req->attributes ))) { if (key->obj.handle_count) -- 2.34.1

1 0

[PATCH 1/3] ntdll: Use full registry key name in NtQueryLicenseValue.
by Dmitry Timoshkov 12 Jan '22

12 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/unix/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 265ed39bd17..6628454440a 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -780,7 +780,8 @@ NTSTATUS WINAPI NtReplaceKey( OBJECT_ATTRIBUTES *attr, HANDLE key, OBJECT_ATTRIB NTSTATUS WINAPI NtQueryLicenseValue( const UNICODE_STRING *name, ULONG *type, void *data, ULONG length, ULONG *retlen ) { - static const WCHAR nameW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR nameW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','L','i','c','e','n','s','e', 'I','n','f','o','r','m','a','t','i','o','n',0}; -- 2.34.1

1 0

[PATCH v2 2/2] gdi32/tests: Drop font test workarounds for Windows <= 2000
by Alex Henrie 12 Jan '22

12 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Keep the continue statement in test_bitmap_font, which is preventing a test failure on Japanese Windows 10 --- dlls/gdi32/tests/font.c | 445 ++++++++++++---------------------------- 1 file changed, 132 insertions(+), 313 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 269151a1e1a..03ac72254cc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -42,19 +42,8 @@ static inline BOOL match_off_by_n(int a, int b, unsigned int n) static LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); static DWORD (WINAPI *pGdiGetCodePage)(HDC hdc); -static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); -static BOOL (WINAPI *pGetCharWidth32W)(HDC hdc, UINT first, UINT last, LPINT buffer); static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *); -static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); -static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); -static BOOL (WINAPI *pGetTextExtentExPointI)(HDC hdc, const WORD *indices, INT count, INT max_ext, - LPINT nfit, LPINT dxs, LPSIZE size ); static BOOL (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *); -static HFONT (WINAPI *pCreateFontIndirectExA)(const ENUMLOGFONTEXDVA *); -static HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *); -static BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE); -static INT (WINAPI *pAddFontResourceExA)(LPCSTR, DWORD, PVOID); -static BOOL (WINAPI *pRemoveFontResourceExA)(LPCSTR, DWORD, PVOID); static BOOL (WINAPI *pGetFontRealizationInfo)(HDC hdc, DWORD *); static BOOL (WINAPI *pGetFontFileInfo)(DWORD, DWORD, void *, SIZE_T, SIZE_T *); static BOOL (WINAPI *pGetFontFileData)(DWORD, DWORD, UINT64, void *, DWORD); @@ -84,18 +73,8 @@ static void init(void) pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); pGdiGetCodePage = (void *) GetProcAddress(hgdi32,"GdiGetCodePage"); - pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); - pGetCharWidth32W = (void *)GetProcAddress(hgdi32, "GetCharWidth32W"); pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); - pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); - pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); - pGetTextExtentExPointI = (void *)GetProcAddress(hgdi32, "GetTextExtentExPointI"); pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo"); - pCreateFontIndirectExA = (void *)GetProcAddress(hgdi32, "CreateFontIndirectExA"); - pAddFontMemResourceEx = (void *)GetProcAddress(hgdi32, "AddFontMemResourceEx"); - pRemoveFontMemResourceEx = (void *)GetProcAddress(hgdi32, "RemoveFontMemResourceEx"); - pAddFontResourceExA = (void *)GetProcAddress(hgdi32, "AddFontResourceExA"); - pRemoveFontResourceExA = (void *)GetProcAddress(hgdi32, "RemoveFontResourceExA"); pGetFontRealizationInfo = (void *)GetProcAddress(hgdi32, "GetFontRealizationInfo"); pGetFontFileInfo = (void *)GetProcAddress(hgdi32, "GetFontFileInfo"); pGetFontFileData = (void *)GetProcAddress(hgdi32, "GetFontFileData"); @@ -188,32 +167,18 @@ static BOOL write_ttf_file(const char *fontname, char *tmp_name) static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) { LOGFONTA getobj_lf; - int ret, minlen = 0; + int ret; if (!hfont) return; ret = GetObjectA(hfont, sizeof(getobj_lf), &getobj_lf); - /* NT4 tries to be clever and only returns the minimum length */ - while (lf->lfFaceName[minlen] && minlen < LF_FACESIZE-1) - minlen++; - minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1; - ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret); - ok(lf->lfHeight == getobj_lf.lfHeight || - broken((SHORT)lf->lfHeight == getobj_lf.lfHeight), /* win9x */ - "lfHeight: expect %08x got %08x\n", lf->lfHeight, getobj_lf.lfHeight); - ok(lf->lfWidth == getobj_lf.lfWidth || - broken((SHORT)lf->lfWidth == getobj_lf.lfWidth), /* win9x */ - "lfWidth: expect %08x got %08x\n", lf->lfWidth, getobj_lf.lfWidth); - ok(lf->lfEscapement == getobj_lf.lfEscapement || - broken((SHORT)lf->lfEscapement == getobj_lf.lfEscapement), /* win9x */ - "lfEscapement: expect %08x got %08x\n", lf->lfEscapement, getobj_lf.lfEscapement); - ok(lf->lfOrientation == getobj_lf.lfOrientation || - broken((SHORT)lf->lfOrientation == getobj_lf.lfOrientation), /* win9x */ - "lfOrientation: expect %08x got %08x\n", lf->lfOrientation, getobj_lf.lfOrientation); - ok(lf->lfWeight == getobj_lf.lfWeight || - broken((SHORT)lf->lfWeight == getobj_lf.lfWeight), /* win9x */ - "lfWeight: expect %08x got %08x\n", lf->lfWeight, getobj_lf.lfWeight); + ok(ret == sizeof(LOGFONTA), "%s: GetObject returned %d\n", test, ret); + ok(lf->lfHeight == getobj_lf.lfHeight, "lfHeight: expect %08x got %08x\n", lf->lfHeight, getobj_lf.lfHeight); + ok(lf->lfWidth == getobj_lf.lfWidth, "lfWidth: expect %08x got %08x\n", lf->lfWidth, getobj_lf.lfWidth); + ok(lf->lfEscapement == getobj_lf.lfEscapement, "lfEscapement: expect %08x got %08x\n", lf->lfEscapement, getobj_lf.lfEscapement); + ok(lf->lfOrientation == getobj_lf.lfOrientation, "lfOrientation: expect %08x got %08x\n", lf->lfOrientation, getobj_lf.lfOrientation); + ok(lf->lfWeight == getobj_lf.lfWeight, "lfWeight: expect %08x got %08x\n", lf->lfWeight, getobj_lf.lfWeight); ok(lf->lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf->lfItalic, getobj_lf.lfItalic); ok(lf->lfUnderline == getobj_lf.lfUnderline, "lfUnderline: expect %02x got %02x\n", lf->lfUnderline, getobj_lf.lfUnderline); ok(lf->lfStrikeOut == getobj_lf.lfStrikeOut, "lfStrikeOut: expect %02x got %02x\n", lf->lfStrikeOut, getobj_lf.lfStrikeOut); @@ -222,9 +187,7 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) ok(lf->lfClipPrecision == getobj_lf.lfClipPrecision, "lfClipPrecision: expect %02x got %02x\n", lf->lfClipPrecision, getobj_lf.lfClipPrecision); ok(lf->lfQuality == getobj_lf.lfQuality, "lfQuality: expect %02x got %02x\n", lf->lfQuality, getobj_lf.lfQuality); ok(lf->lfPitchAndFamily == getobj_lf.lfPitchAndFamily, "lfPitchAndFamily: expect %02x got %02x\n", lf->lfPitchAndFamily, getobj_lf.lfPitchAndFamily); - ok(!lstrcmpA(lf->lfFaceName, getobj_lf.lfFaceName) || - broken(!memcmp(lf->lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ - "%s: font names don't match: %s != %s\n", test, lf->lfFaceName, getobj_lf.lfFaceName); + ok(!lstrcmpA(lf->lfFaceName, getobj_lf.lfFaceName), "%s: font names don't match: %s != %s\n", test, lf->lfFaceName, getobj_lf.lfFaceName); } static HFONT create_font(const char* test, const LOGFONTA* lf) @@ -325,14 +288,12 @@ static void test_font_metrics(const char *context, { otm.otmSize = sizeof(otm) / 2; ret = GetOutlineTextMetricsA(hdc, otm.otmSize, &otm); - ok(ret == sizeof(otm)/2 /* XP */ || - ret == 1 /* Win9x */, "expected sizeof(otm)/2, got %u\n", ret); + ok(ret == sizeof(otm)/2, "expected sizeof(otm)/2, got %u\n", ret); memset(&otm, 0x1, sizeof(otm)); otm.otmSize = sizeof(otm); ret = GetOutlineTextMetricsA(hdc, otm.otmSize, &otm); - ok(ret == sizeof(otm) /* XP */ || - ret == 1 /* Win9x */, "expected sizeof(otm), got %u\n", ret); + ok(ret == sizeof(otm), "expected sizeof(otm), got %u\n", ret); memset(&tm, 0x2, sizeof(tm)); ret = GetTextMetricsA(hdc, &tm); @@ -1139,7 +1100,7 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); - ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ret = GetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "%s: GetCharABCWidthsFloatW should have succeeded\n", description); ok (abcf->abcfB > 0.0, "%s: abcfB should be positive\n", description); ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); @@ -1198,12 +1159,6 @@ static void test_GetCharABCWidths(void) }; UINT i; - if (!pGetCharABCWidthsFloatW) - { - win_skip("GetCharABCWidthsFloatW is not available on this platform\n"); - return; - } - memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "System"); lf.lfHeight = 20; @@ -1212,7 +1167,7 @@ static void test_GetCharABCWidths(void) hdc = GetDC(0); hfont = SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); + nb = GetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(NULL, 0, 1, glyphs, abc); @@ -1233,13 +1188,13 @@ static void test_GetCharABCWidths(void) ret = GetCharABCWidthsW(hdc, 'a', 'a', abc); ok(!ret, "GetCharABCWidthsW should have failed\n"); - ret = pGetCharABCWidthsFloatW(NULL, 'a', 'a', abcf); + ret = GetCharABCWidthsFloatW(NULL, 'a', 'a', abcf); ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); - ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', NULL); + ret = GetCharABCWidthsFloatW(hdc, 'a', 'a', NULL); ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); - ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', abcf); + ret = GetCharABCWidthsFloatW(hdc, 'a', 'a', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); hfont = SelectObject(hdc, hfont); @@ -1303,7 +1258,7 @@ static void test_GetCharABCWidths(void) /* test empty glyph's metrics */ hfont = SelectObject(hdc, hfont); - ret = pGetCharABCWidthsFloatW(hdc, ' ', ' ', abcf); + ret = GetCharABCWidthsFloatW(hdc, ' ', ' ', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); ok(abcf[0].abcfB == 1.0, "got %f\n", abcf[0].abcfB); ret = GetCharABCWidthsW(hdc, ' ', ' ', abcw); @@ -1393,14 +1348,14 @@ static void test_GetCharABCWidths(void) SetMapMode(hdc, MM_ANISOTROPIC); SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); + nb = GetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "GetCharABCWidthsI should have succeeded\n"); ret = GetCharABCWidthsW(hdc, 'i', 'i', abcw); ok(ret, "GetCharABCWidthsW should have succeeded\n"); - ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); + ret = GetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); ABCWidths_helper("LTR", hdc, glyphs, abc, abcw, abcf); @@ -1477,17 +1432,6 @@ static void test_text_extents(void) ok(ret, "got %d\n", ret); ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); - SetLastError(0xdeadbeef); - GetTextExtentExPointW(hdc, wt, 1, 1, &fit1, &fit2, &sz1); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Skipping remainder of text extents test on a Win9x platform\n"); - hfont = SelectObject(hdc, hfont); - DeleteObject(hfont); - ReleaseDC(0, hdc); - return; - } - memset(&sz, 0xcc, sizeof(sz)); ret = GetTextExtentPointW(hdc, wt, 0, &sz); ok(ret, "got %d\n", ret); @@ -1541,12 +1485,8 @@ static void test_text_extents(void) /* max_extent = 0 succeeds and returns zero */ fit1 = fit2 = -215; ret = GetTextExtentExPointA(hdc, NULL, 0, 0, &fit1, NULL, &sz); - ok(ret == TRUE || - broken(ret == FALSE), /* NT4, 2k */ - "got %d\n", ret); - ok(fit1 == 0 || - broken(fit1 == -215), /* NT4, 2k */ - "fit = %d\n", fit1); + ok(ret == TRUE, "got %d\n", ret); + ok(fit1 == 0, "fit = %d\n", fit1); ret = GetTextExtentExPointW(hdc, NULL, 0, 0, &fit2, NULL, &sz1); ok(ret == TRUE, "got %d\n", ret); ok(fit2 == 0, "fit = %d\n", fit2); @@ -1653,11 +1593,6 @@ static void test_GetGlyphIndices(void) void *font; char ttf_name[MAX_PATH]; - if (!pGetGlyphIndicesW) { - win_skip("GetGlyphIndicesW not available on platform\n"); - return; - } - hdc = GetDC(0); memset(&lf, 0, sizeof(lf)); @@ -1672,11 +1607,11 @@ static void test_GetGlyphIndices(void) if (textm.tmCharSet == ANSI_CHARSET) { flags |= GGI_MARK_NONEXISTING_GLYPHS; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); flags = 0; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); ok(glyphs[4] == textm.tmDefaultChar || glyphs[4] == 0x20 /* CJK Windows */, "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); @@ -1724,12 +1659,12 @@ static void test_GetGlyphIndices(void) hOldFont = SelectObject(hdc, hfont); ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); ok(glyphs[4] == 0xffff, "GetGlyphIndicesW should have returned 0xffff char not %04x\n", glyphs[4]); flags = 0; testtext[0] = textm.tmDefaultChar; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); @@ -1740,7 +1675,7 @@ static void test_GetGlyphIndices(void) font = load_font(ttf_name, &font_size); ok(font != NULL, "Failed to map font file.\n"); num_fonts = 0; - rsrc = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + rsrc = AddFontMemResourceEx(font, font_size, NULL, &num_fonts); ok(ret != 0, "Failed to add resource, %d.\n", GetLastError()); ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); @@ -1752,7 +1687,7 @@ static void test_GetGlyphIndices(void) hOldFont = SelectObject(hdc, hfont); ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); testtext[0] = 'T'; - charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); @@ -1760,7 +1695,7 @@ static void test_GetGlyphIndices(void) ReleaseDC(0, hdc); - ret = pRemoveFontMemResourceEx(rsrc); + ret = RemoveFontMemResourceEx(rsrc); ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); ret = DeleteFileA(ttf_name); @@ -1853,18 +1788,6 @@ static void test_GetKerningPairs(void) hdc = GetDC(0); - /* GetKerningPairsA maps unicode set of kerning pairs to current code page - * which may render this test unusable, so we're trying to avoid that. - */ - SetLastError(0xdeadbeef); - GetKerningPairsW(hdc, 0, NULL); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Skipping the GetKerningPairs test on a Win9x platform\n"); - ReleaseDC(0, hdc); - return; - } - for (i = 0; i < ARRAY_SIZE(kd); i++) { OUTLINETEXTMETRICW otm; @@ -1885,7 +1808,6 @@ static void test_GetKerningPairs(void) hfont_old = SelectObject(hdc, hfont); SetLastError(0xdeadbeef); - otm.otmSize = sizeof(otm); /* just in case for Win9x compatibility */ uiRet = GetOutlineTextMetricsW(hdc, sizeof(otm), &otm); ok(uiRet == sizeof(otm), "GetOutlineTextMetricsW error %d\n", GetLastError()); @@ -2174,12 +2096,6 @@ static void test_height_selection_vdmx( HDC hdc ) void *res, *copy; BOOL ret; - if (!pAddFontResourceExA) - { - win_skip("AddFontResourceExA unavailable\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(data); i++) { res = get_res_data( "wine_vdmx.ttf", &size ); @@ -2197,13 +2113,13 @@ static void test_height_selection_vdmx( HDC hdc ) HeapFree( GetProcessHeap(), 0, copy ); ok( !is_truetype_font_installed("wine_vdmx"), "Already installed\n" ); - num = pAddFontResourceExA( ttf_name, FR_PRIVATE, 0 ); + num = AddFontResourceExA( ttf_name, FR_PRIVATE, 0 ); if (!num) win_skip("Unable to add ttf font resource\n"); else { ok( is_truetype_font_installed("wine_vdmx"), "Not installed\n" ); test_height( hdc, data[i].fd ); - pRemoveFontResourceExA( ttf_name, FR_PRIVATE, 0 ); + RemoveFontResourceExA( ttf_name, FR_PRIVATE, 0 ); } ret = DeleteFileA( ttf_name ); ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED), @@ -2329,49 +2245,33 @@ static void test_GetOutlineTextMetrics(void) memset(otm, 0xAA, otm_size); SetLastError(0xdeadbeef); - otm->otmSize = sizeof(*otm); /* just in case for Win9x compatibility */ + otm->otmSize = sizeof(*otm); ret = GetOutlineTextMetricsA(hdc, otm->otmSize, otm); - ok(ret == 1 /* Win9x */ || - ret == otm->otmSize /* XP*/, - "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); - if (ret != 1) /* Win9x doesn't care about pointing beyond of the buffer */ - { - ok(otm->otmpFamilyName == NULL, "expected NULL got %p\n", otm->otmpFamilyName); - ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName); - ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); - ok(otm->otmpFullName == NULL, "expected NULL got %p\n", otm->otmpFullName); - } + ok(ret == otm->otmSize, "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + ok(otm->otmpFamilyName == NULL, "expected NULL got %p\n", otm->otmpFamilyName); + ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName); + ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); + ok(otm->otmpFullName == NULL, "expected NULL got %p\n", otm->otmpFullName); memset(otm, 0xAA, otm_size); SetLastError(0xdeadbeef); - otm->otmSize = otm_size; /* just in case for Win9x compatibility */ ret = GetOutlineTextMetricsA(hdc, otm->otmSize, otm); - ok(ret == 1 /* Win9x */ || - ret == otm->otmSize /* XP*/, - "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); - if (ret != 1) /* Win9x doesn't care about pointing beyond of the buffer */ - { - ok(otm->otmpFamilyName != NULL, "expected not NULL got %p\n", otm->otmpFamilyName); - ok(otm->otmpFaceName != NULL, "expected not NULL got %p\n", otm->otmpFaceName); - ok(otm->otmpStyleName != NULL, "expected not NULL got %p\n", otm->otmpStyleName); - ok(otm->otmpFullName != NULL, "expected not NULL got %p\n", otm->otmpFullName); - } + ok(ret == otm->otmSize, "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + ok(otm->otmpFamilyName != NULL, "expected not NULL got %p\n", otm->otmpFamilyName); + ok(otm->otmpFaceName != NULL, "expected not NULL got %p\n", otm->otmpFaceName); + ok(otm->otmpStyleName != NULL, "expected not NULL got %p\n", otm->otmpStyleName); + ok(otm->otmpFullName != NULL, "expected not NULL got %p\n", otm->otmpFullName); /* ask about truncated data */ memset(otm, 0xAA, otm_size); memset(&unset_ptr, 0xAA, sizeof(unset_ptr)); SetLastError(0xdeadbeef); - otm->otmSize = sizeof(*otm) - sizeof(LPSTR); /* just in case for Win9x compatibility */ + otm->otmSize = sizeof(*otm) - sizeof(char*); ret = GetOutlineTextMetricsA(hdc, otm->otmSize, otm); - ok(ret == 1 /* Win9x */ || - ret == otm->otmSize /* XP*/, - "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); - if (ret != 1) /* Win9x doesn't care about pointing beyond of the buffer */ - { - ok(otm->otmpFamilyName == NULL, "expected NULL got %p\n", otm->otmpFamilyName); - ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName); - ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); - } + ok(ret == otm->otmSize, "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + ok(otm->otmpFamilyName == NULL, "expected NULL got %p\n", otm->otmpFamilyName); + ok(otm->otmpFaceName == NULL, "expected NULL got %p\n", otm->otmpFaceName); + ok(otm->otmpStyleName == NULL, "expected NULL got %p\n", otm->otmpStyleName); ok(otm->otmpFullName == unset_ptr, "expected %p got %p\n", unset_ptr, otm->otmpFullName); /* check handling of NULL pointer */ @@ -2505,7 +2405,6 @@ static void test_SetTextJustification(void) testJustification("default", hdc, testText, &clientArea); - if (!pGetTextExtentExPointI) goto done; GetGlyphIndicesA( hdc, "A ", 2, indices, 0 ); SetTextJustification(hdc, 0, 0); @@ -2530,9 +2429,9 @@ static void test_SetTextJustification(void) size.cx = size.cy = 1234; GetTextExtentPoint32A(hdc, " ", 0, &size); ok( size.cx == 0 && size.cy == 0, "wrong size %d,%d\n", size.cx, size.cy ); - pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &expect); + GetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &expect); SetTextJustification(hdc, 5, 1); - pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &size); + GetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &size); ok( size.cx == expect.cx + 5, "wrong size %d/%d\n", size.cx, expect.cx ); SetTextJustification(hdc, 0, 0); @@ -2550,11 +2449,11 @@ static void test_SetTextJustification(void) ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i ); } SetTextCharacterExtra(hdc, 0); - pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &expect); + GetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &expect); for (i = 0; i < 10; i++) { SetTextCharacterExtra(hdc, i); - pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &size); + GetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &size); ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i ); } SetTextCharacterExtra(hdc, 0); @@ -2572,7 +2471,6 @@ static void test_SetTextJustification(void) ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i ); } -done: DeleteObject(hfont); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -2647,7 +2545,7 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count MultiByteToWideChar(code_page, 0, ansi_buf, count, unicode_buf, count); SetLastError(0xdeadbeef); - ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0); + ret = GetGlyphIndicesW(hdc, unicode_buf, count, idx, 0); ok(ret == count, "GetGlyphIndicesW expected %d got %d, error %u\n", count, ret, GetLastError()); } @@ -2686,12 +2584,6 @@ static void test_font_charset(void) }; int i; - if (!pGetGlyphIndicesW) - { - win_skip("Skipping the font charset test on a Win9x platform\n"); - return; - } - if (!is_font_installed("Arial")) { skip("Arial is not installed\n"); @@ -2825,12 +2717,6 @@ static void test_GetFontUnicodeRanges(void) DWORD size; GLYPHSET *gs; - if (!pGetFontUnicodeRanges) - { - win_skip("GetFontUnicodeRanges not available before W2K\n"); - return; - } - memset(&lf, 0, sizeof(lf)); lstrcpyA(lf.lfFaceName, "Arial"); hfont = create_font("Arial", &lf); @@ -2838,15 +2724,15 @@ static void test_GetFontUnicodeRanges(void) hdc = GetDC(0); hfont_old = SelectObject(hdc, hfont); - size = pGetFontUnicodeRanges(NULL, NULL); + size = GetFontUnicodeRanges(NULL, NULL); ok(!size, "GetFontUnicodeRanges succeeded unexpectedly\n"); - size = pGetFontUnicodeRanges(hdc, NULL); + size = GetFontUnicodeRanges(hdc, NULL); ok(size, "GetFontUnicodeRanges failed unexpectedly\n"); gs = heap_alloc_zero(size); - size = pGetFontUnicodeRanges(hdc, gs); + size = GetFontUnicodeRanges(hdc, gs); ok(size, "GetFontUnicodeRanges failed\n"); ok(gs->cRanges, "Unexpected ranges count.\n"); @@ -3016,9 +2902,7 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(efdw.total > 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); - ok(russian_charset > 0 || - broken(russian_charset == 0), /* NT4 */ - "NULL family should enumerate RUSSIAN_CHARSET\n"); + ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); } efdw.total = 0; @@ -4005,12 +3889,10 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) /* Wine currently uses SYMBOL_CHARSET to identify whether the ANSI metrics need special handling */ todo_wine_if(cmap_type != cmap_ms_symbol && tmA.tmCharSet == SYMBOL_CHARSET && expect_first_A != 0x1e) - ok(tmA.tmFirstChar == expect_first_A || - tmA.tmFirstChar == expect_first_A + 1 /* win9x */, + ok(tmA.tmFirstChar == expect_first_A, "A: tmFirstChar for %s got %02x expected %02x\n", font_name, tmA.tmFirstChar, expect_first_A); if (pGdiGetCodePage == NULL || ! IsDBCSLeadByteEx(pGdiGetCodePage(hdc), tmA.tmLastChar)) - ok(tmA.tmLastChar == expect_last_A || - tmA.tmLastChar == 0xff /* win9x */, + todo_wine_if(expect_last_A != 0 && expect_last_A != 0xff) ok(tmA.tmLastChar == expect_last_A, "A: tmLastChar for %s got %02x expected %02x\n", font_name, tmA.tmLastChar, expect_last_A); else skip("tmLastChar is DBCS lead byte\n"); @@ -4189,9 +4071,9 @@ static void test_nonexistent_font(void) for (i = 0; i < ARRAY_SIZE(shell_subst); i++) { ret = is_font_installed(shell_subst[i].name); - ok(ret || broken(!ret) /* win2000 */, "%s should be enumerated\n", shell_subst[i].name); + ok(ret, "%s should be enumerated\n", shell_subst[i].name); ret = is_truetype_font_installed(shell_subst[i].name); - ok(ret || broken(!ret) /* win2000 */, "%s should be enumerated\n", shell_subst[i].name); + ok(ret, "%s should be enumerated\n", shell_subst[i].name); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -13; @@ -4250,7 +4132,6 @@ static void test_nonexistent_font(void) GetTextFaceA(hdc, sizeof(buf), buf); todo_wine /* Wine uses Arial for all substitutions */ ok(!lstrcmpiA(buf, "Nonexistent font") /* XP, Vista */ || - !lstrcmpiA(buf, "MS Serif") || /* Win9x */ !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ "Got %s\n", buf); cs = GetTextCharset(hdc); @@ -4264,8 +4145,7 @@ todo_wine /* Wine uses Arial for all substitutions */ hfont = CreateFontIndirectA(&lf); hfont = SelectObject(hdc, hfont); GetTextFaceA(hdc, sizeof(buf), buf); - ok(!lstrcmpiA(buf, "Arial") /* XP, Vista */ || - !lstrcmpiA(buf, "Times New Roman") /* Win9x */, "Got %s\n", buf); + ok(!lstrcmpiA(buf, "Arial"), "Got %s\n", buf); cs = GetTextCharset(hdc); ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs); DeleteObject(SelectObject(hdc, hfont)); @@ -4286,12 +4166,10 @@ todo_wine /* Wine uses Arial for all substitutions */ { ret = is_font_installed(font_subst[i].name); todo_wine - ok(ret || broken(!ret && !i) /* win2000 doesn't have Times New Roman Baltic substitution */, - "%s should be enumerated\n", font_subst[i].name); + ok(ret, "%s should be enumerated\n", font_subst[i].name); ret = is_truetype_font_installed(font_subst[i].name); todo_wine - ok(ret || broken(!ret && !i) /* win2000 doesn't have Times New Roman Baltic substitution */, - "%s should be enumerated\n", font_subst[i].name); + ok(ret, "%s should be enumerated\n", font_subst[i].name); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -13; @@ -4310,8 +4188,7 @@ todo_wine { ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d for font %s\n", cs, font_subst[i].name); GetTextFaceA(hdc, sizeof(buf), buf); - ok(!lstrcmpiA(buf, "Arial") /* XP, Vista */ || - !lstrcmpiA(buf, "Times New Roman") /* Win9x */, "got %s for font %s\n", buf, font_subst[i].name); + ok(!lstrcmpiA(buf, "Arial"), "got %s for font %s\n", buf, font_subst[i].name); } DeleteObject(SelectObject(hdc, hfont)); @@ -4324,7 +4201,6 @@ todo_wine GetTextFaceA(hdc, sizeof(buf), buf); ok(!lstrcmpiA(buf, "Arial") /* Wine */ || !lstrcmpiA(buf, font_subst[i].name) /* XP, Vista */ || - !lstrcmpiA(buf, "MS Serif") /* Win9x */ || !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ "got %s for font %s\n", buf, font_subst[i].name); cs = GetTextCharset(hdc); @@ -4545,9 +4421,7 @@ static void test_GetTextFace(void) ok(bufA[0] == faceA[0] && bufA[1] == '\0', "GetTextFaceA didn't copy\n"); n = GetTextFaceA(dc, 0, NULL); - ok(n == sizeof faceA || - broken(n == 0), /* win98, winMe */ - "GetTextFaceA returned %d\n", n); + ok(n == sizeof faceA, "GetTextFaceA returned %d\n", n); DeleteObject(SelectObject(dc, g)); ReleaseDC(NULL, dc); @@ -4749,9 +4623,7 @@ static void test_GetGlyphOutline(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, NULL); ok(ret == GDI_ERROR, "GetGlyphOutlineA should fail\n"); - ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_INVALID_PARAMETER, /* win98, winMe */ - "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); @@ -5089,12 +4961,8 @@ static void test_CreateFontIndirect(void) ret = GetObjectA(hfont, sizeof(getobj_lf), &getobj_lf); ok(ret, "GetObject failed: %d\n", GetLastError()); ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); - ok(lf.lfWeight == getobj_lf.lfWeight || - broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ - "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); - ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || - broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ - "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); + ok(lf.lfWeight == getobj_lf.lfWeight, "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); + ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName), "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); DeleteObject(hfont); } } @@ -5104,12 +4972,6 @@ static void test_CreateFontIndirectEx(void) ENUMLOGFONTEXDVA lfex; HFONT hfont; - if (!pCreateFontIndirectExA) - { - win_skip("CreateFontIndirectExA is not available\n"); - return; - } - if (!is_truetype_font_installed("Arial")) { skip("Arial is not installed\n"); @@ -5117,13 +4979,13 @@ static void test_CreateFontIndirectEx(void) } SetLastError(0xdeadbeef); - hfont = pCreateFontIndirectExA(NULL); + hfont = CreateFontIndirectExA(NULL); ok(hfont == NULL, "got %p\n", hfont); ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); memset(&lfex, 0, sizeof(lfex)); lstrcpyA(lfex.elfEnumLogfontEx.elfLogFont.lfFaceName, "Arial"); - hfont = pCreateFontIndirectExA(&lfex); + hfont = CreateFontIndirectExA(&lfex); ok(hfont != 0, "CreateFontIndirectEx failed\n"); if (hfont) check_font("Arial", &lfex.elfEnumLogfontEx.elfLogFont, hfont); @@ -5247,35 +5109,29 @@ static void test_AddFontMemResource(void) HANDLE ret; BOOL bRet; - if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) - { - win_skip("AddFontMemResourceEx is not available on this platform\n"); - return; - } - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); + ret = AddFontMemResourceEx(NULL, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); + ret = AddFontMemResourceEx(NULL, 10, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); + ret = AddFontMemResourceEx(NULL, 0, NULL, &num_fonts); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); + ret = AddFontMemResourceEx(NULL, 10, NULL, &num_fonts); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", @@ -5292,7 +5148,7 @@ static void test_AddFontMemResource(void) ok(!bRet, "Font wine_test should not be enumerated.\n"); num_fonts = 0; - ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + ret = AddFontMemResourceEx(font, font_size, NULL, &num_fonts); ok(ret != 0, "Failed to add resource, %d.\n", GetLastError()); ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); @@ -5302,7 +5158,7 @@ todo_wine test_realization_info("wine_test", font_size, TRUE); - bRet = pRemoveFontMemResourceEx(ret); + bRet = RemoveFontMemResourceEx(ret); ok(bRet, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); @@ -5318,14 +5174,14 @@ todo_wine } SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, NULL); + ret = AddFontMemResourceEx(font, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 10, NULL, NULL); + ret = AddFontMemResourceEx(font, 10, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", @@ -5333,28 +5189,25 @@ todo_wine num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); + ret = AddFontMemResourceEx(font, 0, NULL, &num_fonts); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); - if (0) /* hangs under windows 2000 */ - { - num_fonts = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 10, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected GetLastError() to return 0xdeadbeef, got %u\n", - GetLastError()); - ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); - } + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AddFontMemResourceEx(font, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected GetLastError() to return 0xdeadbeef, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + ret = AddFontMemResourceEx(font, font_size, NULL, &num_fonts); ok(ret != 0, "AddFontMemResourceEx error %d\n", GetLastError()); ok(num_fonts != 0xdeadbeef, "number of loaded fonts should not be 0xdeadbeef\n"); ok(num_fonts != 0, "number of loaded fonts should not be 0\n"); @@ -5362,7 +5215,7 @@ todo_wine free_font(font); SetLastError(0xdeadbeef); - bRet = pRemoveFontMemResourceEx(ret); + bRet = RemoveFontMemResourceEx(ret); ok(bRet, "RemoveFontMemResourceEx error %d\n", GetLastError()); /* test invalid pointer to number of loaded fonts */ @@ -5370,14 +5223,14 @@ todo_wine ok(font != NULL, "Unable to locate and load font sserife.fon\n"); SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, font_size, NULL, (void *)0xdeadbeef); + ret = AddFontMemResourceEx(font, font_size, NULL, (void *)0xdeadbeef); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, font_size, NULL, NULL); + ret = AddFontMemResourceEx(font, font_size, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", @@ -6012,12 +5865,6 @@ static void test_CreateScalableFontResource(void) DWORD ret; int i; - if (!pAddFontResourceExA || !pRemoveFontResourceExA) - { - win_skip("AddFontResourceExA is not available on this platform\n"); - return; - } - if (!write_ttf_file("wine_test.ttf", ttf_name)) { skip("Failed to create ttf file for testing\n"); @@ -6066,7 +5913,7 @@ static void test_CreateScalableFontResource(void) ret = DeleteFileA(fot_name); ok(ret, "DeleteFile() error %d\n", GetLastError()); - ret = pRemoveFontResourceExA(fot_name, 0, 0); + ret = RemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); /* test public font resource */ @@ -6078,7 +5925,7 @@ static void test_CreateScalableFontResource(void) ok(!ret, "font wine_test should not be enumerated\n"); SetLastError(0xdeadbeef); - ret = pAddFontResourceExA(fot_name, 0, 0); + ret = AddFontResourceExA(fot_name, 0, 0); ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); @@ -6089,33 +5936,33 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_character(); test_fstype_fixup(); - ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); + ret = RemoveFontResourceExA(fot_name, FR_PRIVATE, 0); ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); SetLastError(0xdeadbeef); - ret = pRemoveFontResourceExA(fot_name, 0, 0); + ret = RemoveFontResourceExA(fot_name, 0, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); ok(!ret, "font wine_test should not be enumerated\n"); - ret = pRemoveFontResourceExA(fot_name, 0, 0); + ret = RemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); /* test refcounting */ for (i = 0; i < 5; i++) { SetLastError(0xdeadbeef); - ret = pAddFontResourceExA(fot_name, 0, 0); + ret = AddFontResourceExA(fot_name, 0, 0); ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); } for (i = 0; i < 5; i++) { SetLastError(0xdeadbeef); - ret = pRemoveFontResourceExA(fot_name, 0, 0); + ret = RemoveFontResourceExA(fot_name, 0, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); } - ret = pRemoveFontResourceExA(fot_name, 0, 0); + ret = RemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); DeleteFileA(fot_name); @@ -6129,7 +5976,7 @@ static void test_CreateScalableFontResource(void) ok(!ret, "font wine_test should not be enumerated\n"); SetLastError(0xdeadbeef); - ret = pAddFontResourceExA(fot_name, 0, 0); + ret = AddFontResourceExA(fot_name, 0, 0); ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); @@ -6138,13 +5985,13 @@ static void test_CreateScalableFontResource(void) /* XP allows removing a private font added with 0 flags */ SetLastError(0xdeadbeef); - ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); + ret = RemoveFontResourceExA(fot_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); ok(!ret, "font wine_test should not be enumerated\n"); - ret = pRemoveFontResourceExA(fot_name, 0, 0); + ret = RemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); DeleteFileA(fot_name); @@ -6194,7 +6041,7 @@ static void check_vertical_font(const char *name, BOOL *installed, BOOL *selecte if (!*selected) memset(gm, 0, sizeof *gm); - ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ret = GetGlyphIndicesW(hdc, str, 1, gi, 0); ok(ret != GDI_ERROR, "GetGlyphIndicesW failed\n"); SelectObject(hdc, hfont_prev); @@ -6259,26 +6106,21 @@ static void check_vertical_metrics(const char *face) int offset; SHORT topSideBearing; - if (!pGetGlyphIndicesW) { - win_skip("GetGlyphIndices is not available on this platform\n"); - } - else { - ret = pGetGlyphIndicesW(hdc, (LPCWSTR)&code, 1, &idx, 0); - ok(ret != 0, "GetGlyphIndicesW failed\n"); - numOfLongVerMetrics = GET_BE_WORD(numOfLongVerMetrics); - if (numOfLongVerMetrics > idx) - offset = idx * 2 + 1; - else - offset = numOfLongVerMetrics * 2 + (idx - numOfLongVerMetrics); - ret = GetFontData(hdc, MS_MAKE_TAG('v','m','t','x'), offset * sizeof(SHORT), - &topSideBearing, sizeof(SHORT)); - ok(ret != GDI_ERROR, "GetFontData(vmtx) failed\n"); - topSideBearing = GET_BE_WORD(topSideBearing); - ok(match_off_by_1(vgm.gmptGlyphOrigin.x, - MulDiv(topSideBearing, height, otm.otmEMSquare), FALSE), - "expected %d, got %d\n", - MulDiv(topSideBearing, height, otm.otmEMSquare), vgm.gmptGlyphOrigin.x); - } + ret = GetGlyphIndicesW(hdc, (LPCWSTR)&code, 1, &idx, 0); + ok(ret != 0, "GetGlyphIndicesW failed\n"); + numOfLongVerMetrics = GET_BE_WORD(numOfLongVerMetrics); + if (numOfLongVerMetrics > idx) + offset = idx * 2 + 1; + else + offset = numOfLongVerMetrics * 2 + (idx - numOfLongVerMetrics); + ret = GetFontData(hdc, MS_MAKE_TAG('v','m','t','x'), offset * sizeof(SHORT), + &topSideBearing, sizeof(SHORT)); + ok(ret != GDI_ERROR, "GetFontData(vmtx) failed\n"); + topSideBearing = GET_BE_WORD(topSideBearing); + ok(match_off_by_1(vgm.gmptGlyphOrigin.x, + MulDiv(topSideBearing, height, otm.otmEMSquare), FALSE), + "expected %d, got %d\n", + MulDiv(topSideBearing, height, otm.otmEMSquare), vgm.gmptGlyphOrigin.x); } else { @@ -6287,8 +6129,7 @@ static void check_vertical_metrics(const char *face) vgm.gmptGlyphOrigin.x, rgm.gmptGlyphOrigin.x, vgm.gmCellIncX, otm.otmDescent); } - ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent || - broken(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB - otm.otmTextMetrics.tmDescent) /* win2k */, + ok(vgm.gmptGlyphOrigin.y == abc.abcA + abc.abcB + otm.otmDescent, "got %d, expected abcA(%d) + abcB(%u) + descent(%d)\n", (INT)vgm.gmptGlyphOrigin.y, abc.abcA, abc.abcB, otm.otmDescent); @@ -6309,19 +6150,13 @@ static void test_vertical_font(void) "@MS UI Gothic", /* has vmtx table, available on native */ }; - if (!pAddFontResourceExA || !pRemoveFontResourceExA || !pGetGlyphIndicesW) - { - win_skip("AddFontResourceExA or GetGlyphIndicesW is not available on this platform\n"); - return; - } - if (!write_ttf_file("vertical.ttf", ttf_name)) { skip("Failed to create ttf file for testing\n"); return; } - num = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); + num = AddFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(num == 2, "AddFontResourceExA should add 2 fonts from vertical.ttf\n"); check_vertical_font("WineTestVertical", &installed, &selected, &gm, &hgi); @@ -6349,7 +6184,7 @@ static void test_vertical_font(void) check_vertical_metrics(&face[1]); } - ret = pRemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); + ret = RemoveFontResourceExA(ttf_name, FR_PRIVATE, 0); ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); DeleteFileA(ttf_name); @@ -6510,12 +6345,7 @@ static void test_stock_fonts(void) ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, font[i]); ret = GetObjectA(hfont, sizeof(lf), &lf); - if (ret != sizeof(lf)) - { - /* NT4 */ - win_skip("%d: GetObject returned %d instead of sizeof(LOGFONT)\n", i, ret); - continue; - } + ok(ret == sizeof(lf), "%d: GetObject returned %d instead of sizeof(LOGFONT)\n", i, ret); for (j = 0; td[i][j].face_name[0] != 0; j++) { @@ -6664,12 +6494,6 @@ static void test_GetCharWidth32(void) INT bufferW; HWND hwnd; - if (!pGetCharWidth32W) - { - win_skip("GetCharWidth32W not available on this platform\n"); - return; - } - memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "System"); lf.lfHeight = 20; @@ -6678,7 +6502,7 @@ static void test_GetCharWidth32(void) hdc = GetDC(0); hfont = SelectObject(hdc, hfont); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ret = GetCharWidth32A(hdc, 'a', 'a', &bufferA); ok(ret, "GetCharWidth32A should have succeeded\n"); @@ -6700,25 +6524,25 @@ static void test_GetCharWidth32(void) SetMapMode( hdc, MM_ANISOTROPIC ); SelectObject(hdc, hfont); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetWindowExtEx(hdc, -1,-1,NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetGraphicsMode(hdc, GM_ADVANCED); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetWindowExtEx(hdc, 1,1,NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetGraphicsMode(hdc, GM_ADVANCED); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); @@ -6731,25 +6555,25 @@ static void test_GetCharWidth32(void) SetMapMode( hdc, MM_ANISOTROPIC ); SelectObject(hdc, hfont); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetWindowExtEx(hdc, -1,-1,NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetGraphicsMode(hdc, GM_ADVANCED); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetWindowExtEx(hdc, 1,1,NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); SetGraphicsMode(hdc, GM_ADVANCED); - ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); + ret = GetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); ok (bufferW > 0," Width should be greater than zero\n"); @@ -6903,11 +6727,6 @@ static void test_bitmap_font_glyph_index(void) CHARSETINFO ci; BYTE chr = '\xA9'; - if (!pGetGlyphIndicesW) { - win_skip("GetGlyphIndices is unavailable\n"); - return; - } - hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -6952,7 +6771,7 @@ static void test_bitmap_font_glyph_index(void) { int len = lstrlenW(text); LPWORD indices = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WORD)); - ret = pGetGlyphIndicesW(hdc, text, len, indices, 0); + ret = GetGlyphIndicesW(hdc, text, len, indices, 0); ok(ret, "GetGlyphIndices failed\n"); ok(memcmp(indices, text, sizeof(WORD) * len) == 0, "Glyph indices and text are different for %s:%d\n", lf.lfFaceName, tm.tmCharSet); -- 2.34.1

2 1

[PATCH 1/2] gdi32/tests: Mark a GetTextExtentPointW test as broken on Windows 10
by Alex Henrie 12 Jan '22

12 Jan '22

Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gdi32/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0c346fa5e6b..269151a1e1a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2457,7 +2457,8 @@ static void testJustification(const char *context, HDC hdc, PCSTR str, RECT *cli { /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ - ok(error[e].GetTextExtentExPointWWidth == areaWidth, + ok(error[e].GetTextExtentExPointWWidth == areaWidth || + broken(abs(areaWidth - error[e].GetTextExtentExPointWWidth) <= 2) /* win10 */, "%s: GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", context, error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); } -- 2.34.1

3 3

[tools] testbot/LibvirtTool: SetWinLocale does not support --vm anymore.
by Francois Gouget 11 Jan '22

11 Jan '22

Also pass the --debug option if appropriate. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index c4dbffbaad..70dfd34634 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -673,7 +673,9 @@ sub Revert() if ($SetLocale) { Debug(Elapsed($Start), " Setting up the $SetLocale locale on $VMKey\n"); - if (system("$BinDir/SetWinLocale", "--vm", $VMKey, "--default", $SetLocale)) + my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname, "--default", $SetLocale); + push @Cmd, "--debug" if ($Debug); + if (system(@Cmd)) { FatalError("Could not set the $VMKey locale to $SetLocale\n"); } -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Add and correct some country codes.
by Francois Gouget 11 Jan '22

11 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index c62d663335..e776e4a802 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -98,12 +98,18 @@ sub FatalError(@) # Country and keyboard tables # +# Map the two-letter country identifier to the Windows country code used in +# the registry. Note that this does not match the CTRY_XXX codes! my %Countries = ( + "AD" => 8, # Andorra + "AE" => 224, # United Arab Emirates "AF" => 3, # Afganistan "AL" => 6, # Albania + "DZ" => 4, # Algeria "AM" => 7, # Armenia "AR" => 11, # Argentina "AT" => 14, # Austria + "AU" => 12, # Australia "AZ" => 5, # Azerbaijan "BA" => 25, # Bosnia and Herzegovina "BE" => 21, # Belgium @@ -114,7 +120,7 @@ my %Countries = ( "CA" => 39, # Canada "CH" => 223, # Switzerland "CN" => 45, # China - "CX" => 12, # Australia + "CX" => 309, # Christmas Island "CZ" => 75, # Czech Republic "DE" => 94, # Germany "DK" => 61, # Denmark -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Warn when a locale may not be installed.
by Francois Gouget 11 Jan '22

11 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e776e4a802..b2da673eda 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -672,7 +672,7 @@ sub GetWinKeyboardIds($) $WinKeyboardIds{$Locale} ||= $Keyboards{$Locale}; if (!$WinKeyboardIds{$Locale}) { - FatalError("could not find the $Locale LCID and keyboard ids\n"); + FatalError("could not find the $Locale LCID and keyboard ids. Maybe the locale is not installed?\n"); } my $WinLCID = uc($WinKeyboardIds{$Locale}->[0]); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Windows omits the country for some locales.
by Francois Gouget 11 Jan '22

11 Jan '22

For instance one finds the hi-IN information in the "User Profile\hi" subkey. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index b2da673eda..a6e95a2758 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -663,6 +663,12 @@ sub GetWinKeyboardIds($) # Look for that locale's keyboard id. # Its first component is the locale's LCID. my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Locale", "*:*"); + if (!%$Values) + { + my $Lang = $Locale; + $Lang =~ s/-.*$//; + $Values = RegGetValues("$HKCU_USER_PROFILE\\$Lang", "*:*"); + } foreach my $VName (keys %$Values) { next if ($VName !~ /^[0-9A-F]{4}:/); -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Add the en-US keyboard layout.
by Francois Gouget 11 Jan '22

11 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index c8f681a001..c62d663335 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -190,7 +190,7 @@ my %Keyboards = ( "dv-MV" => ["0465:00000465"], # Divehi - Maldives "el-GR" => ["0408:00000408"], # Greek - Greece "en-GB" => ["0809:00000809"], # English - Great Britain - "en-US" => undef, # English - United States + "en-US" => ["0409:00000409"], # English - United States "es-ES" => ["0c0a:0000040a"], # Spanish - Spain "et-EE" => ["0425:00000425"], # Estonian - Estonia "eu-ES" => ["042d:0000040a"], # Basque - Basque -- 2.30.2

1 0

[tools 1/2] testbot/TestAgent: Simplify running and waiting for a remote command.
by Francois Gouget 11 Jan '22

11 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 0aa59da573..fea7e650e1 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1354,6 +1354,30 @@ sub Wait($$$;$) return $Result; } +=pod +=over 12 + +=item C<RunAndWait()> + +Starts the specified command and waits for it to complete, returning its exit +code or a negative value if running or waiting for it failed. + +Note: The TestAgent-side error codes make it so that in most cases any non-zero + return value indicates that the command did not run successfully. + +=back +=cut + +sub RunAndWait($$$;$$$$$) +{ + my ($self, $Argv, $Flags, $WaitTimeout, $ServerInPath, $ServerOutPath, $ServerErrPath, $Keepalive) = @_; + + my $Pid = $self->Run($Argv, $Flags, $ServerInPath, $ServerOutPath, $ServerErrPath); + return -1 if (!$Pid); + my $Ret = $self->Wait($Pid, $WaitTimeout, $Keepalive); + return defined $Ret ? $Ret : -2; +} + sub Rm($@) { my $self = shift @_; -- 2.30.2

1 1

[PATCH 6/7] d2d1: Remove extraneous checks for last vertex.
by Henri Verbeet 11 Jan '22

11 Jan '22

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> The very last vertex of a figure can only be a of type LINE (non-coincident last/first vertices) or type END (otherwise). In case the current vertex starts a Bézier path, there is always at least one more vertex, i.e. (vertex_idx + 1) < vertex_count is always true. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 223225. v3: Resend. dlls/d2d1/geometry.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 20325b0fb18..46bfd488a7b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2007,8 +2007,6 @@ static BOOL d2d_geometry_intersect_bezier_line(struct d2d_geometry *geometry, p[0] = &figure->vertices[idx_p->vertex_idx]; p[1] = &figure->bezier_controls[idx_p->control_idx]; next = idx_p->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; figure = &geometry->u.path.figures[idx_q->figure_idx]; @@ -2085,16 +2083,12 @@ static BOOL d2d_geometry_intersect_bezier_bezier(struct d2d_geometry *geometry, p[0] = &figure->vertices[idx_p->vertex_idx]; p[1] = &figure->bezier_controls[idx_p->control_idx]; next = idx_p->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; figure = &geometry->u.path.figures[idx_q->figure_idx]; q[0] = &figure->vertices[idx_q->vertex_idx]; q[1] = &figure->bezier_controls[idx_q->control_idx]; next = idx_q->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; q[2] = &figure->vertices[next]; d2d_rect_get_bezier_segment_bounds(&p_bounds, p[0], p[1], p[2], start_p, end_p); @@ -2178,8 +2172,6 @@ static BOOL d2d_geometry_apply_intersections(struct d2d_geometry *geometry, p[0] = &figure->vertices[inter->vertex_idx + vertex_offset]; p[1] = &figure->bezier_controls[inter->control_idx + control_offset]; next = inter->vertex_idx + vertex_offset + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; d2d_point_lerp(&q[0], p[0], p[1], t); @@ -3016,18 +3008,12 @@ static BOOL d2d_geometry_check_bezier_overlap(struct d2d_geometry *geometry, figure = &geometry->u.path.figures[idx_p->figure_idx]; a[0] = &figure->vertices[idx_p->vertex_idx]; a[1] = &figure->bezier_controls[idx_p->control_idx]; - if (idx_p->vertex_idx == figure->vertex_count - 1) - a[2] = &figure->vertices[0]; - else - a[2] = &figure->vertices[idx_p->vertex_idx + 1]; + a[2] = &figure->vertices[idx_p->vertex_idx + 1]; figure = &geometry->u.path.figures[idx_q->figure_idx]; b[0] = &figure->vertices[idx_q->vertex_idx]; b[1] = &figure->bezier_controls[idx_q->control_idx]; - if (idx_q->vertex_idx == figure->vertex_count - 1) - b[2] = &figure->vertices[0]; - else - b[2] = &figure->vertices[idx_q->vertex_idx + 1]; + b[2] = &figure->vertices[idx_q->vertex_idx + 1]; if (d2d_point_ccw(a[0], a[1], a[2]) == 0.0f || d2d_point_ccw(b[0], b[1], b[2]) == 0.0f) return FALSE; @@ -3097,9 +3083,6 @@ static float d2d_geometry_bezier_ccw(struct d2d_geometry *geometry, const struct const struct d2d_figure *figure = &geometry->u.path.figures[idx->figure_idx]; size_t next = idx->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; - return d2d_point_ccw(&figure->vertices[idx->vertex_idx], &figure->bezier_controls[idx->control_idx], &figure->vertices[next]); } @@ -3115,8 +3098,6 @@ static BOOL d2d_geometry_split_bezier(struct d2d_geometry *geometry, const struc p[0] = &figure->vertices[idx->vertex_idx]; p[1] = &figure->bezier_controls[idx->control_idx]; next = idx->vertex_idx + 1; - if (next == figure->vertex_count) - next = 0; p[2] = &figure->vertices[next]; d2d_point_lerp(&q[0], p[0], p[1], 0.5f); -- 2.30.2

2 1

[PATCH 5/7] d2d1: Use the TYPE_END vertex type when last/first vertices coincide.
by Henri Verbeet 11 Jan '22

11 Jan '22

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> When the last vertex is coincident with the first vertex, the last segment should be suppressed for both END_OPEN and END_CLOSED. Only when last and first vertex are not coincident the additional line segment may be added - always for intersection tests and similar, and for stroking operations when the figure is CLOSED. Trying to use an zero-length segment in d2d_geometry_intersect_self() will create invalid segments, causing infinite loops later. Instead of reducing the vertex_count for coincident first/last vertices add a dedicated type. This is required as some operations need the last segment, others do not. This also allows to remove some replicated code in StrokeContains()/GetBounds()/Simplify(), as a last Bézier segment is always processed in the regular loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139 Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patches 223221 and 223224. v3: Merge patches 223221 and 223224, minor style changes. dlls/d2d1/geometry.c | 105 +++++++++++++---------------------------- dlls/d2d1/tests/d2d1.c | 16 ++++++- 2 files changed, 46 insertions(+), 75 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 7de4af5e12a..20325b0fb18 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -50,6 +50,7 @@ enum d2d_vertex_type D2D_VERTEX_TYPE_LINE, D2D_VERTEX_TYPE_BEZIER, D2D_VERTEX_TYPE_SPLIT_BEZIER, + D2D_VERTEX_TYPE_END, }; struct d2d_segment_idx @@ -2219,7 +2220,9 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) idx_p.control_idx = 0; for (idx_p.vertex_idx = 0; idx_p.vertex_idx < figure_p->vertex_count; ++idx_p.vertex_idx) { - type_p = figure_p->vertex_types[idx_p.vertex_idx]; + if ((type_p = figure_p->vertex_types[idx_p.vertex_idx]) == D2D_VERTEX_TYPE_END) + continue; + for (idx_q.figure_idx = 0; idx_q.figure_idx <= idx_p.figure_idx; ++idx_q.figure_idx) { figure_q = &geometry->u.path.figures[idx_q.figure_idx]; @@ -2227,7 +2230,9 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) { if (!d2d_rect_check_overlap(&figure_p->bounds, &figure_q->bounds)) continue; - max_q = figure_q->vertex_count; + if ((max_q = figure_q->vertex_count) + && figure_q->vertex_types[max_q - 1] == D2D_VERTEX_TYPE_END) + --max_q; } else { @@ -2607,6 +2612,9 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, p0 = &figure->vertices[0]; if (figure_end == D2D1_FIGURE_END_CLOSED) { + if (figure->vertex_types[vertex_count - 1] == D2D_VERTEX_TYPE_END && !--vertex_count) + return TRUE; + /* In case of a CLOSED path, a join between first and last vertex is * required. */ if (d2d_vertex_type_is_bezier(figure->vertex_types[vertex_count - 1])) @@ -2921,13 +2929,14 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa } figure = &geometry->u.path.figures[geometry->u.path.figure_count - 1]; - figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; + if (memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) + figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; + else + figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_END; if (figure_end == D2D1_FIGURE_END_CLOSED) { ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; - if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) - --figure->vertex_count; } if (!d2d_geometry_add_figure_outline(geometry, figure, figure_end)) @@ -3476,14 +3485,6 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * if (figure->flags & D2D_FIGURE_FLAG_HOLLOW) continue; - /* Single vertex figures are reduced by CloseFigure(). */ - if (figure->vertex_count == 0) - { - d2d_point_transform(&p, transform, figure->bounds.left, figure->bounds.top); - d2d_rect_expand(bounds, &p); - continue; - } - for (j = 0; j < figure->vertex_count; ++j) { if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE) @@ -3498,8 +3499,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { - if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) + enum d2d_vertex_type next_type; + + if ((next_type = figure->vertex_types[j]) == D2D_VERTEX_TYPE_NONE + || d2d_vertex_type_is_split_bezier(next_type)) continue; switch (type) @@ -3537,26 +3540,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_GetBounds(ID2D1PathGeometry * break; } - type = figure->vertex_types[j]; - } - - if (d2d_vertex_type_is_bezier(type)) - { - /* FIXME: This attempts to approximate a cubic Bézier with - * a quadratic one. */ - p1 = figure->original_bezier_controls[bezier_idx++]; - d2d_point_transform(&p1, transform, p1.x, p1.y); - p2 = figure->original_bezier_controls[bezier_idx++]; - d2d_point_transform(&p2, transform, p2.x, p2.y); - p1.x = (p1.x + p2.x) * 0.75f; - p1.y = (p1.y + p2.y) * 0.75f; - p2 = figure->vertices[0]; - d2d_point_transform(&p2, transform, p2.x, p2.y); - p1.x -= (p.x + p2.x) * 0.25f; - p1.y -= (p.y + p2.y) * 0.25f; - - d2d_rect_get_bezier_bounds(&bezier_bounds, &p, &p1, &p2); - d2d_rect_union(bounds, &bezier_bounds); + type = next_type; } } @@ -3619,8 +3603,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { - if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) + enum d2d_vertex_type next_type; + + if ((next_type = figure->vertex_types[j]) == D2D_VERTEX_TYPE_NONE + || d2d_vertex_type_is_split_bezier(next_type)) continue; switch (type) @@ -3646,25 +3632,14 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_StrokeContainsPoint(ID2D1Path } if (*contains) return S_OK; - type = figure->vertex_types[j]; + type = next_type; } - if (figure->flags & D2D_FIGURE_FLAG_CLOSED && (!*contains)) + if (type == D2D_VERTEX_TYPE_LINE) { - if (type == D2D_VERTEX_TYPE_LINE) - { - p1 = figure->vertices[0]; + p1 = figure->vertices[0]; + if (figure->flags & D2D_FIGURE_FLAG_CLOSED) *contains = d2d_point_on_line_segment(&point, &p, &p1, transform, stroke_width * 0.5f, tolerance); - p = p1; - } - else if (d2d_vertex_type_is_bezier(type)) - { - b.point1 = figure->original_bezier_controls[bezier_idx++]; - b.point2 = figure->original_bezier_controls[bezier_idx++]; - b.point3 = figure->vertices[0]; - *contains = d2d_point_on_bezier_segment(&point, &p, &b, transform, stroke_width, tolerance); - p = b.point3; - } } if (*contains) @@ -3787,8 +3762,10 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i for (bezier_idx = 0, ++j; j < figure->vertex_count; ++j) { - if (figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE - || d2d_vertex_type_is_split_bezier(figure->vertex_types[j])) + enum d2d_vertex_type next_type; + + if ((next_type = figure->vertex_types[j]) == D2D_VERTEX_TYPE_NONE + || d2d_vertex_type_is_split_bezier(next_type)) continue; switch (type) @@ -3827,25 +3804,7 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Simplify(ID2D1PathGeometry *i break; } - type = figure->vertex_types[j]; - } - - if (d2d_vertex_type_is_bezier(type)) - { - b.point1 = figure->original_bezier_controls[bezier_idx++]; - b.point2 = figure->original_bezier_controls[bezier_idx++]; - b.point3 = figure->vertices[0]; - if (transform) - { - d2d_point_transform(&b.point1, transform, b.point1.x, b.point1.y); - d2d_point_transform(&b.point2, transform, b.point2.x, b.point2.y); - d2d_point_transform(&b.point3, transform, b.point3.x, b.point3.y); - } - - if (option == D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES) - d2d_geometry_flatten_cubic(sink, &p, &b, tolerance); - else - ID2D1SimplifiedGeometrySink_AddBeziers(sink, &b, 1); + type = next_type; } end = figure->flags & D2D_FIGURE_FLAG_CLOSED ? D2D1_FIGURE_END_CLOSED : D2D1_FIGURE_END_OPEN; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ae3167ea1bb..381367bbbdc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3856,6 +3856,18 @@ static void test_path_geometry(BOOL d3d11) hr = ID2D1PathGeometry_Open(geometry, &sink); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + set_point(&point, 20.0f, 80.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 40.0f, 100.0f); + quadratic_to(sink, 40.0f, 65.0f, 20.0f, 80.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); + + set_point(&point, 80.0f, 20.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 60.0f, 40.0f); + quadratic_to(sink, 95.0f, 40.0f, 80.0f, 20.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); + set_point(&point, 120.0f, 180.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); line_to(sink, 140.0f, 160.0f); @@ -3875,7 +3887,7 @@ static void test_path_geometry(BOOL d3d11) set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - match = compare_rect(&rect, 115.5f, 110.0f, 180.0f, 180.0f, 1); + match = compare_rect(&rect, 20.0f, 20.0f, 180.0f, 180.0f, 0); ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); @@ -3883,7 +3895,7 @@ static void test_path_geometry(BOOL d3d11) hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 2, &expected_figures[31], 1); + geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 4, &expected_figures[29], 1); geometry_sink_cleanup(&simplify_sink); ID2D1PathGeometry_Release(geometry); -- 2.30.2

2 1

[PATCH 2/7] d2d1/tests: Add a test for single quadratic Bézier segment.
by Henri Verbeet 11 Jan '22

11 Jan '22

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Extra test for outline generation code, path with only 2 vertices. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 223220. v3: Use power-of-two tolerances. dlls/d2d1/tests/d2d1.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2d9bcfc892e..a165c67db2a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6879,6 +6879,45 @@ static void test_draw_geometry(BOOL d3d11) "AiWaAiScAiKdAiGeAh+hAhyjAhmuAg3GxgEA"); ok(match, "Figure does not match.\n"); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + set_point(&point, 20.0f, 80.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); + quadratic_to(sink, 20.0f, 160.0f, 60.0f, 160.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + set_point(&point, 100.0f, 80.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW); + quadratic_to(sink, 100.0f, 160.0f, 140.0f, 160.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); + + hr = ID2D1GeometrySink_Close(sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, 10.0f, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + match = compare_figure(&ctx, 0, 0, 160, 160, 0xff652e89, 32, + "3iUCngEEnAEGmgEImAEKlgEMlAEOkgEQkAESjgEUjAEWigEYiAEahgEchAEeggEggQEhfyN9JXsn" + "eih4KnYUAhZ1FAMWcxQFFnIUBhZwFQcWbxQJFm4UChZsFQsWaxUMFmoVDRZpFQ4WaBUPFmcVEBZm" + "FREWZhURFmUVEhZkFhIWZBYSFmQXERZkFxEWZBgQFmQaDhZlGwwWZh0JFmchBBZpOWw2bzN0Lnsn" + "2mEA"); + ok(match, "Figure does not match.\n"); + + match = compare_figure(&ctx, 160, 0, 160, 160, 0xff652e89, 32, + "njIUjAEUjAEUjAEUjAEUjAEUjQEUjAEUjAEUjAEUjQEUjAEUjAEUjQEUjAEUjQEUjAEVjAEUjQEU" + "jAEVjAEVjAEVjAEVjAEVjAEVjAEVjQEVjAEVjAEWjAEWjAEXiwEXiwEYigEaiQEbiAEdhgEhgwEz" + "ci53KX4ihwEZ6GEA"); + ok(match, "Figure does not match.\n"); + ID2D1SolidColorBrush_Release(brush); ID2D1Factory_Release(factory); release_test_context(&ctx); -- 2.30.2

2 1

False positives? - Re: TestBot job 104977 - results: [PATCH 1/8] d2d1/tests: Test StrokeContains when last segment is bezier and closes the path
by Stefan Brüns 11 Jan '22

11 Jan '22

On Freitag, 7. Januar 2022 09:50:08 CET you wrote: > VM Status Failures Command > build success > w7u_2qxl success 0 d2d1_test.exe d2d1 > w7u_adm success 0 d2d1_test.exe d2d1 > w7u_el success 0 d2d1_test.exe d2d1 > w8 success 0 d2d1_test.exe d2d1 > w8adm success 0 d2d1_test.exe d2d1 > w864 success 0 d2d1_test.exe d2d1 > w1064v1507 success 0 d2d1_test.exe d2d1 > w1064v1809 success 0 d2d1_test.exe d2d1 > w1064 success 0 d2d1_test.exe d2d1 > w1064_tsign success 0 d2d1_test.exe d2d1 > w10pro64 success 0 d2d1_test.exe d2d1 > w864 success 0 d2d1_test64.exe d2d1 > w1064v1507 success 0 d2d1_test64.exe d2d1 > w1064v1809 success 0 d2d1_test64.exe d2d1 > w1064 success 0 d2d1_test64.exe d2d1 > w1064_2qxl success 0 d2d1_test64.exe d2d1 > w1064_tsign success 0 d2d1_test64.exe d2d1 > w10pro64 success 0 d2d1_test64.exe d2d1 > w10pro64_ar success 0 d2d1_test64.exe d2d1 > w10pro64_he success 0 d2d1_test64.exe d2d1 > w10pro64_ja success 0 d2d1_test64.exe d2d1 > w10pro64_zh_CN success 0 d2d1_test64.exe d2d1 > debian11 failed 63 > debian11 failed 16 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=104977 > > > === debian11 (32 bit report) === > > d2d1: > d2d1.c:6664: Test failed: Figure does not match. > d2d1.c:6672: Test failed: Figure does not match. > d2d1.c:6680: Test failed: Figure does not match. > d2d1.c:6688: Test failed: Figure does not match. > d2d1.c:6672: Test failed: Figure does not match. > d2d1.c:6680: Test failed: Figure does not match. > d2d1.c:6688: Test failed: Figure does not match. As this patch just adds another testcase, it seems somewhat unlikely it introduces new regressions in unrelated tests. It seems like the my previous patch got applied (which would match the 4 regressions noted), but the patch.diff from the test bot tells something else. Is this possible? I had tested this against rc4 and had no new test failures. As d2d was unchanged since rc1 this should be sufficient. Visual inspection of the results on my machine (teached the tests to dump result and reference as PBM) also looks good. Unfortunately, the tests are only run with WINETEST_DEBUG=1, and the relevant output is suppressed in the logs. Kind regards, Stefan -- Stefan Brüns / Bergstraße 21 / 52062 Aachen home: +49 241 53809034 mobile: +49 151 50412019

2 2

[PATCH 1/2] d3d11/tests: Run test_instanced_draw separately.
by Stefan Dösinger 11 Jan '22

11 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- There are more random test failures in d3d11 and d3d10core that I am trying to isolate, including one that cases a segfault. test_stream_output_vs() is suspicious as well, we already separate it in d3d10core. --- dlls/d3d11/tests/d3d11.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b8fa462dc39..2dfb1cc0bf5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34001,7 +34001,6 @@ START_TEST(d3d11) queue_test(test_scissor); queue_test(test_clear_state); queue_test(test_il_append_aligned); - queue_test(test_instanced_draw); queue_test(test_vertex_id); queue_test(test_fragment_coords); queue_test(test_initial_texture_data); @@ -34116,4 +34115,9 @@ START_TEST(d3d11) queue_test(test_dynamic_map_synchronization); run_queued_tests(); + + /* This test fails randomly on Win10 when run together with others + * on Radeon GPUs. Radeon 560 (0x1002:0x67ef), both on the testbot + * and Stefan's macbook. */ + test_instanced_draw(); } -- 2.34.1

2 2

[PATCH 1/2] d3d11/tests: Run test_instanced_draw separately.
by Stefan Dösinger 11 Jan '22

11 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- There are more random test failures in d3d11 and d3d10core that I am trying to isolate, including one that cases a segfault. test_stream_output_vs() is suspicious as well, we already separate it in d3d10core. --- dlls/d3d11/tests/d3d11.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b8fa462dc39..2dfb1cc0bf5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34001,7 +34001,6 @@ START_TEST(d3d11) queue_test(test_scissor); queue_test(test_clear_state); queue_test(test_il_append_aligned); - queue_test(test_instanced_draw); queue_test(test_vertex_id); queue_test(test_fragment_coords); queue_test(test_initial_texture_data); @@ -34116,4 +34115,9 @@ START_TEST(d3d11) queue_test(test_dynamic_map_synchronization); run_queued_tests(); + + /* This test fails randomly on Win10 when run together with others + * on Radeon GPUs. Radeon 560 (0x1002:0x67ef), both on the testbot + * and Stefan's macbook. */ + test_instanced_draw(); } -- 2.34.1

3 3

[PATCH] wined3d: Handle WINED3DSPSM_NONE in shader_sm4_read_param().
by Andrey Gusev 11 Jan '22

11 Jan '22

Next titles call for it Dying Light, Mortal Shell, Deus Ex: Mankind Divided, Thief (2014). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/wined3d/shader_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 80564641eab..5afe612da21 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1460,6 +1460,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p default: FIXME("Skipping modifier 0x%08x.\n", m); + case 0x01: *modifier = WINED3DSPSM_NONE; break; } -- 2.34.1

2 1

[PATCH 7/7] d3d10core/tests: Run test_instanced_draw() separately.
by Henri Verbeet 11 Jan '22

11 Jan '22

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 223247. v2: Actually run the test... dlls/d3d10core/tests/d3d10core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ca12f185ec5..287292ebb5f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19268,7 +19268,6 @@ START_TEST(d3d10core) queue_test(test_private_data); queue_test(test_state_refcounting); queue_test(test_il_append_aligned); - queue_test(test_instanced_draw); queue_test(test_fragment_coords); queue_test(test_initial_texture_data); queue_test(test_update_subresource); @@ -19342,4 +19341,8 @@ START_TEST(d3d10core) /* There should be no reason this test can't be run in parallel with the * others, yet it fails when doing so. (AMD Radeon HD 6310, Windows 7) */ test_stream_output_vs(); + /* Same here, this test fails randomly on Win10 when run together with + * others on Radeon GPUs. Radeon 560 (0x1002:0x67ef), both on the testbot + * and Stefan's macbook. */ + test_instanced_draw(); } -- 2.30.2

1 0

[PATCH 4/7] d2d1: Refactor outline generation as preparation for the new TYPE_END vertex type.
by Henri Verbeet 11 Jan '22

11 Jan '22

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> This is a preparative patch for the next change, behaviour is essentially unchanged, though it may be slightly faster. Rearrange code for outline segment and join generation so it will work for END_OPEN/END_CLOSED path, with coincident and disparate last/first vertex. Each vertex is now fetched once, and pivoted on the next iteration. Also move invariants in front of the loop, Path segments are drawn starting with the first segment, up to vertex_count - 2 (index of start vertex). Only in case of a END_CLOSED figure with non-coincident last/first vertex, also the last line segment is drawn. Joins are added between all drawn segments, and only for END_CLOSED also the join at the first vertex is added. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 223223. v3: Minor style changes. dlls/d2d1/geometry.c | 100 +++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 28414d7c9a9..7de4af5e12a 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2597,43 +2597,68 @@ static BOOL d2d_geometry_outline_add_arc_quadrant(struct d2d_geometry *geometry, static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, struct d2d_figure *figure, D2D1_FIGURE_END figure_end) { - const D2D1_POINT_2F *prev, *p0, *next; - enum d2d_vertex_type prev_type, type; - size_t bezier_idx, i; + const D2D1_POINT_2F *prev, *p0, *p1, *next, *next_prev; + size_t bezier_idx, i, vertex_count; + enum d2d_vertex_type type; + + if (!(vertex_count = figure->vertex_count)) + return TRUE; - for (i = 0, bezier_idx = 0; i < figure->vertex_count; ++i) + p0 = &figure->vertices[0]; + if (figure_end == D2D1_FIGURE_END_CLOSED) { - type = figure->vertex_types[i]; - if (type == D2D_VERTEX_TYPE_NONE) - continue; + /* In case of a CLOSED path, a join between first and last vertex is + * required. */ + if (d2d_vertex_type_is_bezier(figure->vertex_types[vertex_count - 1])) + prev = &figure->bezier_controls[figure->bezier_control_count - 1]; + else + prev = &figure->vertices[vertex_count - 1]; + } + else + { + if (!--vertex_count) + return TRUE; + prev = p0; + } - p0 = &figure->vertices[i]; + for (i = 0, bezier_idx = 0; i < vertex_count; ++i) + { + if ((type = figure->vertex_types[i]) == D2D_VERTEX_TYPE_NONE) + { + prev = next_prev = &figure->vertices[i]; + continue; + } - if (!i) + /* next: tangent along next segment, at p0. + * p1: next vertex. */ + if (d2d_vertex_type_is_bezier(type)) { - prev_type = figure->vertex_types[figure->vertex_count - 1]; - if (d2d_vertex_type_is_bezier(prev_type)) - prev = &figure->bezier_controls[figure->bezier_control_count - 1]; - else - prev = &figure->vertices[figure->vertex_count - 1]; + next_prev = next = &figure->bezier_controls[bezier_idx++]; + /* type BEZIER implies i + 1 < figure->vertex_count. */ + p1 = &figure->vertices[i + 1]; + + if (!d2d_geometry_outline_add_bezier_segment(geometry, p0, next, p1)) + { + ERR("Failed to add bezier segment.\n"); + return FALSE; + } } else { - prev_type = figure->vertex_types[i - 1]; - if (d2d_vertex_type_is_bezier(prev_type)) - prev = &figure->bezier_controls[bezier_idx - 1]; + if (i + 1 == figure->vertex_count) + next = p1 = &figure->vertices[0]; else - prev = &figure->vertices[i - 1]; - } + next = p1 = &figure->vertices[i + 1]; + next_prev = p0; - if (d2d_vertex_type_is_bezier(type)) - next = &figure->bezier_controls[bezier_idx++]; - else if (i == figure->vertex_count - 1) - next = &figure->vertices[0]; - else - next = &figure->vertices[i + 1]; + if (!d2d_geometry_outline_add_line_segment(geometry, p0, p1)) + { + ERR("Failed to add line segment.\n"); + return FALSE; + } + } - if (figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) + if (i || figure_end == D2D1_FIGURE_END_CLOSED) { D2D1_POINT_2F q_next, q_prev; @@ -2650,27 +2675,8 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, } } - if (type == D2D_VERTEX_TYPE_LINE && (figure_end == D2D1_FIGURE_END_CLOSED || i < figure->vertex_count - 1) - && !d2d_geometry_outline_add_line_segment(geometry, p0, next)) - { - ERR("Failed to add line segment.\n"); - return FALSE; - } - else if (d2d_vertex_type_is_bezier(type)) - { - const D2D1_POINT_2F *p2; - - if (i == figure->vertex_count - 1) - p2 = &figure->vertices[0]; - else - p2 = &figure->vertices[i + 1]; - - if (!d2d_geometry_outline_add_bezier_segment(geometry, p0, next, p2)) - { - ERR("Failed to add bezier segment.\n"); - return FALSE; - } - } + p0 = p1; + prev = next_prev; } return TRUE; -- 2.30.2

1 0

[PATCH 3/7] d2d1/tests: Test coincident last/first vertex for both OPEN and CLOSED.
by Henri Verbeet 11 Jan '22

11 Jan '22

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Provide two orientatations for both cases (END_OPEN/END_CLOSED) each. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139 Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 223222. v3: Introduce the problematic tests later in the series, when they work. dlls/d2d1/tests/d2d1.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a165c67db2a..ae3167ea1bb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3041,6 +3041,23 @@ static void test_path_geometry(BOOL d3d11) /* Figure 28. */ {SEGMENT_LINE, {{{ 75.0f, 300.0f}}}}, {SEGMENT_LINE, {{{ 5.0f, 300.0f}}}}, + /* Figure 29. */ + {SEGMENT_LINE, {{{ 40.0f, 100.0f}}}}, + {SEGMENT_BEZIER, {{{4.00000000e+01f, 7.66666666e+01f}, + {3.33333333e+01f, 7.00000000e+01f}, + {2.00000000e+01f, 8.00000000e+01f}}}}, + {SEGMENT_LINE, {{{ 60.0f, 40.0f}}}}, + {SEGMENT_BEZIER, {{{8.33333333e+01f, 4.00000000e+01f}, + {9.00000000e+01f, 3.33333333e+01f}, + {8.00000000e+01f, 2.00000000e+01f}}}}, + {SEGMENT_LINE, {{{140.0f, 160.0f}}}}, + {SEGMENT_BEZIER, {{{1.16666666e+02f, 1.60000000e+02f}, + {1.10000000e+02f, 1.66666666e+02f}, + {1.20000000e+02f, 1.80000000e+02f}}}}, + {SEGMENT_LINE, {{{170.0f, 110.0f}}}}, + {SEGMENT_BEZIER, {{{1.70000000e+02f, 1.26666666e+02f}, + {1.73333333e+02f, 1.30000000e+02f}, + {1.80000000e+02f, 1.20000000e+02f}}}}, }; static const struct expected_geometry_figure expected_figures[] = { @@ -3084,6 +3101,11 @@ static void test_path_geometry(BOOL d3d11) {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, { 20.0f, 612.0f}, 8, &expected_segments[164]}, /* 28 */ {D2D1_FIGURE_BEGIN_HOLLOW, D2D1_FIGURE_END_OPEN, { 40.0f, 20.0f}, 2, &expected_segments[172]}, + /* 29 */ + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_OPEN, { 20.0f, 80.0f}, 2, &expected_segments[174]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_OPEN, { 80.0f, 20.0f}, 2, &expected_segments[176]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, { 120.0f, 180.0f}, 2, &expected_segments[178]}, + {D2D1_FIGURE_BEGIN_FILLED, D2D1_FIGURE_END_CLOSED, { 180.0f, 120.0f}, 2, &expected_segments[180]}, }; if (!init_test_context(&ctx, d3d11)) @@ -3829,6 +3851,43 @@ static void test_path_geometry(BOOL d3d11) ID2D1PathGeometry_Release(geometry); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + set_point(&point, 120.0f, 180.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 140.0f, 160.0f); + quadratic_to(sink, 105.0f, 160.0f, 120.0f, 180.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + set_point(&point, 180.0f, 120.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 170.0f, 110.0f); + quadratic_to(sink, 170.0f, 135.0f, 180.0f, 120.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + hr = ID2D1GeometrySink_Close(sink); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1PathGeometry_GetBounds(geometry, NULL, &rect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + match = compare_rect(&rect, 115.5f, 110.0f, 180.0f, 180.0f, 1); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + geometry_sink_init(&simplify_sink); + hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES, + NULL, 0.0f, &simplify_sink.ID2D1SimplifiedGeometrySink_iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + geometry_sink_check(&simplify_sink, D2D1_FILL_MODE_ALTERNATE, 2, &expected_figures[31], 1); + geometry_sink_cleanup(&simplify_sink); + + ID2D1PathGeometry_Release(geometry); + ID2D1SolidColorBrush_Release(brush); ID2D1Factory_Release(factory); release_test_context(&ctx); -- 2.30.2

1 0

[PATCH 1/7] d2d1: Silence SetSegmentFlags() FIXME when setting default value.
by Henri Verbeet 11 Jan '22

11 Jan '22

From: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags() with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 223231. v3: Use the same scheme we use elsewhere. dlls/d2d1/geometry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..28414d7c9a9 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,7 +2773,10 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + TRACE("iface %p, flags %#x.\n", iface, flags); + + if (flags != D2D1_PATH_SEGMENT_NONE) + FIXME("Ignoring flags %#x.\n", flags); } static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *iface, -- 2.30.2

1 0

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Use list_empty() instead of comparing list_count() against zero.
by Zebediah Figura 11 Jan '22

11 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c4b..5a17449a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -326,7 +326,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis struct hlsl_ir_if *iff; /* E.g. "for (i = 0; ; ++i)". */ - if (!list_count(cond_list)) + if (list_empty(cond_list)) return true; condition = node_from_list(cond_list); -- 2.34.1

5 13

[PATCH 2/2] user: Copy back the 16-bit MDICREATESTRUCT.
by Huw Davies 11 Jan '22

11 Jan '22

Otherwise lpCreateParams is overwitten by CREATESTRUCT32Ato16(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52356 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user.exe16/message.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b79b0cb7751..1b4bf9afbd8 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -610,6 +610,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 CREATESTRUCT16 *cs16 = MapSL(lParam); CREATESTRUCTA cs; MDICREATESTRUCTA mdi_cs; + SEGPTR mdi_cs_segptr = 0; CREATESTRUCT16to32A( cs16, &cs ); if (GetWindowLongW(hwnd32, GWL_EXSTYLE) & WS_EX_MDICHILD) @@ -617,9 +618,15 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 MDICREATESTRUCT16 *mdi_cs16 = MapSL(cs16->lpCreateParams); MDICREATESTRUCT16to32A(mdi_cs16, &mdi_cs); cs.lpCreateParams = &mdi_cs; + mdi_cs_segptr = cs16->lpCreateParams; } ret = callback( hwnd32, msg, wParam, (LPARAM)&cs, result, arg ); CREATESTRUCT32Ato16( &cs, cs16 ); + if (mdi_cs_segptr) + { + MDICREATESTRUCT32Ato16( &mdi_cs, MapSL( mdi_cs_segptr ) ); + cs16->lpCreateParams = mdi_cs_segptr; + } } break; case WM_MDICREATE: -- 2.23.0

1 0

[PATCH 1/2] commdlg: Pass the 16-bit structure to the WM_INITDIALOG hook.
by Huw Davies 11 Jan '22

11 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52356 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/commdlg.dll16/filedlg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 4fa62c15d6c..0a4dad4a37a 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -482,6 +482,12 @@ static UINT_PTR CALLBACK call_hook_proc( WNDPROC16 hook, HWND hwnd, UINT msg, WP case WM_ACTIVATEAPP: ret = call_hook16( hook, hwnd, msg, wp, HTASK_16( lp )); break; + case WM_INITDIALOG: + { + OPENFILENAMEA *ofn = (OPENFILENAMEA *)lp; + ret = call_hook16( hook, hwnd, msg, wp, ofn->lCustData ); + break; + } default: ret = call_hook16( hook, hwnd, msg, wp, lp ); break; @@ -591,7 +597,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.nFileOffset = lpofn->nFileOffset; ofn32.nFileExtension = lpofn->nFileExtension; ofn32.lpstrDefExt = MapSL( lpofn->lpstrDefExt ); - ofn32.lCustData = lpofn->lCustData; + ofn32.lCustData = ofn; /* See WM_INITDIALOG in the hook proc */ ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) -- 2.23.0

1 0

[PATCH] kerberos: Avoid a crash on NULL expiry parameter.
by Hans Leidekker 11 Jan '22

11 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52353 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 1 + dlls/secur32/tests/secur32.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8295d2e103e..2e47c23bb69 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -87,6 +87,7 @@ static void expiry_to_timestamp( ULONG expiry, TimeStamp *timestamp ) { LARGE_INTEGER time; + if (!timestamp) return; NtQuerySystemTime( &time ); RtlSystemTimeToLocalTime( &time, &time ); time.QuadPart += expiry * (ULONGLONG)10000000; diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index f6bca55561c..aa286c64732 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -418,7 +418,6 @@ static void test_SspiPrepareForCredWrite(void) static void test_kerberos(void) { SecPkgInfoA *info; - TimeStamp ttl; CredHandle cred; SECURITY_STATUS status; @@ -460,7 +459,7 @@ static void test_kerberos(void) FreeContextBuffer( info ); status = AcquireCredentialsHandleA( NULL, provider, SECPKG_CRED_OUTBOUND, NULL, - NULL, NULL, NULL, &cred, &ttl ); + NULL, NULL, NULL, &cred, NULL ); todo_wine ok( status == SEC_E_OK, "AcquireCredentialsHandleA returned %08x\n", status ); if(status == SEC_E_OK) FreeCredentialHandle( &cred ); -- 2.30.2

1 0

[PATCH] include: Add WbemErrorEnum error codes.
by Nikolay Sivov 11 Jan '22

11 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52378 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/wbemdisp.idl | 137 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index 6f09f7ee154..7182a14a331 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -760,6 +760,143 @@ enum WbemCimtypeEnum wbemCimtypeChar16 = 103 } WbemCimtypeEnum; +typedef +[ + v1_enum, + uuid(4a249b7c-fc9a-11d1-8b1e-00600806d9b6), +] +enum WbemErrorEnum +{ + wbemNoErr = 0, + wbemErrFailed = 0x80041001, + wbemErrNotFound = 0x80041002, + wbemErrAccessDenied = 0x80041003, + wbemErrProviderFailure = 0x80041004, + wbemErrTypeMismatch = 0x80041005, + wbemErrOutOfMemory = 0x80041006, + wbemErrInvalidContext = 0x80041007, + wbemErrInvalidParameter = 0x80041008, + wbemErrNotAvailable = 0x80041009, + wbemErrCriticalError = 0x8004100a, + wbemErrInvalidStream = 0x8004100b, + wbemErrNotSupported = 0x8004100c, + wbemErrInvalidSuperclass = 0x8004100d, + wbemErrInvalidNamespace = 0x8004100e, + wbemErrInvalidObject = 0x8004100f, + wbemErrInvalidClass = 0x80041010, + wbemErrProviderNotFound = 0x80041011, + wbemErrInvalidProviderRegistration = 0x80041012, + wbemErrProviderLoadFailure = 0x80041013, + wbemErrInitializationFailure = 0x80041014, + wbemErrTransportFailure = 0x80041015, + wbemErrInvalidOperation = 0x80041016, + wbemErrInvalidQuery = 0x80041017, + wbemErrInvalidQueryType = 0x80041018, + wbemErrAlreadyExists = 0x80041019, + wbemErrOverrideNotAllowed = 0x8004101a, + wbemErrPropagatedQualifier = 0x8004101b, + wbemErrPropagatedProperty = 0x8004101c, + wbemErrUnexpected = 0x8004101d, + wbemErrIllegalOperation = 0x8004101e, + wbemErrCannotBeKey = 0x8004101f, + wbemErrIncompleteClass = 0x80041020, + wbemErrInvalidSyntax = 0x80041021, + wbemErrNondecoratedObject = 0x80041022, + wbemErrReadOnly = 0x80041023, + wbemErrProviderNotCapable = 0x80041024, + wbemErrClassHasChildren = 0x80041025, + wbemErrClassHasInstances = 0x80041026, + wbemErrQueryNotImplemented = 0x80041027, + wbemErrIllegalNull = 0x80041028, + wbemErrInvalidQualifierType = 0x80041029, + wbemErrInvalidPropertyType = 0x8004102a, + wbemErrValueOutOfRange = 0x8004102b, + wbemErrCannotBeSingleton = 0x8004102c, + wbemErrInvalidCimType = 0x8004102d, + wbemErrInvalidMethod = 0x8004102e, + wbemErrInvalidMethodParameters = 0x8004102f, + wbemErrSystemProperty = 0x80041030, + wbemErrInvalidProperty = 0x80041031, + wbemErrCallCancelled = 0x80041032, + wbemErrShuttingDown = 0x80041033, + wbemErrPropagatedMethod = 0x80041034, + wbemErrUnsupportedParameter = 0x80041035, + wbemErrMissingParameter = 0x80041036, + wbemErrInvalidParameterId = 0x80041037, + wbemErrNonConsecutiveParameterIds = 0x80041038, + wbemErrParameterIdOnRetval = 0x80041039, + wbemErrInvalidObjectPath = 0x8004103a, + wbemErrOutOfDiskSpace = 0x8004103b, + wbemErrBufferTooSmall = 0x8004103c, + wbemErrUnsupportedPutExtension = 0x8004103d, + wbemErrUnknownObjectType = 0x8004103e, + wbemErrUnknownPacketType = 0x8004103f, + wbemErrMarshalVersionMismatch = 0x80041040, + wbemErrMarshalInvalidSignature = 0x80041041, + wbemErrInvalidQualifier = 0x80041042, + wbemErrInvalidDuplicateParameter = 0x80041043, + wbemErrTooMuchData = 0x80041044, + wbemErrServerTooBusy = 0x80041045, + wbemErrInvalidFlavor = 0x80041046, + wbemErrCircularReference = 0x80041047, + wbemErrUnsupportedClassUpdate = 0x80041048, + wbemErrCannotChangeKeyInheritance = 0x80041049, + wbemErrCannotChangeIndexInheritance = 0x80041050, + wbemErrTooManyProperties = 0x80041051, + wbemErrUpdateTypeMismatch = 0x80041052, + wbemErrUpdateOverrideNotAllowed = 0x80041053, + wbemErrUpdatePropagatedMethod = 0x80041054, + wbemErrMethodNotImplemented = 0x80041055, + wbemErrMethodDisabled = 0x80041056, + wbemErrRefresherBusy = 0x80041057, + wbemErrUnparsableQuery = 0x80041058, + wbemErrNotEventClass = 0x80041059, + wbemErrMissingGroupWithin = 0x8004105a, + wbemErrMissingAggregationList = 0x8004105b, + wbemErrPropertyNotAnObject = 0x8004105c, + wbemErrAggregatingByObject = 0x8004105d, + wbemErrUninterpretableProviderQuery = 0x8004105f, + wbemErrBackupRestoreWinmgmtRunning = 0x80041060, + wbemErrQueueOverflow = 0x80041061, + wbemErrPrivilegeNotHeld = 0x80041062, + wbemErrInvalidOperator = 0x80041063, + wbemErrLocalCredentials = 0x80041064, + wbemErrCannotBeAbstract = 0x80041065, + wbemErrAmendedObject = 0x80041066, + wbemErrClientTooSlow = 0x80041067, + wbemErrNullSecurityDescriptor = 0x80041068, + wbemErrTimeout = 0x80041069, + wbemErrInvalidAssociation = 0x8004106a, + wbemErrAmbiguousOperation = 0x8004106b, + wbemErrQuotaViolation = 0x8004106c, + wbemErrTransactionConflict = 0x8004106d, + wbemErrForcedRollback = 0x8004106e, + wbemErrUnsupportedLocale = 0x8004106f, + wbemErrHandleOutOfDate = 0x80041070, + wbemErrConnectionFailed = 0x80041071, + wbemErrInvalidHandleRequest = 0x80041072, + wbemErrPropertyNameTooWide = 0x80041073, + wbemErrClassNameTooWide = 0x80041074, + wbemErrMethodNameTooWide = 0x80041075, + wbemErrQualifierNameTooWide = 0x80041076, + wbemErrRerunCommand = 0x80041077, + wbemErrDatabaseVerMismatch = 0x80041078, + wbemErrVetoPut = 0x80041079, + wbemErrVetoDelete = 0x8004107a, + wbemErrInvalidLocale = 0x80041080, + wbemErrProviderSuspended = 0x80041081, + wbemErrSynchronizationRequired = 0x80041082, + wbemErrNoSchema = 0x80041083, + wbemErrProviderAlreadyRegistered = 0x80041084, + wbemErrProviderNotRegistered = 0x80041085, + wbemErrFatalTransportError = 0x80041086, + wbemErrEncryptedConnectionRequired = 0x80041087, + wbemErrRegistrationTooBroad = 0x80042001, + wbemErrRegistrationTooPrecise = 0x80042002, + wbemErrTimedout = 0x80043001, + wbemErrResetToDefault = 0x80043002 +} WbemErrorEnum; + [ object, local, -- 2.34.1

1 0

Re: [PATCH] ntdll: set user_shared_data to 0x7fffffff0000 and virtual_alloc_first_teb can run succeeded on android aarch64
by Stefan Dösinger 11 Jan '22

11 Jan '22

I'm taking the liberty of CC'ing wine-devel in my reply... > Am 11.01.2022 um 04:38 schrieb fanwj(a)mail.ustc.edu.cn: > > __ANDROID__ only defined when CC use NDK with flag "-b aarch64-linux-android". if flag is "-b aarch64-windows" it would not defined. > > 在2022-01-11 02:30:57,Stefan Dösinger<stefandoesinger(a)gmail.com>写道： >> >> >>> Am 10.01.2022 um 15:22 schrieb fanwj(a)mail.ustc.edu.cn: >>> >>> The commit only has effect on android-aarch64, because condition macro "if defined(__aarch64__) && defined(__ANDROID__)", it does not affect other platform. Android only has 3-level page table, page size is 4096. pointer(address) size is 8, so every page contain 4096 / 8 = 512 address. it use lg(512) = 9 bits. page use lg(4096) = 12 bits. so 3-level address has valid bits count is 9 * 3 + 12 = 39bits. it can present max address is (2 << 39) - 1 = 0x7fffffffff. user_shared_data must alloc at 0x20000 to end of address. so it is 0x7ffffe0000. 0x7ffe0000 is incorect because it is at middle of address space. and the address space usually be used. >> >> Did you deliberately omit the wine-devel CC? Regardless of where the user address space ends on Android, the user_shared_data struct needs to be in the same place as it is on Windows. Observe that it is in the same place in 32 and 64 bit Windows, and it doesn't care if you run 32 bit Windows with a 2/2 or 3/1 memsplit. The only reason to use it on aarch64 Wine is if aarch64 Windows also places it elsewhere. If something else is mapped at this place already that's a problem with the wine preloader. The preloader is trying to reserve certain addresses as early as possible, before unix libraries get loaded and place data. The user shared data address is a critical one that's at a hardcoded place. Another example would be 0x400000 and 0x140000000, the default load addresses of x86 and x86_64 .exe files (which usually aren't PIC and have no reloc symbols). (Semi-educated guess on my end: I guess the process where ntdll finds the area occupied is explorer.exe, which is spawned through java, so a lot of stuff is already in place. That'll be tricky to solve, because we don't really have a preloader...)

1 0

[PATCH v2] d2d1: Silence SetSegmentFlags FIXME when setting default value
by Stefan Brüns 11 Jan '22

11 Jan '22

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- v2: use TRACE when setting flags to D2D1_PATH_SEGMENT_NONE dlls/d2d1/geometry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..a58dadcad85 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,7 +2773,10 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + if (flags == D2D1_PATH_SEGMENT_NONE) + TRACE("iface %p, mode %#x.\n", iface, mode); + else + FIXME("iface %p, flags %#x stub!\n", iface, flags); } static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *iface, -- 2.34.1

2 1

[PATCH] d2d1: Silence SetSegmentFlags FIXME when setting default value
by Stefan Brüns 11 Jan '22

11 Jan '22

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed for the current segment, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- dlls/d2d1/geometry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..ac5f1019f3f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,6 +2773,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { + if (flags == D2D1_PATH_SEGMENT_NONE) + return; FIXME("iface %p, flags %#x stub!\n", iface, flags); } -- 2.34.1

2 1

[PATCH vkd3d 1/4] vkd3d-shader: Do not validate the target type in vkd3d_shader_scan().
by Zebediah Figura 11 Jan '22

11 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3982d0730..47fe3d60d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1025,7 +1025,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level); -- 2.34.1

5 11

[PATCH vkd3d] vkd3d-shader: Add tiled resource opcode definitions.
by Zebediah Figura 10 Jan '22

10 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/sm4.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index f6b4b612d..62bb4d12b 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -354,6 +354,22 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DTOU = 0xd7, VKD3D_SM5_OP_ITOD = 0xd8, VKD3D_SM5_OP_UTOD = 0xd9, + VKD3D_SM5_OP_GATHER4_S = 0xdb, + VKD3D_SM5_OP_GATHER4_C_S = 0xdc, + VKD3D_SM5_OP_GATHER4_PO_S = 0xdd, + VKD3D_SM5_OP_GATHER4_PO_C_S = 0xde, + VKD3D_SM5_OP_LD_S = 0xdf, + VKD3D_SM5_OP_LD2DMS_S = 0xe0, + VKD3D_SM5_OP_LD_UAV_TYPED_S = 0xe1, + VKD3D_SM5_OP_LD_RAW_S = 0xe2, + VKD3D_SM5_OP_LD_STRUCTURED_S = 0xe3, + VKD3D_SM5_OP_SAMPLE_LOD_S = 0xe4, + VKD3D_SM5_OP_SAMPLE_C_LZ_S = 0xe5, + VKD3D_SM5_OP_SAMPLE_CL_S = 0xe6, + VKD3D_SM5_OP_SAMPLE_B_CL_S = 0xe7, + VKD3D_SM5_OP_SAMPLE_GRAD_CL_S = 0xe8, + VKD3D_SM5_OP_SAMPLE_C_CL_S = 0xe9, + VKD3D_SM5_OP_CHECK_ACCESS_FULLY_MAPPED = 0xea, }; enum vkd3d_sm4_instruction_modifier -- 2.34.1

4 3

[PATCH] msvidc32: Make the temporary buffer large enough according to the output depth
by André Zwing 10 Jan '22

10 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- While working on https://bugs.winehq.org/show_bug.cgi?id=52278 I came across those lines and think it's a quite obviously fix --- dlls/msvidc32/msvideo1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 7b866d04caf..cf45b9f169e 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -459,7 +459,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD if (icd->lpbiOutput->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * icd->lpbiOutput->biBitCount / 8); if (!output) return ICERR_MEMORY; } @@ -505,7 +505,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW if (icd->lpbiDst->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * icd->lpbiDst->biBitCount / 8); if (!output) return ICERR_MEMORY; } -- 2.25.1

1 0

[PATCH] msvidc32: Make the temporary buffer large enough according to the output depth
by André Zwing 10 Jan '22

10 Jan '22

--- While working on https://bugs.winehq.org/show_bug.cgi?id=52278 I came across those lines and think it's a quite obviously fix Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/msvidc32/msvideo1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 7b866d04caf..cf45b9f169e 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -459,7 +459,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD if (icd->lpbiOutput->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * icd->lpbiOutput->biBitCount / 8); if (!output) return ICERR_MEMORY; } @@ -505,7 +505,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW if (icd->lpbiDst->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * icd->lpbiDst->biBitCount / 8); if (!output) return ICERR_MEMORY; } -- 2.25.1

1 0

[PATCH vkd3d v2 10/10] vkd3d-shader/hlsl: Support array initializers.
by Francisco Casas 10 Jan '22

10 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6fb4eb78..158ab492 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1347,7 +1347,14 @@ static void generic_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *va } else if (type->type == HLSL_CLASS_ARRAY) { - hlsl_fixme(ctx, &v->loc, "Initializers for arrays not supported yet."); + for (int i = 0; i < type->e.array.elements_count; i++) + { + struct hlsl_type *elem_type = type->e.array.type; + unsigned int elem_offset = i * elem_type->reg_size; + + generic_var_initializer(ctx, var, v, reg_offset + elem_offset, elem_type, + initializer_i, instrs); + } return; } else if (type->type == HLSL_CLASS_OBJECT) -- 2.25.1

1 0

[PATCH vkd3d v2 09/10] vkd3d-shader/hlsl: Use generic variable initializer for struct fields.
by Francisco Casas 10 Jan '22

10 Jan '22

This adds support for nested structs and implicit casting of initializer arguments. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 42 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 69ae48a1..6fb4eb78 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1326,39 +1326,6 @@ static void numeric_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *va } } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, - struct parse_initializer *initializer) -{ - struct hlsl_type *type = var->data_type; - struct hlsl_struct_field *field; - unsigned int i = 0; - - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) - { - struct hlsl_ir_node *node = initializer->args[i]; - struct hlsl_ir_store *store; - struct hlsl_ir_constant *c; - - if (i++ >= initializer->args_count) - break; - - if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) - { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) - break; - list_add_tail(initializer->instrs, &c->node.entry); - - if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) - break; - list_add_tail(initializer->instrs, &store->node.entry); - } - else - { - hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); - } - } -} - static void generic_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_variable_def *v, unsigned int reg_offset, struct hlsl_type *type, unsigned int *initializer_i, struct list *instrs) @@ -1369,7 +1336,14 @@ static void generic_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *va } else if (type->type == HLSL_CLASS_STRUCT) { - struct_var_initializer(ctx, var, &v->initializer); + struct hlsl_struct_field *field; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + generic_var_initializer(ctx, var, v, reg_offset + field->reg_offset, field->type, + initializer_i, instrs); + } + return; } else if (type->type == HLSL_CLASS_ARRAY) { -- 2.25.1

1 0

[PATCH vkd3d v2 05/10] tests: Test flattening of initializers.
by Francisco Casas 10 Jan '22

10 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-flattening.shader_test | 54 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 tests/hlsl-initializer-flattening.shader_test diff --git a/Makefile.am b/Makefile.am index 1ac43c6d..d15e50c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-flattening.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ @@ -294,6 +295,7 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-flattening.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ diff --git a/tests/hlsl-initializer-flattening.shader_test b/tests/hlsl-initializer-flattening.shader_test new file mode 100644 index 00000000..b32ced40 --- /dev/null +++ b/tests/hlsl-initializer-flattening.shader_test @@ -0,0 +1,54 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aaa = {1, {{{2, {3}}, 4}}}; + return aaa; +} + +[test] +draw quad +probe all rgba (1, 2, 3, 4) + + +[pixel shader] +float4 main() : sv_target +{ + float4 aaa[3] = { + 11, {{{12, {13}}, 14}, + 21, 22}, 23, {{24, + 31, {32, 33}, 34}}, + }; + return aaa[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +struct stu1 +{ + float4 aaa; + float4 bbb; +}; + +struct stu2 +{ + int3 ccc; + stu1 ddd; +}; + +float4 main() : sv_target +{ + struct stu2 val = { + 11, {12, 13, + 21, {{{22}}}, 23}, {{24, + 31, 32}}, 33, 34, + }; + return val.ddd.aaa; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

1 0

[PATCH vkd3d v2 04/10] tests: Test complex initializers for numeric types.
by Francisco Casas 10 Jan '22

10 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-initializer-numeric.shader_test | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 tests/hlsl-initializer-numeric.shader_test diff --git a/Makefile.am b/Makefile.am index cdb59a85..1ac43c6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-invalid.shader_test \ @@ -295,6 +296,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test new file mode 100644 index 00000000..2fce3909 --- /dev/null +++ b/tests/hlsl-initializer-numeric.shader_test @@ -0,0 +1,35 @@ +[pixel shader] +float4 main() : sv_target +{ + int4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float3 aa = {1, 2, 3}; + float4 bb = {aa.x, aa.y, aa.z, 4.0}; + return bb; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 -- 2.25.1

1 0

[PATCH vkd3d v2 03/10] tests: Test invalid number of arguments on initializers.
by Francisco Casas 10 Jan '22

10 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + ...lsl-initializer-invalid-n-args.shader_test | 95 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 tests/hlsl-initializer-invalid-n-args.shader_test diff --git a/Makefile.am b/Makefile.am index 4a079c11..cdb59a85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ @@ -292,6 +293,7 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ diff --git a/tests/hlsl-initializer-invalid-n-args.shader_test b/tests/hlsl-initializer-invalid-n-args.shader_test new file mode 100644 index 00000000..bde6024f --- /dev/null +++ b/tests/hlsl-initializer-invalid-n-args.shader_test @@ -0,0 +1,95 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 + }; + return color[1][1]; +} + +[test] +draw quad +probe all rgba (17, 18, 19, 20) + + +[pixel shader fail] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 + }; + return color[1][1]; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 + }; + return color[1][1]; +} + + +[pixel shader] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, 32, + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (22, 23, 24, 25) + + +[pixel shader fail] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, 32, 33, + }; + return val.bbb[1].foo; +} + + +[pixel shader fail] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, + }; + return val.bbb[1].foo; +} -- 2.25.1

1 0

[PATCH vkd3d v2 02/10] tests: Test struct initializers.
by Francisco Casas 10 Jan '22

10 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 78 +++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 tests/hlsl-initializer-struct.shader_test diff --git a/Makefile.am b/Makefile.am index efe99124..4a079c11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -293,6 +294,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test new file mode 100644 index 00000000..d5181f0e --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,78 @@ +[pixel shader] +struct stu { + int3 aaa; + float3 bbb; + double2 ccc; + float4 ddd; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 21, 22, 23, + 31, 32, + 41, 42, 43, 44, + 51 + }; + return val.ddd; +} + +[test] +draw quad +probe all rgba (41, 42, 43, 44) + + +[pixel shader] +struct stu { + int3 aaa; + float3 bbb[2]; + double2 ccc; + float4 ddd[3][2]; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 211, 212, 213, 221, 222, 223, + 31, 32, + 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124, + 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224, + 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324, + 51 + }; + return val.ddd[2][0]; +} + +[test] +draw quad +probe all rgba (4311, 4312, 4313, 4314) + + +[pixel shader] +struct stu { + int3 aaa; + struct { + float4 foo; + int2 bar; + } bbb[3]; +}; + +float4 main() : sv_target +{ + struct stu val = { + 1, 2, 3, + 11, 12, 13, 14, 15, 16, + 21, 22, 23, 24, 25, 26, + 31, 32, 33, 34, 35, 36 + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + -- 2.25.1

1 0

[PATCH vkd3d v2 01/10] tests: Test array initializers.
by Francisco Casas 10 Jan '22

10 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 ++ .../hlsl-initializer-local-array.shader_test | 36 ++++++++++++++++++ .../hlsl-initializer-static-array.shader_test | 38 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 tests/hlsl-initializer-local-array.shader_test create mode 100644 tests/hlsl-initializer-static-array.shader_test diff --git a/Makefile.am b/Makefile.am index 20fee06d..efe99124 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,8 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -289,6 +291,8 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-local-array.shader_test b/tests/hlsl-initializer-local-array.shader_test new file mode 100644 index 00000000..9ea35d52 --- /dev/null +++ b/tests/hlsl-initializer-local-array.shader_test @@ -0,0 +1,36 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[3] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34 + }; + return array_loc[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[2][4] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, + }; + return array_loc[1][2]; +} + +[test] +draw quad +probe all rgba (71, 72, 73, 74) + diff --git a/tests/hlsl-initializer-static-array.shader_test b/tests/hlsl-initializer-static-array.shader_test new file mode 100644 index 00000000..bcddc524 --- /dev/null +++ b/tests/hlsl-initializer-static-array.shader_test @@ -0,0 +1,38 @@ +[pixel shader] +static const float4 array_st[3] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34 +}; + +float4 main() : SV_TARGET +{ + return array_st[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +static const float4 array_st[4][2] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, +}; + +float4 main() : SV_TARGET +{ + return array_st[2][1]; +} + +[test] +draw quad +probe all rgba (61, 62, 63, 64) + -- 2.25.1

1 0

[PATCH v3 1/6] d3d8/tests: Test for window changes when it's not active.
by Gabriel Ivăncescu 10 Jan '22

10 Jan '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I'm sending these tests first to show the behavior across d3d versions. I do not plan to fix them during code freeze, except for ddraw, since I'm not aware of any regressions due to them. I might fix them after code freeze though. dlls/d3d8/tests/device.c | 160 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fc94dca..db41510 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3943,6 +3943,7 @@ static void test_window_style(void) struct device_desc device_desc; LONG style, expected_style; IDirect3DDevice8 *device; + HWND active_window; IDirect3D8 *d3d8; HRESULT hr; ULONG ref; @@ -4055,6 +4056,165 @@ static void test_window_style(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(device_window); + DestroyWindow(focus_window); + + /* Window changes are done only if the current thread has the foreground window */ + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + active_window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 20, 30, 40, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + ret = SetForegroundWindow(active_window); + ok(ret, "Failed to set foreground window.\n"); + ok(GetActiveWindow() == active_window, "Unexpected active window.\n"); + + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + device = create_device(d3d8, focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style || broken(style == (expected_style & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ShowWindow(device_window, SW_SHOWNOACTIVATE); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style || broken(style == (expected_style & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", expected_style, style); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(active_window); + DestroyWindow(device_window); + DestroyWindow(focus_window); + + focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + active_window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 20, 30, 40, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(active_window); + ok(GetActiveWindow() == active_window, "Unexpected active window.\n"); + + device_desc.device_window = device_window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + device = create_device(d3d8, focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + ShowWindow(device_window, SW_SHOWNOACTIVATE); + + /* Windows 8 and some versions of Windows 10 have some pretty + inconsistent behavior but topmost is set even when inactive. */ + style = GetWindowLongA(device_window, GWL_EXSTYLE); + if (broken(style & WS_EX_TOPMOST)) + { + win_skip("topmost set when inactive due to inconsistent behavior, skipping related tests...\n"); + goto skip_inactive; + } + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(active_window); + ok(GetActiveWindow() == active_window, "Unexpected active window."); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + SetForegroundWindow(focus_window); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + todo_wine ok(style == device_style || broken(style == (device_style & ~WS_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window style %#x, got %#x.\n", device_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle || broken(style == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW)) /* w1064v1809 */, + "Expected device window extended style %#x, got %#x.\n", device_exstyle, style); + +skip_inactive: + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(active_window); done: IDirect3D8_Release(d3d8); -- 2.34.1

3 14

Soon Windows 8 clean runs on the TestBot?
by Francois Gouget 10 Jan '22

10 Jan '22

1 0

[PATCH] po: Update German translation.
by Julian Rüger 10 Jan '22

10 Jan '22

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 1/3] ddraw/tests: Reduce precision in test_filling_convention.
by Stefan Dösinger 10 Jan '22

10 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- d3d9 and earlier cards fail this test (tested on r500 and by Matteo on a gf4go, aka gf2). Since applications using ddraw.dll are unlikely to depend on the higher precision of d3d10+ cards, unconditionally increase the added offsets in the test. As far as my hardware is concerned we can now remove the todo_wine in this test because the offset we add for the "nudge" primitives is larger than the offset wined3d adds for correcting the filling convention. I'll wait for Matteo's word on the geforce 4 though. --- dlls/ddraw/tests/ddraw1.c | 6 ++++-- dlls/ddraw/tests/ddraw2.c | 6 ++++-- dlls/ddraw/tests/ddraw4.c | 6 ++++-- dlls/ddraw/tests/ddraw7.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 11c14777122..efbecf04c2d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14513,8 +14513,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 33ad957b644..65ac21d73ad 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15443,8 +15443,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 61828430331..ce2333d93f0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18493,8 +18493,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}}; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fc0f854e125..4cf57bfcfd3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18745,8 +18745,10 @@ static void test_filling_convention(void) D3DVIEWPORT7 vp = { 0, 0, vp_size, vp_size, 0.0, 1.0 }; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position; -- 2.34.1

3 6

[PATCH] d3d11: Always initialize out view pointer in CreateRenderTargetView().
by Nikolay Sivov 10 Jan '22

10 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51195 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 4 ++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d7fc9efa901..ca12f185ec5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2939,8 +2939,10 @@ static void test_create_rendertarget_view(void) if (!enable_debug_layer) { + rtview = (void *)0xdeadbeef; hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); } expected_refcount = get_refcount(device) + 1; @@ -3057,8 +3059,10 @@ static void test_create_rendertarget_view(void) } get_rtv_desc(&rtv_desc, &invalid_desc_tests[i].rtv_desc); + rtview = (void *)0xdeadbeef; hr = ID3D10Device_CreateRenderTargetView(device, texture, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); ID3D10Resource_Release(texture); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 546449037ce..626e4889708 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3334,6 +3334,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; @@ -5957,6 +5959,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a76e5fa1295..b8fa462dc39 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4050,8 +4050,10 @@ static void test_create_rendertarget_view(void) if (!enable_debug_layer) { + rtview = (void *)0xdeadbeef; hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); } expected_refcount = get_refcount(device) + 1; @@ -4168,8 +4170,10 @@ static void test_create_rendertarget_view(void) } get_rtv_desc(&rtv_desc, &invalid_desc_tests[i].rtv_desc); + rtview = (void *)0xdeadbeef; hr = ID3D11Device_CreateRenderTargetView(device, texture, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); ID3D11Resource_Release(texture); } -- 2.34.1

3 2

[PATCH] ntdll: set user_shared_data to 0x7fffffff0000 and virtual_alloc_first_teb can run succeeded on android aarch64
by fanwj＠mail.ustc.edu.cn 10 Jan '22

10 Jan '22

--- dlls/ntdll/unix/virtual.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1f817cd977d..543c04e0dae 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -173,7 +173,16 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +#if defined(__aarch64__) && defined(__ANDROID__) +/* Note: Android-AARCH64 only support 3-level page table: + * user_shared_data = page_size * pow(page_size / ptr_size, page_level) - 0x20000 + * = 0x1000 * pow(0x1000 / 8, 3) - 0x20000 + * = 0x7ffffe0000 + */ +struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffffe0000; +#else struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +#endif /* TEB allocation blocks */ static void *teb_block; -- 2.32.0 (Apple Git-132)

2 1

[PATCH vkd3d] vkd3d: Handle D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE using a Vulkan extension.
by Conor McCarthy 10 Jan '22

10 Jan '22

Used by Cyberpunk 2077. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 14 +++++++++----- libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index afe2c6c3..6e850a6d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -128,6 +128,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), + VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), /* EXT extensions */ VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6cc9c565..fe1f7fc4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3143,7 +3143,8 @@ static VkSamplerMipmapMode vk_mipmap_mode_from_d3d12(D3D12_FILTER_TYPE type) } } -static VkSamplerAddressMode vk_address_mode_from_d3d12(D3D12_TEXTURE_ADDRESS_MODE mode) +static VkSamplerAddressMode vk_address_mode_from_d3d12(const struct d3d12_device *device, + D3D12_TEXTURE_ADDRESS_MODE mode) { switch (mode) { @@ -3155,7 +3156,10 @@ static VkSamplerAddressMode vk_address_mode_from_d3d12(D3D12_TEXTURE_ADDRESS_MOD return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; case D3D12_TEXTURE_ADDRESS_MODE_BORDER: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; - /* D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE requires VK_KHR_mirror_clamp_to_edge. */ + case D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE: + if (device->vk_info.KHR_sampler_mirror_clamp_to_edge) + return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; + /* Fall through */ default: FIXME("Unhandled address mode %#x.\n", mode); return VK_SAMPLER_ADDRESS_MODE_REPEAT; @@ -3184,9 +3188,9 @@ static VkResult d3d12_create_sampler(struct d3d12_device *device, D3D12_FILTER f sampler_desc.magFilter = vk_filter_from_d3d12(D3D12_DECODE_MAG_FILTER(filter)); sampler_desc.minFilter = vk_filter_from_d3d12(D3D12_DECODE_MIN_FILTER(filter)); sampler_desc.mipmapMode = vk_mipmap_mode_from_d3d12(D3D12_DECODE_MIP_FILTER(filter)); - sampler_desc.addressModeU = vk_address_mode_from_d3d12(address_u); - sampler_desc.addressModeV = vk_address_mode_from_d3d12(address_v); - sampler_desc.addressModeW = vk_address_mode_from_d3d12(address_w); + sampler_desc.addressModeU = vk_address_mode_from_d3d12(device, address_u); + sampler_desc.addressModeV = vk_address_mode_from_d3d12(device, address_v); + sampler_desc.addressModeW = vk_address_mode_from_d3d12(device, address_w); sampler_desc.mipLodBias = mip_lod_bias; sampler_desc.anisotropyEnable = D3D12_DECODE_IS_ANISOTROPIC_FILTER(filter); sampler_desc.maxAnisotropy = max_anisotropy; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a3289878..d448eaa0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -118,6 +118,7 @@ struct vkd3d_vulkan_info bool KHR_image_format_list; bool KHR_maintenance3; bool KHR_push_descriptor; + bool KHR_sampler_mirror_clamp_to_edge; /* EXT device extensions */ bool EXT_conditional_rendering; bool EXT_debug_marker; -- 2.34.1

2 1

[PATCH vkd3d] vkd3d-shader/dxbc: Emit a fixme when a DXIL shader chunk is found.
by Conor McCarthy 10 Jan '22

10 Jan '22

Simplifies detection of SM6+ shaders, e.g. Horizon Zero Dawn and Cyberpunk 2077. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b83e2654..c5ba3575 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2024,6 +2024,10 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont TRACE("Skipping AON9 shader code chunk.\n"); break; + case TAG_DXIL: + FIXME("Skipping DXIL shader model 6+ code chunk.\n"); + break; + default: TRACE("Skipping chunk %#x.\n", tag); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 62073cf1..9c022777 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1218,6 +1218,7 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain, ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_DXIL MAKE_TAG('D', 'X', 'I', 'L') #define TAG_ISG1 MAKE_TAG('I', 'S', 'G', '1') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSG1 MAKE_TAG('O', 'S', 'G', '1') -- 2.34.1

2 1

[PATCH] ntdll: set correct address_space_limit and user_shared_data for android aarch64, virtual_alloc_first_teb can run succeeded on android aarch64
by fanwj＠mail.ustc.edu.cn 10 Jan '22

10 Jan '22

--- dlls/ntdll/unix/virtual.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1f817cd977d..65ab5032ce1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -158,14 +158,22 @@ static void *address_space_start = (void *)0x10000; #endif #ifdef __aarch64__ +#ifdef __ANDROID__ +/* Note: Android-AARCH64 only support 3-level page table, address_space_limit is page_size * pow(page_size / ptr_size, page_level) - 0x10000 = 4096 * pow(4096 / 8, 3) - 0x10000 = 0x7fffff0000 */ +static void *address_space_limit = (void *)0x7fffff0000; +#else static void *address_space_limit = (void *)0xffffffff0000; /* top of the total available address space */ +#endif #elif defined(_WIN64) static void *address_space_limit = (void *)0x7fffffff0000; #else static void *address_space_limit = (void *)0xc0000000; #endif -#ifdef _WIN64 +#if defined(__aarch64__) && defined(__ANDROID__) +static void *user_space_limit = (void *)0x7fffff0000; /* top of the user address space */ +static void *working_set_limit = (void *)0x7fffff0000; /* top of the current working set */ +#elif defined(_WIN64) static void *user_space_limit = (void *)0x7fffffff0000; /* top of the user address space */ static void *working_set_limit = (void *)0x7fffffff0000; /* top of the current working set */ #else @@ -173,7 +181,11 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +#if defined(__aarch64__) && defined(__ANDROID__) +struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffffe0000; /* user_shared_data use last 64kB address, set to address_space_limit - 0x10000 */ +#else struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; +#endif /* TEB allocation blocks */ static void *teb_block; -- 2.32.0 (Apple Git-132)

1 0

[PATCH] kernel32/tests: Use INVALID_HANDLE_VALUE instead of 0xffffffff
by Alex Henrie 10 Jan '22

10 Jan '22

There's no guarantee that 0xffffffff is an invalid handle on 64-bit. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 8ec3a5433ee..77338e7f767 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -206,13 +206,13 @@ static void testGetModuleFileName_Wrong(void) if (is_unicode_enabled) { bufW[0] = '*'; - ok(GetModuleFileNameW((void*)0xffffffff, bufW, ARRAY_SIZE(bufW)) == 0, + ok(GetModuleFileNameW(INVALID_HANDLE_VALUE, bufW, ARRAY_SIZE(bufW)) == 0, "Unexpected success in module handle\n"); ok(bufW[0] == '*', "When failing, buffer shouldn't be written to\n"); } bufA[0] = '*'; - ok(GetModuleFileNameA((void*)0xffffffff, bufA, sizeof(bufA)) == 0, "Unexpected success in module handle\n"); + ok(GetModuleFileNameA(INVALID_HANDLE_VALUE, bufA, sizeof(bufA)) == 0, "Unexpected success in module handle\n"); ok(bufA[0] == '*', "When failing, buffer shouldn't be written to\n"); } -- 2.34.1

2 1

[PATCH v3 1/2] server: Terminating '\' in the registry root name is optional.
by Dmitry Timoshkov 10 Jan '22

10 Jan '22

v3: Check the length and reject invalid root name. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 2 -- server/registry.c | 62 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..74d82b85be4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -417,7 +417,6 @@ todo_wine pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); pNtClose( key ); pRtlFreeUnicodeString( &str ); @@ -569,7 +568,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); diff --git a/server/registry.c b/server/registry.c index b00abdbc004..4ed3ee9896e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -127,7 +127,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; -static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -411,7 +411,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) { static const WCHAR backslash = '\\'; struct key *key = (struct key *) obj; - data_size_t len = sizeof(root_name) - sizeof(WCHAR); + data_size_t len = sizeof(root_name); char *ret; if (key->flags & KEY_DELETED) @@ -431,7 +431,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } - memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); + memcpy( ret, root_name, sizeof(root_name) ); return (WCHAR *)ret; } @@ -474,7 +474,7 @@ static void key_destroy( struct object *obj ) } /* get the request vararg as registry path */ -static inline void get_req_path( struct unicode_str *str, int skip_root ) +static inline struct unicode_str *get_req_path( struct unicode_str *str, int skip_root ) { str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); @@ -483,7 +483,19 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) { str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); + if (str->len) + { + if (str->str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return NULL; + } + + str->str++; + str->len -= sizeof(WCHAR); + } } + return str; } /* return the next token in a given path */ @@ -734,6 +746,12 @@ static struct key *follow_symlink( struct key *key, int iteration ) if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); + if (path.len) + { + if (path.str[0] != '\\') return NULL; + path.str++; + path.len -= sizeof(WCHAR); + } key = root_key; token.str = NULL; @@ -2156,6 +2174,17 @@ DECL_HANDLER(create_key) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len) + { + if (name.str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return; + } + + name.str++; + name.len -= sizeof(WCHAR); + } } /* NOTE: no access rights are required from the parent handle to create a key */ @@ -2184,7 +2213,12 @@ DECL_HANDLER(open_key) /* NOTE: no access rights are required to open the parent key, only the child key */ if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + if (!get_req_path( &name, !req->parent )) + { + release_object( parent ); + return; + } + if ((key = open_key( parent, &name, access, req->attributes ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); @@ -2314,6 +2348,17 @@ DECL_HANDLER(load_registry) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len) + { + if (name.str[0] != '\\') + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return; + } + + name.str++; + name.len -= sizeof(WCHAR); + } } if ((parent = get_parent_hkey_obj( objattr->rootdir ))) @@ -2344,7 +2389,12 @@ DECL_HANDLER(unload_registry) if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + if (!get_req_path( &name, !req->parent )) + { + release_object( parent ); + return; + } + if ((key = open_key( parent, &name, access, req->attributes ))) { if (key->obj.handle_count) -- 2.34.1

2 2

[PATCH v2 1/2] user32/tests: Add some tests for WM_NCCALCSIZE.
by Dmitry Timoshkov 10 Jan '22

10 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0156987f529..b93839e40b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12328,6 +12328,75 @@ static void test_DragDetect(void) ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); } +static void test_WM_NCCALCSIZE(void) +{ + WNDCLASSA cls; + HWND hwnd; + NCCALCSIZE_PARAMS params; + WINDOWPOS winpos; + RECT client_rect, window_rect; + LRESULT ret; + + cls.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "dummy_window_class"; + ret = RegisterClassA(&cls); + ok(ret, "RegisterClass error %u\n", GetLastError()); + + hwnd = CreateWindowExA(0, "dummy_window_class", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError()); + + GetWindowRect(hwnd, &window_rect); + params.rgrc[0] = window_rect; + params.rgrc[1] = window_rect; + GetClientRect(hwnd, &client_rect); + MapWindowPoints(hwnd, 0, (POINT *)&client_rect, 2); + params.rgrc[2] = client_rect; + + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = window_rect.right - window_rect.left; + winpos.cy = window_rect.bottom - window_rect.top; + winpos.flags = SWP_NOMOVE; + params.lppos = &winpos; + + ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + params.rgrc[0] = window_rect; + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + GetWindowRect(hwnd, &window_rect); + ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + GetWindowRect(hwnd, &window_rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -12497,6 +12566,7 @@ START_TEST(win) test_SC_SIZE(); test_cancel_mode(); test_DragDetect(); + test_WM_NCCALCSIZE(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); -- 2.34.1

2 2

[PATCH 2/2] uxtheme/tests: Avoid fix blurry apps popup in test_GetThemePartSize().
by Zhiyi Zhang 10 Jan '22

10 Jan '22

When changing DPI, a fix blurry apps popup may appear on Windows 10. The popup may interfere with other tests as it steals focus, causing them to fail. So set IgnorePerProcessSystemDPIToast to 1 to temporarily disable the popup. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b085e639784..0385af663e3 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -997,11 +997,13 @@ todo_wine static void test_GetThemePartSize(void) { + static const DWORD enabled = 1; DPI_AWARENESS_CONTEXT old_context; unsigned int old_dpi, current_dpi; HTHEME htheme = NULL; HWND hwnd = NULL; SIZE size, size2; + HKEY key = NULL; HRESULT hr; HDC hdc; @@ -1011,6 +1013,12 @@ static void test_GetThemePartSize(void) return; } + /* Set IgnorePerProcessSystemDPIToast to 1 to disable "fix blurry apps popup" on Windows 10, + * which may interfere other tests because it steals focus */ + RegOpenKeyA(HKEY_CURRENT_USER, "Control Panel\\Desktop", &key); + RegSetValueExA(key, "IgnorePerProcessSystemDPIToast", 0, REG_DWORD, (const BYTE *)&enabled, + sizeof(enabled)); + old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); current_dpi = get_primary_monitor_effective_dpi(); old_dpi = current_dpi; @@ -1100,6 +1108,11 @@ done: CloseThemeData(htheme); if (get_primary_monitor_effective_dpi() != old_dpi) set_primary_monitor_effective_dpi(old_dpi); + if (key) + { + RegDeleteValueA(key, "IgnorePerProcessSystemDPIToast"); + RegCloseKey(key); + } pSetThreadDpiAwarenessContext(old_context); } -- 2.32.0

1 0

[PATCH 1/2] user32/tests: Avoid fix blurry apps popup in test_DisplayConfigSetDeviceInfo().
by Zhiyi Zhang 10 Jan '22

10 Jan '22

When changing DPI, a fix blurry apps popup may appear on Windows 10. The popup may interfere with other tests as it steals focus, causing them to fail. So set IgnorePerProcessSystemDPIToast to 1 to temporarily disable the popup. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52108 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index a857b295849..5e14c536a76 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1958,12 +1958,14 @@ static void test_display_config(void) static void test_DisplayConfigSetDeviceInfo(void) { static const unsigned int scales[] = {100, 125, 150, 175, 200, 225, 250, 300, 350, 400, 450, 500}; + static const DWORD enabled = 1; int current_scale, current_scale_idx, recommended_scale_idx, step, dpi, old_dpi; D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; DISPLAYCONFIG_GET_SOURCE_DPI_SCALE get_scale_req; DISPLAYCONFIG_SET_SOURCE_DPI_SCALE set_scale_req; D3DKMT_CLOSEADAPTER close_adapter_desc; NTSTATUS status; + HKEY key; LONG ret; #define CHECK_FUNC(func) \ @@ -1997,6 +1999,12 @@ static void test_DisplayConfigSetDeviceInfo(void) goto failed; } + /* Set IgnorePerProcessSystemDPIToast to 1 to disable "fix blurry apps popup" on Windows 10, + * which may interfere other tests because it steals focus */ + RegOpenKeyA(HKEY_CURRENT_USER, "Control Panel\\Desktop", &key); + RegSetValueExA(key, "IgnorePerProcessSystemDPIToast", 0, REG_DWORD, (const BYTE *)&enabled, + sizeof(enabled)); + dpi = get_primary_dpi(); old_dpi = dpi; current_scale = dpi * 100 / 96; @@ -2028,6 +2036,10 @@ static void test_DisplayConfigSetDeviceInfo(void) ok(ret == NO_ERROR, "DisplayConfigSetDeviceInfo failed, returned %d.\n", ret); ok(old_dpi == get_primary_dpi(), "Expected %d, got %d.\n", get_primary_dpi(), old_dpi); + /* Remove IgnorePerProcessSystemDPIToast registry value */ + RegDeleteValueA(key, "IgnorePerProcessSystemDPIToast"); + RegCloseKey(key); + failed: close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); -- 2.32.0

1 0

[PATCH] comctl32/tests: Drop mru test workarounds for Windows <= 2000
by Alex Henrie 10 Jan '22

10 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/tests/mru.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 87677b33902..6a9a04d9663 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -340,15 +340,11 @@ static void test_MRUListA(void) iRet, GetLastError()); /* Add (NULL string) */ - if (0) - { - /* Some native versions crash when passed NULL or fail to SetLastError() */ SetLastError(0); iRet = pAddMRUStringA(hMRU, NULL); - ok(iRet == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%d\n", + todo_wine ok(iRet == 0 && !GetLastError(), + "AddMRUStringA(NULL str) expected 0,0 got %d,%d\n", iRet, GetLastError()); - } /* Add 3 strings. Check the registry is correct after each add */ SetLastError(0); @@ -450,7 +446,7 @@ static void test_MRUListA(void) pFreeMRUList(hMRU); } - /* FreeMRUList(NULL) crashes on Win98 OSR0 */ + pFreeMRUList(NULL); /* should not crash */ } typedef struct { @@ -504,13 +500,9 @@ static void test_EnumMRUList(void) return; } - /* NULL handle */ - if (0) - { - /* crashes on NT4, passed on Win2k, XP, 2k3, Vista, 2k8 */ - pEnumMRUListA(NULL, 0, NULL, 0); - pEnumMRUListW(NULL, 0, NULL, 0); - } + /* NULL handle - should not crash */ + pEnumMRUListA(NULL, 0, NULL, 0); + pEnumMRUListW(NULL, 0, NULL, 0); } static void test_FindMRUData(void) -- 2.34.1

1 0

I withdraw the bug patch sent
by Hodong Kim 09 Jan '22

09 Jan '22

I withdraw the bug patch sent. sorry. [PATCH resend] winex11.drv: Avoid duplicate executions of event processing https://www.winehq.org/pipermail/wine-devel/2022-January/204248.html

1 0

[PATCH resend] winex11.drv: Avoid duplicate executions of event processing
by Hodong Kim 08 Jan '22

08 Jan '22

In the Korean locale, wine uses the on-the-spot style. export LC_ALL="ko_KR.UTF-8" wine64 notepad In this case, the problem is that the preedit string is not displayed properly. If XIM_COMMIT and XIM_PREEDIT_DRAW are sent from the input method, X11DRV_KeyEvent() is repeatedly executed in wine, and as a result, the order of commit string and preedit string is frequently changed. So, it often happens that the preedit string is not displayed when entering Korean. Also, the X11DRV_MsgWaitForMultipleObjectsEx() function in evenc.c runs periodically at about 0.25 second intervals, even if there are no events. Therefore, there is a possibility that the process_events() is executed repeatedly for a certain event. This patch prevents duplicate execution of X11DRV_KeyEvent() and X11DRV_MsgWaitForMultipleObjectsEx(). As a result, it prevents the order of commit string and preedit string from being reversed. Signed-off-by: Hodong Kim <hodong(a)nimfsoft.com> --- dlls/winex11.drv/event.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..d56b4fc2fde 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -80,6 +80,15 @@ extern BOOL ximInComposeMode; #define XEMBED_UNREGISTER_ACCELERATOR 13 #define XEMBED_ACTIVATE_ACCELERATOR 14 +static CRITICAL_SECTION event_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &event_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": event_section") } +}; +static CRITICAL_SECTION event_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ) = NULL; void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ) = NULL; @@ -407,10 +416,13 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) { XEvent event, prev_event; - int count = 0; - BOOL queued = FALSE; - enum event_merge_action action = MERGE_DISCARD; - + int count; + BOOL queued; + enum event_merge_action action; + EnterCriticalSection( &event_section ); + count = 0; + queued = FALSE; + action = MERGE_DISCARD; prev_event.type = 0; while (XCheckIfEvent( display, &event, filter, (char *)arg )) { @@ -445,6 +457,12 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + else if (event.type == KeyPress || event.type == KeyRelease) + { + BOOL ret = call_event_handler( display, &event ); + LeaveCriticalSection( &event_section ); + return ret; + } get_event_data( &event ); if (prev_event.type) action = merge_events( &prev_event, &event ); switch( action ) @@ -468,6 +486,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X free_event_data( &prev_event ); XFlush( gdi_display ); if (count) TRACE( "processed %d events, returning %d\n", count, queued ); + LeaveCriticalSection( &event_section ); return queued; } @@ -521,7 +540,7 @@ DWORD EVENT_x11_time_to_win32_time(Time time) } else { - /* If we got an event in the 'future', then our clock is clearly wrong. + /* If we got an event in the 'future', then our clock is clearly wrong. If we got it more than 10000 ms in the future, then it's most likely that the clock has wrapped. */ @@ -728,7 +747,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) { XClientMessageEvent xev; xev = *event; - + TRACE("NET_WM Ping\n"); xev.window = DefaultRootWindow(xev.display); XSendEvent(xev.display, xev.window, False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent*)&xev); @@ -1445,7 +1464,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) RECT tempRect; if (!IsWindowEnabled(hQueryWnd)) return 0; - + GetWindowRect(hQueryWnd, &tempRect); if(!PtInRect(&tempRect, *lpPt)) return 0; @@ -1468,7 +1487,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) } if(!(GetWindowLongA( hQueryWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)) return 0; - + ScreenToClient(hQueryWnd, lpPt); return hQueryWnd; -- 2.30.2

1 0

[PATCH] winex11.drv: Avoid duplicate executions of event processing
by Hodong Kim 08 Jan '22

08 Jan '22

1 0

[PATCH v2] comdlg32/tests: Avoid test hang by changing current directory.
by Bernhard Übelacker 08 Jan '22

08 Jan '22

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> ---- For some reason this does not show up in the daily testbot runs, but in single test runs after e.g. patch submissions. v2: - Removed changes to IFileDialogEvents_fnOnFolderChange. - Removed some more lines remaining from debugging. Superseedes: https://source.winehq.org/patches/data/222000 --- dlls/comdlg32/tests/itemdlg.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index c38457a0a13..95bd49143fc 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -2460,8 +2460,38 @@ static void test_overwrite(void) IShellItem_Release(psi_current); } +static void check_current_directory(void) +{ + int ret; + HRESULT hr; + WCHAR current_dir[MAX_PATH] = {0}; + WCHAR common_documents[MAX_PATH] = {0}; + + ret = GetCurrentDirectoryW(MAX_PATH, current_dir); + ok(ret, "GetCurrentDirectoryW failed: GetLastError:0x%08x\n", GetLastError()); + + hr = SHGetFolderPathW(NULL, CSIDL_COMMON_DOCUMENTS, NULL, 0, common_documents); + ok(hr == S_OK, "SHGetFolderPathW failed: Got 0x%08x\n", hr); + + if (lstrcmpW(current_dir, common_documents) == 0) { + hr = SHGetFolderPathW(NULL, CSIDL_MYDOCUMENTS, NULL, 0, current_dir); + ok(hr == S_OK, "SHGetFolderPathW failed: Got 0x%08x\n", hr); + + ret = SetCurrentDirectoryW(current_dir); + ok(ret, "SetCurrentDirectoryW failed: GetLastError:0x%08x\n", GetLastError()); + + trace("Changing directory: %s to %s\n", debugstr_w(common_documents), debugstr_w(current_dir)); + /* The tests test_filename_opendlg will hang with "File not found", + if opened from the public documents directory. + This seems to be caused by the test files being created in public documents, + but the open dialog searches in my documents. */ + } +} + START_TEST(itemdlg) { + check_current_directory(); + OleInitialize(NULL); init_function_pointers(); -- 2.34.1

1 0

Wine staging 7.0-rc5 release
by Alistair Leslie-Hughes 07 Jan '22

07 Jan '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.0-rc5 (553 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * nvcuda-CUDA_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v7 resend 1/2] kernel32/tests: Test module refcounting with forwarded exports.
by Jinoh Kang 07 Jan '22

07 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/kernel32/tests/Makefile.in | 10 +- dlls/kernel32/tests/forward1.c | 17 +++ dlls/kernel32/tests/forward1.spec | 2 + dlls/kernel32/tests/forward2.c | 7 ++ dlls/kernel32/tests/forward2.spec | 2 + dlls/kernel32/tests/forward3.c | 7 ++ dlls/kernel32/tests/forward3.spec | 2 + dlls/kernel32/tests/forward4.c | 41 ++++++ dlls/kernel32/tests/forward4.spec | 2 + dlls/kernel32/tests/iatgas.h | 85 +++++++++++++ dlls/kernel32/tests/loader.c | 199 ++++++++++++++++++++++++++++++ 11 files changed, 373 insertions(+), 1 deletion(-) create mode 100644 dlls/kernel32/tests/forward1.c create mode 100644 dlls/kernel32/tests/forward1.spec create mode 100644 dlls/kernel32/tests/forward2.c create mode 100644 dlls/kernel32/tests/forward2.spec create mode 100644 dlls/kernel32/tests/forward3.c create mode 100644 dlls/kernel32/tests/forward3.spec create mode 100644 dlls/kernel32/tests/forward4.c create mode 100644 dlls/kernel32/tests/forward4.spec create mode 100644 dlls/kernel32/tests/iatgas.h diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..7ef3508bad4 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -37,4 +37,12 @@ SOURCES = \ toolhelp.c \ version.c \ virtual.c \ - volume.c + volume.c \ + forward1.c \ + forward1.spec \ + forward2.c \ + forward2.spec \ + forward3.c \ + forward3.spec \ + forward4.c \ + forward4.spec diff --git a/dlls/kernel32/tests/forward1.c b/dlls/kernel32/tests/forward1.c new file mode 100644 index 00000000000..985e193c958 --- /dev/null +++ b/dlls/kernel32/tests/forward1.c @@ -0,0 +1,17 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} + +unsigned long forward_test_func(void) +{ + return 0x00005678UL; +} + +unsigned long forward_test_func2(void) +{ + return 0x12340000UL; +} diff --git a/dlls/kernel32/tests/forward1.spec b/dlls/kernel32/tests/forward1.spec new file mode 100644 index 00000000000..bf19fa7e011 --- /dev/null +++ b/dlls/kernel32/tests/forward1.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() +2 cdecl -noname forward_test_func2() diff --git a/dlls/kernel32/tests/forward2.c b/dlls/kernel32/tests/forward2.c new file mode 100644 index 00000000000..0ed3885e0df --- /dev/null +++ b/dlls/kernel32/tests/forward2.c @@ -0,0 +1,7 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} diff --git a/dlls/kernel32/tests/forward2.spec b/dlls/kernel32/tests/forward2.spec new file mode 100644 index 00000000000..374156d8d06 --- /dev/null +++ b/dlls/kernel32/tests/forward2.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward1.forward_test_func +2 cdecl -noname forward_test_func2() forward1.#2 diff --git a/dlls/kernel32/tests/forward3.c b/dlls/kernel32/tests/forward3.c new file mode 100644 index 00000000000..0ed3885e0df --- /dev/null +++ b/dlls/kernel32/tests/forward3.c @@ -0,0 +1,7 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} diff --git a/dlls/kernel32/tests/forward3.spec b/dlls/kernel32/tests/forward3.spec new file mode 100644 index 00000000000..31d019aa071 --- /dev/null +++ b/dlls/kernel32/tests/forward3.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward2.forward_test_func +2 cdecl -noname forward_test_func2() forward2.#2 diff --git a/dlls/kernel32/tests/forward4.c b/dlls/kernel32/tests/forward4.c new file mode 100644 index 00000000000..df4cfe41c0c --- /dev/null +++ b/dlls/kernel32/tests/forward4.c @@ -0,0 +1,41 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#if (defined(_MSC_VER) && defined(__clang__)) || defined(__MINGW32__) || defined(__CYGWIN__) +#include "wine/asm.h" +#include "iatgas.h" + +INLINE_IMPORT_BEGIN("forward3.dll") + INLINE_IMPORT_BY_NAME(1, "forward_test_func", __ASM_NAME("forward_test_func")) + INLINE_IMPORT_BY_ORDINAL(2, __ASM_NAME("forward_test_func2")) +INLINE_IMPORT_END() + +DECLSPEC_IMPORT extern unsigned long forward_test_func(void); +DECLSPEC_IMPORT extern unsigned long forward_test_func2(void); + +unsigned long test_func_stub(void) +{ + return forward_test_func() ^ forward_test_func2(); +} + +const char skiptest[] = ""; +#else +unsigned long test_func_stub(void) +{ + /* unimplemented */ + for (;;) DebugBreak(); +} + +#ifdef _MSC_VER +const char skiptest[] = "TODO: support building import libraries for TESTDLLs in MSVC"; +#elif defined(__WINE_PE_BUILD) +const char skiptest[] = "TODO: support building import libraries for TESTDLLs in other compilers"; +#else +const char skiptest[] = "TODO: support building import libraries for TESTDLLs as Unixlib (--without-mingw)"; +#endif +#endif + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + return TRUE; +} diff --git a/dlls/kernel32/tests/forward4.spec b/dlls/kernel32/tests/forward4.spec new file mode 100644 index 00000000000..5ff2f47469c --- /dev/null +++ b/dlls/kernel32/tests/forward4.spec @@ -0,0 +1,2 @@ +@ cdecl test_func_stub() +@ extern skiptest diff --git a/dlls/kernel32/tests/iatgas.h b/dlls/kernel32/tests/iatgas.h new file mode 100644 index 00000000000..8d0184c9ae0 --- /dev/null +++ b/dlls/kernel32/tests/iatgas.h @@ -0,0 +1,85 @@ +/* + * Inline assembly import library generator + * + * Copyright 2021 Jinoh Kang + * + * 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 + */ + +#ifndef __WINE_KERNEL_IATGAS_H +#define __WINE_KERNEL_IATGAS_H + +#if defined(_WIN64) +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define IATGAS_ZERO_EXTEND_32_TO_PTR(line) line "\n\t.skip 4" +#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define IATGAS_ZERO_EXTEND_32_TO_PTR(line) ".skip 4\n\t" line +#else +#error unknown byte order +#endif +#define IATGAS_EMIT_PTRALIGN ".p2align 3" +#define IATGAS_EMIT_IMPORT_BY_ORDINAL(ordinal) ".quad (1<<63)|(" #ordinal ")" +#elif defined(_WIN32) +#define IATGAS_ZERO_EXTEND_32_TO_PTR(line) line +#define IATGAS_EMIT_PTRALIGN ".p2align 2" +#define IATGAS_EMIT_IMPORT_BY_ORDINAL(ordinal) ".long (1<<31)|(" #ordinal ")" +#else +#error unknown pointer size +#endif + +#define INLINE_IMPORT_BEGIN_PROLOG(id) INLINE_IMPORT_BEGIN_PROLOG_(id) +#define INLINE_IMPORT_BEGIN_PROLOG_(id) \ + __asm__( \ + ".section \".idata$2\", \"a\"\n\t" /* IMAGE_IMPORT_DESCRIPTOR */ \ + ".rva .Limport_ilt_" #id "\n\t" /* .OriginalFirstThunk */ \ + ".long 0\n\t" /* .TimeDateStamp */ \ + ".long -1\n\t" /* .ForwarderChain */ \ + ".rva .Limport_dllname_" #id "\n\t" /* .Name */ \ + ".rva .Limport_iat_" #id "\n\t" /* .FirstThunk */ \ + ".p2align 2\n\t" /* (section alignment) */ \ + ".section \".idata$4\", \"a\"\n\t" /* IMAGE_THUNK_DATA (ILT) */ \ + IATGAS_EMIT_PTRALIGN "\n\t" \ + ".Limport_ilt_" #id ":\n\t" \ + ".section \".idata$5\", \"a\"\n\t" /* IMAGE_THUNK_DATA (IAT) */ \ + IATGAS_EMIT_PTRALIGN "\n\t" \ + ".Limport_iat_" #id ":\n\t" \ + ".section \".idata$7\", \"a\"\n\t" \ + ".Limport_dllname_" #id ":\n\t" +#define INLINE_IMPORT_BEGIN(dll_name) INLINE_IMPORT_BEGIN_PROLOG(__COUNTER__) \ + ".asciz \"" dll_name "\"\n\t" +#define INLINE_IMPORT_ENTRY(entry, impsym) \ + ".section \".idata$4\", \"a\"\n\t" /* IMAGE_THUNK_DATA (ILT) */ \ + entry "\n\t" /* .AddressOfData | .Ordinal */ \ + ".section \".idata$5\", \"a\"\n\t" \ + "__imp_" impsym ":\n\t" /* IMAGE_THUNK_DATA (IAT) */ \ + entry "\n\t" /* .AddressOfData | .Ordinal */ +#define INLINE_IMPORT_BY_ORDINAL(ordinal, impsym) \ + INLINE_IMPORT_ENTRY(IATGAS_EMIT_IMPORT_BY_ORDINAL(ordinal), impsym) +#define INLINE_IMPORT_BY_NAME(hint, name, impsym) \ + INLINE_IMPORT_ENTRY(IATGAS_ZERO_EXTEND_32_TO_PTR(".rva .Limport_procname_" impsym), impsym) \ + ".section \".idata$6\", \"a\"\n\t" \ + ".Limport_procname_" impsym ":\n\t" /* IMAGE_IMPORT_BY_NAME */ \ + ".short " #hint "\n\t" /* .Hint */ \ + ".asciz \"" name "\"\n\t" /* .Name */ \ + ".p2align 1\n\t" /* (section alignment) */ +#define INLINE_IMPORT_END() \ + ".section \".idata$4\", \"a\"\n\t" /* IMAGE_THUNK_DATA (ILT) */ \ + IATGAS_ZERO_EXTEND_32_TO_PTR(".long 0") "\n\t" \ + ".section \".idata$5\", \"a\"\n\t" /* IMAGE_THUNK_DATA (IAT) */ \ + IATGAS_ZERO_EXTEND_32_TO_PTR(".long 0") "\n\t" \ + ".text" \ + ); + +#endif diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..97957604aa0 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1642,6 +1642,202 @@ static void test_ImportDescriptors(void) } } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + +static void test_static_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + CHAR forward4_path[MAX_PATH]; + HMODULE forward1, forward2, forward3, forward4; + unsigned long result; + unsigned long (*test_func_stub)(void); + const char *skiptest; + BOOL skiptest_flag = FALSE; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + snprintf( forward4_path, MAX_PATH, "%s\\forward4.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + extract_resource( "forward4.dll", "TESTDLL", forward4_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + forward4 = LoadLibraryA( forward4_path ); + ok( !!forward4, "couldn't find %s: %u\n", forward4_path, GetLastError() ); + + skiptest = (const char *)GetProcAddress( forward4, "skiptest" ); + if (skiptest && *skiptest) + { + skiptest_flag = TRUE; + skip( "forward4: %s\n", skiptest ); + } + else + { + test_func_stub = (void *)GetProcAddress( forward4, "test_func_stub" ); + ok( !!test_func_stub, "forward4!test_func_stub not found\n" ); + result = test_func_stub ? test_func_stub() : -1UL; + ok( result == 0x12345678UL, "forward4!test_func_stub returned %#lx (expected %#lx)\n", + result, 0x12345678UL ); + } + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + FreeLibrary( forward3 ); + + if (!skiptest_flag) + { + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + ok( !!GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly unloaded\n" ); + } + + FreeLibrary( forward4 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward4.dll" ), "forward4.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + DeleteFileA( forward4_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + FARPROC proc1, proc2, proc3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + proc1 = GetProcAddress(forward1, "forward_test_func"); + ok( !!proc1, "cannot resolve forward1!forward_test_func\n"); + proc2 = GetProcAddress(forward2, "forward_test_func"); + ok( !!proc2, "cannot resolve forward2!forward_test_func\n"); + proc3 = GetProcAddress(forward3, "forward_test_func"); + ok( !!proc3, "cannot resolve forward3!forward_test_func\n"); + ok( proc1 == proc3, "forward1!forward_test_func is not equal to forward3!forward_test_func\n"); + ok( proc2 == proc3, "forward2!forward_test_func is not equal to forward3!forward_test_func\n"); + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forward_export_norefs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + FreeLibrary( forward1 ); + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + FreeLibrary( forward2 ); + + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; @@ -4122,6 +4318,9 @@ START_TEST(loader) test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); + test_static_forwarded_import_refs(); + test_dynamic_forwarded_import_refs(); + test_dynamic_forward_export_norefs(); test_section_access(); test_import_resolution(); test_ExitProcess(); -- 2.31.1

3 4

[PATCH] programs/cmd/test: don't output more data than available
by Eric Pouech 07 Jan '22

07 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/tests/batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 162e9cfa151..0b48d7fa039 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -344,8 +344,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da } } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); - ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %.*s\n", line, exp_data + exp_size - exp_ptr, exp_ptr); + ok(out_ptr >= out_data+out_size, "too long output, got additional %.*s\n", out_data + out_size - out_ptr, out_ptr); } static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size)

1 0

[PATCH 1/2] d2d1: Silence SetSegmentFlags FIXME when setting default value
by Stefan Brüns 07 Jan '22

07 Jan '22

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed for the current segment, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- dlls/d2d1/geometry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..ac5f1019f3f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,6 +2773,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { + if (flags == D2D1_PATH_SEGMENT_NONE) + return; FIXME("iface %p, flags %#x stub!\n", iface, flags); } -- 2.34.1

3 5

[PATCH] Fix the widl extension that tries dllname.tlb if dllname.dll cannot be found
by Tom Ritter 07 Jan '22

07 Jan '22

1 0

[PATCH 1/2] ws2_32/tests: Test whether WSAEventSelect() modifies the event state.
by Zebediah Figura 07 Jan '22

07 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 50f79e6adb8..db6819e77cf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5186,6 +5186,42 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(server); closesocket(client); + /* As above, but select on a subset containing FD_ACCEPT first. */ + + if (!ctx->is_message) + { + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(ctx->event, 200); + ok(!ret, "wait timed out\n"); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB); + ret = WaitForSingleObject(ctx->event, 0); + ok(!ret, "wait timed out\n"); + + ResetEvent(ctx->event); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB); + ret = WaitForSingleObject(ctx->event, 0); + ok(ret == WAIT_TIMEOUT, "expected timeout\n"); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); + ret = WaitForSingleObject(ctx->event, 0); + todo_wine ok(!ret, "wait timed out\n"); + if (!ret) + check_events(ctx, FD_ACCEPT, 0, 0); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(server); + closesocket(client); + } + /* As above, but select on a subset not containing FD_ACCEPT first. */ select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB); -- 2.34.1

3 4

[PATCH vkd3d] vkd3d-compiler: Properly forward argument validation failures.
by Giovanni Mascellani 07 Jan '22

07 Jan '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8ea3c132..c974c9a8 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -686,13 +686,13 @@ int main(int argc, char **argv) fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", get_target_type_info(options.target_type)->name, get_source_type_info(options.source_type)->name); - return 0; + return 1; } if (!options.preprocess_only && options.source_type == VKD3D_SHADER_SOURCE_HLSL && !options.profile) { fprintf(stderr, "You need to specify a profile when compiling from HLSL source.\n"); - return 0; + return 1; } if (!options.filename && get_source_type_info(options.source_type)->is_binary && isatty(fileno(input))) -- 2.34.1

3 2

[PATCH vkd3d v2 1/4] vkd3d: Use a binary search for matching a descriptor to an allocation.
by Conor McCarthy 07 Jan '22

07 Jan '22

The performance improvement will be useful for Vulkan-backed heaps, where descriptor heaps must be found more often. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Style changes, and vkd3d_gpu_descriptor_allocator_allocation_from_descriptor() is now an inline function which is not thread safe. Allocation objects should not be accessed while the allocator is unlocked, so locking occurs outside this function. --- libs/vkd3d/device.c | 70 +++++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 96ff7ae7..ec2eb73b 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2179,6 +2179,33 @@ static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *alloca pthread_mutex_destroy(&allocator->mutex); } +/* We could use bsearch() or recursion here, but it probably helps to omit + * all the extra function calls. */ +static struct vkd3d_gpu_descriptor_allocation *vkd3d_gpu_descriptor_allocator_binary_search( + const struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) +{ + struct vkd3d_gpu_descriptor_allocation *allocations = allocator->allocations; + const struct d3d12_desc *base; + size_t centre, count; + + for (count = allocator->allocation_count; count > 1; ) + { + centre = count >> 1; + base = allocations[centre].base; + if (base <= desc) + { + allocations += centre; + count -= centre; + } + else + { + count = centre; + } + } + + return allocations; +} + bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *base, size_t count) { @@ -2198,7 +2225,14 @@ bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_a return false; } - allocation = &allocator->allocations[allocator->allocation_count++]; + if (allocator->allocation_count > 1) + allocation = vkd3d_gpu_descriptor_allocator_binary_search(allocator, base); + else + allocation = allocator->allocations; + allocation += allocator->allocation_count && base > allocation->base; + memmove(&allocation[1], allocation, (allocator->allocation_count++ - (allocation - allocator->allocations)) + * sizeof(*allocation)); + allocation->base = base; allocation->count = count; @@ -2225,8 +2259,8 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range( if (allocator->allocations[i].base != base) continue; - if (i != --allocator->allocation_count) - allocator->allocations[i] = allocator->allocations[allocator->allocation_count]; + memmove(&allocator->allocations[i], &allocator->allocations[i + 1], + (--allocator->allocation_count - i) * sizeof(allocator->allocations[0])); found = true; break; @@ -2237,34 +2271,34 @@ bool vkd3d_gpu_descriptor_allocator_unregister_range( return found; } +static inline const struct vkd3d_gpu_descriptor_allocation *vkd3d_gpu_descriptor_allocator_allocation_from_descriptor( + const struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) +{ + const struct vkd3d_gpu_descriptor_allocation *allocation; + + allocation = vkd3d_gpu_descriptor_allocator_binary_search(allocator, desc); + return (desc >= allocation->base && desc - allocation->base < allocation->count) ? allocation : NULL; +} + /* Return the available size from the specified descriptor to the heap end. */ size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) { - struct vkd3d_gpu_descriptor_allocation *allocation; - size_t remaining, offset, i; + const struct vkd3d_gpu_descriptor_allocation *allocation; + size_t remaining; int rc; + assert(allocator->allocation_count); + if ((rc = pthread_mutex_lock(&allocator->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); return 0; } - for (i = 0, remaining = 0; i < allocator->allocation_count; ++i) - { - allocation = &allocator->allocations[i]; - - if (desc < allocation->base) - continue; - - offset = desc - allocation->base; - if (offset >= allocation->count) - continue; - - remaining = allocation->count - offset; - break; - } + remaining = 0; + if ((allocation = vkd3d_gpu_descriptor_allocator_allocation_from_descriptor(allocator, desc))) + remaining = allocation->count - (desc - allocation->base); pthread_mutex_unlock(&allocator->mutex); -- 2.33.0

2 6

[PATCH vkd3d v5] vkd3d-shader/spirv: Support UAV counter descriptor arrays.
by Conor McCarthy 07 Jan '22

07 Jan '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v5: Also handle arrays in the SSBO UAV path. --- include/vkd3d_shader.h | 4 +- libs/vkd3d-shader/spirv.c | 90 +++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 791ac037..1eae0bbe 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -537,9 +537,7 @@ struct vkd3d_shader_descriptor_offset_info /** * Pointer to an array of offsets into the descriptor arrays referenced by * the 'uav_counters' array in struct vkd3d_shader_interface_info. This - * works the same way as \ref binding_offsets above. UAV counter arrays are - * not supported in this version of vkd3d-shader, and therefore this field - * must either be NULL or specify 0 offsets. + * works the same way as \ref binding_offsets above. */ const struct vkd3d_shader_descriptor_offset *uav_counter_offsets; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ab171b73..fa3ca67e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1984,6 +1984,8 @@ struct vkd3d_symbol_resource_data bool raw; unsigned int binding_base_idx; uint32_t uav_counter_id; + const struct vkd3d_symbol *uav_counter_array; + unsigned int uav_counter_base_idx; }; struct vkd3d_symbol_sampler_data @@ -2405,8 +2407,6 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader if ((offset_info = vkd3d_find_struct(shader_interface->next, DESCRIPTOR_OFFSET_INFO))) { compiler->offset_info = *offset_info; - if (offset_info->uav_counter_offsets) - WARN("Ignoring UAV counter offsets %p.\n", offset_info->uav_counter_offsets); if (compiler->offset_info.descriptor_table_count && !(compiler->descriptor_offset_ids = vkd3d_calloc( compiler->offset_info.descriptor_table_count, sizeof(*compiler->descriptor_offset_ids)))) { @@ -2575,7 +2575,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int register_last = (range->last == ~0u) ? range->first : range->last; - const struct vkd3d_shader_descriptor_offset *binding_offsets = compiler->offset_info.binding_offsets; + const struct vkd3d_shader_descriptor_offset *binding_offsets; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2603,6 +2603,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor if (is_uav_counter) { assert(descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV); + binding_offsets = compiler->offset_info.uav_counter_offsets; for (i = 0; i < shader_interface->uav_counter_count; ++i) { const struct vkd3d_shader_uav_counter_binding *current = &shader_interface->uav_counters[i]; @@ -2610,7 +2611,8 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) continue; - if (current->register_space != range->space || current->register_index != range->first) + if (current->register_space != range->space || current->register_index > range->first + || current->binding.count <= register_last - current->register_index) continue; if (current->offset) @@ -2621,16 +2623,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor range->first, range->space, current->offset); } - if (current->binding.count != 1) - { - FIXME("Descriptor arrays are not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, - "Descriptor binding for UAV counter %u, space %u has unsupported ‘count’ %u.", - range->first, range->space, current->binding.count); - } - - binding_address->binding_base_idx = current->register_index; - binding_address->push_constant_index = ~0u; + binding_address->binding_base_idx = current->register_index + - (binding_offsets ? binding_offsets[i].static_offset : 0); + binding_address->push_constant_index = binding_offsets ? binding_offsets[i].dynamic_offset_index : ~0u; return current->binding; } if (shader_interface->uav_counter_count) @@ -2642,6 +2637,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor } else { + binding_offsets = compiler->offset_info.binding_offsets; for (i = 0; i < shader_interface->binding_count; ++i) { const struct vkd3d_shader_resource_binding *current = &shader_interface->bindings[i]; @@ -2693,18 +2689,6 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding(struct vkd3d_dxbc_compil vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, binding->binding); } -static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxbc_compiler *compiler, - uint32_t variable_id, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, - enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) -{ - struct vkd3d_shader_descriptor_binding binding; - struct vkd3d_descriptor_binding_address binding_address; /* Values not used. */ - - binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, resource_type, is_uav_counter, - &binding_address); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); -} - static void vkd3d_dxbc_compiler_decorate_nonuniform(struct vkd3d_dxbc_compiler *compiler, uint32_t expression_id) { @@ -2939,6 +2923,7 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf return true; } +/* TODO: UAV counters: vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset); */ static void vkd3d_dxbc_compiler_emit_register_debug_name(struct vkd3d_spirv_builder *builder, uint32_t id, const struct vkd3d_shader_register *reg) { @@ -5629,7 +5614,7 @@ struct vkd3d_descriptor_variable_info static uint32_t vkd3d_dxbc_compiler_build_descriptor_variable(struct vkd3d_dxbc_compiler *compiler, SpvStorageClass storage_class, uint32_t type_id, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, - struct vkd3d_descriptor_variable_info *var_info) + bool is_uav_counter, struct vkd3d_descriptor_variable_info *var_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_descriptor_binding_address binding_address; @@ -5639,7 +5624,7 @@ static uint32_t vkd3d_dxbc_compiler_build_descriptor_variable(struct vkd3d_dxbc_ struct rb_entry *entry; binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, - resource_type, false, &binding_address); + resource_type, is_uav_counter, &binding_address); var_info->binding_base_idx = binding_address.binding_base_idx; if (binding.count == 1 && range->first == binding_address.binding_base_idx && range->last != ~0u @@ -5729,7 +5714,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi vkd3d_spirv_build_op_name(builder, struct_id, "cb%u_struct", cb->size); var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class, struct_id, - reg, &cb->range, VKD3D_SHADER_RESOURCE_BUFFER, &var_info); + reg, &cb->range, VKD3D_SHADER_RESOURCE_BUFFER, false, &var_info); vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, @@ -5792,7 +5777,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com type_id = vkd3d_spirv_get_op_type_sampler(builder); var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg, - &sampler->range, VKD3D_SHADER_RESOURCE_NONE, &var_info); + &sampler->range, VKD3D_SHADER_RESOURCE_NONE, false, &var_info); vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, @@ -5964,6 +5949,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ symbol.info.resource.structure_stride = structure_stride; symbol.info.resource.raw = raw; symbol.info.resource.uav_counter_id = 0; + symbol.info.resource.uav_counter_array = NULL; + symbol.info.resource.uav_counter_base_idx = 0; vkd3d_dxbc_compiler_put_symbol(compiler, &symbol); } } @@ -5972,12 +5959,12 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw) { - uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0; + struct vkd3d_descriptor_variable_info var_info, counter_var_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; SpvStorageClass storage_class = SpvStorageClassUniformConstant; + uint32_t counter_type_id, type_id, var_id, counter_var_id = 0; const struct vkd3d_shader_register *reg = &resource->reg.reg; const struct vkd3d_spirv_resource_type *resource_type_info; - struct vkd3d_descriptor_variable_info var_info; enum vkd3d_shader_component_type sampled_type; struct vkd3d_symbol resource_symbol; bool is_uav; @@ -6022,7 +6009,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp } var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg, - &resource->range, resource_type, &var_info); + &resource->range, resource_type, false, &var_info); if (is_uav) { @@ -6043,7 +6030,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp { vkd3d_spirv_enable_capability(builder, SpvCapabilityAtomicStorage); storage_class = SpvStorageClassAtomicCounter; - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id); + type_id = counter_type_id; } else if (compiler->ssbo_uavs) { @@ -6058,20 +6045,11 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp vkd3d_spirv_build_op_member_decorate1(builder, struct_id, 0, SpvDecorationOffset, 0); storage_class = SpvStorageClassUniform; - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, struct_id); + type_id = struct_id; } - else - { - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); - } - - counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, - ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - counter_var_id, reg, &resource->range, resource_type, true); - - vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset); + counter_var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg, + &resource->range, resource_type, true, &counter_var_info); } } @@ -6086,6 +6064,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp resource_symbol.info.resource.raw = raw; resource_symbol.info.resource.binding_base_idx = var_info.binding_base_idx; resource_symbol.info.resource.uav_counter_id = counter_var_id; + resource_symbol.info.resource.uav_counter_array = counter_var_info.array_symbol; + resource_symbol.info.resource.uav_counter_base_idx = counter_var_info.binding_base_idx; vkd3d_dxbc_compiler_put_symbol(compiler, &resource_symbol); } @@ -8887,6 +8867,24 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c assert(counter_id); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + + if (resource_symbol->info.resource.uav_counter_array) + { + const struct vkd3d_symbol_descriptor_array_data *array_data; + uint32_t index_id; + + index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, &src->reg, + resource_symbol->info.resource.uav_counter_array, + resource_symbol->info.resource.uav_counter_base_idx, + resource_symbol->info.resource.resource_type_info->resource_type); + + array_data = &resource_symbol->info.resource.uav_counter_array->info.descriptor_array; + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class, + array_data->contained_type_id); + + counter_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, counter_id, &index_id, 1); + } + if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) { pointer_id = counter_id; -- 2.33.0

2 1

[PATCH v3 vkd3d 1/3] vkd3d-shader/hlsl: Cast round() input to float.
by Nikolay Sivov 07 Jan '22

07 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: handle conversion failures libs/vkd3d-shader/hlsl.y | 19 ++++++++++++++++++- tests/round.shader_test | 13 +++++++++++++ tests/shader_runner_d3d12.c | 13 +++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 636882c..6c285c3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1570,6 +1570,18 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static struct hlsl_ir_node *intrinsic_float_convert_arg(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = arg->data_type; + + if (type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF) + return arg; + + type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + return add_implicit_conversion(ctx, params->instrs, arg, type, loc); +} + static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -1675,7 +1687,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, static bool intrinsic_round(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], loc); + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc); } static bool intrinsic_saturate(struct hlsl_ctx *ctx, diff --git a/tests/round.shader_test b/tests/round.shader_test index d8eb11b..cc5a697 100644 --- a/tests/round.shader_test +++ b/tests/round.shader_test @@ -24,3 +24,16 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (6.0, 8.0, 0.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform int4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 int4 -1 0 2 10 +draw quad +probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 47f419b..c5992aa 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -552,6 +552,19 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &i, sizeof(i)); } + if (match_string(line, "int4", &line)) + { + int v[4]; + + if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) + fatal_error("Malformed int4 constant '%s'.\n", line); + if (offset + 4 > context->uniform_count) + { + context->uniform_count = offset + 4; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, v, sizeof(v)); + } else if (match_string(line, "uint", &line)) { unsigned int u; -- 2.34.1

2 5

[PATCH vkd3d 3/8] vkd3d-shader/hlsl: Move fold_constants() to a separate file.
by Francisco Casas 07 Jan '22

07 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl_codegen.c | 106 --------------------- libs/vkd3d-shader/hlsl_constant_ops.c | 127 ++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 106 deletions(-) create mode 100644 libs/vkd3d-shader/hlsl_constant_ops.c diff --git a/Makefile.am b/Makefile.am index 20fee06d..d3dfc0a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -194,6 +194,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/hlsl.c \ libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ + libs/vkd3d-shader/hlsl_constant_ops.c \ libs/vkd3d-shader/hlsl_sm1.c \ libs/vkd3d-shader/hlsl_sm4.c \ libs/vkd3d-shader/preproc.h \ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 530d12ad..f2cb0802 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -762,6 +762,8 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, const struct hlsl_type *type); +bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); + bool hlsl_sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3DSHADER_PARAM_REGISTER_TYPE *type, unsigned int *reg); bool hlsl_sm1_usage_from_semantic(const struct hlsl_semantic *semantic, D3DDECLUSAGE *usage, uint32_t *usage_idx); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6cb4df8b..5f93c9a9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -639,112 +639,6 @@ static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins return false; } -static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) -{ - struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; - struct hlsl_ir_expr *expr; - unsigned int i, dimx; - - if (instr->type != HLSL_IR_EXPR) - return false; - expr = hlsl_ir_expr(instr); - - for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) - { - if (expr->operands[i].node && expr->operands[i].node->type != HLSL_IR_CONSTANT) - return false; - } - arg1 = hlsl_ir_constant(expr->operands[0].node); - if (expr->operands[1].node) - arg2 = hlsl_ir_constant(expr->operands[1].node); - dimx = instr->data_type->dimx; - - if (!(res = hlsl_alloc(ctx, sizeof(*res)))) - return false; - init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); - - switch (instr->data_type->base_type) - { - case HLSL_TYPE_FLOAT: - { - switch (expr->op) - { - case HLSL_OP1_CAST: - if (instr->data_type->dimx != arg1->node.data_type->dimx - || instr->data_type->dimy != arg1->node.data_type->dimy) - { - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - - switch (arg1->node.data_type->base_type) - { - case HLSL_TYPE_INT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].i; - break; - - case HLSL_TYPE_UINT: - for (i = 0; i < dimx; ++i) - res->value[i].f = arg1->value[i].u; - break; - - default: - FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), - debug_hlsl_type(ctx, instr->data_type)); - vkd3d_free(res); - return false; - } - break; - - default: - FIXME("Fold float op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } - break; - } - - case HLSL_TYPE_UINT: - { - switch (expr->op) - { - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - - case HLSL_OP2_ADD: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u + arg2->value[i].u; - break; - - case HLSL_OP2_MUL: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u * arg2->value[i].u; - break; - - default: - FIXME("Fold uint op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } - break; - } - - default: - FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); - vkd3d_free(res); - return false; - } - - list_add_before(&expr->node.entry, &res->node.entry); - hlsl_replace_node(&expr->node, &res->node); - return true; -} - static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_swizzle *swizzle; diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c new file mode 100644 index 00000000..924e0380 --- /dev/null +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -0,0 +1,127 @@ +/* + * HLSL constant value operations for constant folding + * + * Copyright 2022 Francisco Casas 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 + */ + +#include "hlsl.h" + +bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; + struct hlsl_ir_expr *expr; + unsigned int i, dimx; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + { + if (expr->operands[i].node && expr->operands[i].node->type != HLSL_IR_CONSTANT) + return false; + } + arg1 = hlsl_ir_constant(expr->operands[0].node); + if (expr->operands[1].node) + arg2 = hlsl_ir_constant(expr->operands[1].node); + dimx = instr->data_type->dimx; + + if (!(res = hlsl_alloc(ctx, sizeof(*res)))) + return false; + init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); + + switch (instr->data_type->base_type) + { + case HLSL_TYPE_FLOAT: + { + switch (expr->op) + { + case HLSL_OP1_CAST: + if (instr->data_type->dimx != arg1->node.data_type->dimx + || instr->data_type->dimy != arg1->node.data_type->dimy) + { + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + + switch (arg1->node.data_type->base_type) + { + case HLSL_TYPE_INT: + for (i = 0; i < dimx; ++i) + res->value[i].f = arg1->value[i].i; + break; + + case HLSL_TYPE_UINT: + for (i = 0; i < dimx; ++i) + res->value[i].f = arg1->value[i].u; + break; + + default: + FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, arg1->node.data_type), + debug_hlsl_type(ctx, instr->data_type)); + vkd3d_free(res); + return false; + } + break; + + default: + FIXME("Fold float op %#x.\n", expr->op); + vkd3d_free(res); + return false; + } + break; + } + + case HLSL_TYPE_UINT: + { + switch (expr->op) + { + case HLSL_OP1_NEG: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value[i].u = -arg1->value[i].u; + break; + + case HLSL_OP2_ADD: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value[i].u = arg1->value[i].u + arg2->value[i].u; + break; + + case HLSL_OP2_MUL: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value[i].u = arg1->value[i].u * arg2->value[i].u; + break; + + default: + FIXME("Fold uint op %#x.\n", expr->op); + vkd3d_free(res); + return false; + } + break; + } + + default: + FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); + vkd3d_free(res); + return false; + } + + list_add_before(&expr->node.entry, &res->node.entry); + hlsl_replace_node(&expr->node, &res->node); + return true; +} \ No newline at end of file -- 2.25.1

2 2

[PATCH] wined3d: Use GL_MAP_PERSISTENT_BIT even for non-persistent bo maps.
by Henri Verbeet 07 Jan '22

07 Jan '22

While the reason for doing this is to allow draws referencing mapped buffer resources to succeed, the behaviour of the application in the referenced bug report (FlatOut) appears to be slightly different; it does end up drawing while buffer objects are mapped due to reordering of map operations inside the command stream, but as far as I can tell those buffer objects are not referenced by the draw. The driver in question (fglrx/Catalyst) appears to simply be a bit overzealous with throwing errors, and unfortunately doesn't provide much more information than "glDrawElementsBaseVertex has generated an error (GL_INVALID_OPERATION)". The issue is not reproducible with Mesa radeonsi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46118 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c08e44ce372..9fd2ed67dcc 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2711,7 +2711,7 @@ map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_BUFFER_STORAGE] && wined3d_map_persistent()) + if (gl_info->supported[ARB_BUFFER_STORAGE]) { GLbitfield gl_flags; @@ -2719,15 +2719,28 @@ map: * used to create the bo, instead of the access flags passed to the * map call. Otherwise, if for example the initial map call that * caused the bo to be persistently mapped was a read-only map, - * subsequent write access to the bo would be undefined. */ - gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + * subsequent write access to the bo would be undefined. + * + * Note that we use GL_MAP_PERSISTENT_BIT for non-persistent maps here + * as well, in order to allow draws to succeed while referenced buffer + * resources are mapped. On the other hand, we don't want to use the + * access flags used to create the bo for non-persistent maps, because + * that may imply dropping GL_MAP_UNSYNCHRONIZED_BIT. */ + if (wined3d_map_persistent()) + { + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + } + else + { + gl_flags = wined3d_resource_gl_map_flags(bo, flags); + } gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - if (!(gl_flags & GL_MAP_READ_BIT)) - gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; - if (gl_flags & GL_MAP_WRITE_BIT) - gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)))) + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags))) && wined3d_map_persistent()) bo->b.map_ptr = map_ptr; } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) -- 2.30.2

1 0

[PATCH vkd3d 7/8] vkd3d-shader/hlsl: Support negation for all numeric types in fold_constants().
by Francisco Casas 07 Jan '22

07 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 41 +++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 54c63691..2f34a730 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -103,6 +103,39 @@ static int constant_op1_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, return 1; } +static int constant_op1_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = tgt->node.data_type->base_type; + + assert(type == src->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = -src->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = -src->value[k].d; + break; + case HLSL_TYPE_INT: + tgt->value[k].i = -src->value[k].i; + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = -src->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.", debug_hlsl_expr_op(HLSL_OP1_NEG), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + static int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) { @@ -171,6 +204,9 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont case HLSL_OP1_CAST: success = constant_op1_cast(ctx, res, arg1); break; + case HLSL_OP1_NEG: + success = constant_op1_neg(ctx, res, arg1); + break; case HLSL_OP2_ADD: success = constant_op2_add(ctx, res, arg1, arg2); break; @@ -198,11 +234,6 @@ fallback: { switch (expr->op) { - case HLSL_OP1_NEG: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = -arg1->value[i].u; - break; - case HLSL_OP2_MUL: for (i = 0; i < instr->data_type->dimx; ++i) res->value[i].u = arg1->value[i].u * arg2->value[i].u; -- 2.25.1

2 2

[PATCH] d3dx9_36/tests: Add missing call to ID3DXSprite_End
by Alex Henrie 07 Jan '22

07 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I think this will help prevent the testbot from crashing intermittently in check_release(sprite, 0). --- dlls/d3dx9_36/tests/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index a8477591e87..ea2d1e4465b 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -319,6 +319,8 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) ok (hr == D3D_OK, "Begin returned %#x, expected %#x\n", hr, D3D_OK); hr = ID3DXSprite_Draw(sprite, tex2, &rect, &center, &pos, D3DCOLOR_XRGB(255, 255, 255)); ok (hr == D3D_OK, "Draw returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXSprite_End(sprite); + ok (hr == D3D_OK, "End returned %#x, expected %#x\n", hr, D3D_OK); IDirect3DDevice9_EndScene(device); check_release((IUnknown*)sprite, 0); -- 2.34.1

2 1

[PATCH] d3d10/tests: Increase size of array expected_i_a in test_scalar_array_methods (cppcheck)
by Alex Henrie 07 Jan '22

07 Jan '22

This array is accessed at index 5 on line 5138. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/d3d10/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ddc24d66e20..51675bcdab3 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4974,7 +4974,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA const char *name) { float set_f[2], ret_f[2], expected_f; - int set_i[6], ret_i[6], expected_i, expected_i_a[2]; + int set_i[6], ret_i[6], expected_i, expected_i_a[6]; BOOL set_b[2], ret_b[2], expected_b, expected_b_a[6]; unsigned int i; HRESULT hr; -- 2.34.1

2 1

[PATCH] user32: Set WM_CONTEXTMENU's wparam to the child window's handle
by Huw Davies 07 Jan '22

07 Jan '22

DefWindowProc() does not propagate the wparam; it updates it instead. Spotted by YAL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52327 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/defwnd.c | 2 +- dlls/user32/tests/msg.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 8cd9047f02b..44675c7b8e7 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -322,7 +322,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_CONTEXTMENU: if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) - SendMessageW( GetParent(hwnd), msg, wParam, lParam ); + SendMessageW( GetParent(hwnd), msg, (WPARAM)hwnd, lParam ); else { LONG hitcode; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c054a145112..870c38b106c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -106,6 +106,7 @@ typedef struct } MEASURE_ITEM_STRUCT; static BOOL test_DestroyWindow_flag; +static BOOL test_context_menu; static HWINEVENTHOOK hEvent_hook; static HHOOK hKBD_hook; static HHOOK hCBT_hook; @@ -9984,7 +9985,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, return 0; } - if (message == WM_CONTEXTMENU) + if (!test_context_menu && message == WM_CONTEXTMENU) { /* don't create context menu */ return 0; @@ -16148,6 +16149,13 @@ static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = { 0 } }; +static struct message WmContextMenuSeq[] = { + { WM_CONTEXTMENU, sent|wparam, 0 }, /* wparams set in the code */ + { WM_CONTEXTMENU, sent|wparam|defwinproc, 0 }, + { WM_CONTEXTMENU, sent|wparam|defwinproc, 0 }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -16169,7 +16177,7 @@ static DWORD CALLBACK post_rbuttonup_msg( void *arg ) static void test_defwinproc(void) { - HWND hwnd; + HWND hwnd, child[3]; MSG msg; BOOL gotwmquit = FALSE; POINT pos; @@ -16219,6 +16227,23 @@ static void test_defwinproc(void) flush_events(); ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); + child[0] = CreateWindowExA(0, "TestWindowClass", "1st child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, hwnd, 0, 0, NULL); + child[1] = CreateWindowExA(0, "TestWindowClass", "2nd child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, child[0], 0, 0, NULL); + child[2] = CreateWindowExA(0, "TestWindowClass", "3rd child", + WS_VISIBLE | WS_CHILD, 0,0,500,100, child[1], 0, 0, NULL); + flush_events(); + flush_sequence(); + test_context_menu = TRUE; + DefWindowProcA(child[2], WM_CONTEXTMENU, 0xcafe, 0); + test_context_menu = FALSE; + WmContextMenuSeq[0].wParam = (WPARAM)child[2]; + WmContextMenuSeq[1].wParam = (WPARAM)child[1]; + WmContextMenuSeq[2].wParam = (WPARAM)child[0]; + ok_sequence(WmContextMenuSeq, "DefWindowProcA(WM_CONTEXTMENU)", FALSE); + DestroyWindow(child[0]); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2; -- 2.23.0

1 0

[PATCH] cryptnet: Open the revocation cache file in binary mode.
by Zebediah Figura 07 Jan '22

07 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2f4e2d895f7..e1b32216353 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1578,7 +1578,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, FILE *file; int len; - if (!(file = open_cached_revocation_file(serial, L"r", _SH_DENYWR))) + if (!(file = open_cached_revocation_file(serial, L"rb", _SH_DENYWR))) return FALSE; if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) @@ -1626,7 +1626,7 @@ static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, { FILE *file; - if (!(file = open_cached_revocation_file(serial, L"w", _SH_DENYRW))) + if (!(file = open_cached_revocation_file(serial, L"wb", _SH_DENYRW))) return; fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); fwrite(time, sizeof(*time), 1, file); -- 2.34.1

1 0

[PATCH] taskschd: Set count to zero in regtasks_get_Count stub.
by Olivier F. R. Dierick 06 Jan '22

06 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52349 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> --- dlls/taskschd/regtask.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 0b4b571..094f34d 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -465,6 +465,7 @@ static HRESULT WINAPI regtasks_Invoke(IRegisteredTaskCollection *iface, DISPID d static HRESULT WINAPI regtasks_get_Count(IRegisteredTaskCollection *iface, LONG *count) { FIXME("%p,%p: stub\n", iface, count); + if (count) *count = 0; return E_NOTIMPL; } -- 2.1.4

1 0

[PATCH] amstream: Trace some format fields in IDirectDrawMediaStream::SetFormat().
by Zebediah Figura 06 Jan '22

06 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/amstream/ddrawstream.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index b1b79756ff9..af4492fe3e8 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -549,6 +549,10 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetFormat(IDirectDrawMediaStr if (format->dwSize != sizeof(DDSURFACEDESC)) return E_INVALIDARG; + TRACE("flags %#x, pixel format flags %#x, bit count %u, size %ux%u.\n", + format->dwFlags, format->ddpfPixelFormat.dwFlags, + format->ddpfPixelFormat.u1.dwRGBBitCount, format->dwWidth, format->dwHeight); + if (format->dwFlags & DDSD_PIXELFORMAT) { if (format->ddpfPixelFormat.dwSize != sizeof(DDPIXELFORMAT)) -- 2.34.1

1 0

[PATCH] server: Avoid reporting POLLOUT on connection failure in poll_single_socket().
by Zebediah Figura 06 Jan '22

06 Jan '22

Ideally we should be using sock_get_poll_events() and sock_poll_event() instead, but that seems like an overly risky change for this late in code freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51442 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c00d25fec3e..042c743f95e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6883,7 +6883,7 @@ static void test_WSAPoll(void) fds[0].events = POLLRDNORM | POLLRDBAND | POLLWRNORM; fds[0].revents = 0xdead; ret = pWSAPoll(fds, 1, 10000); - todo_wine ok(ret == 1, "got %d\n", ret); + ok(ret == 1, "got %d\n", ret); todo_wine ok(fds[0].revents == (POLLWRNORM | POLLHUP | POLLERR), "got events %#x\n", fds[0].revents); len = sizeof(err); diff --git a/server/sock.c b/server/sock.c index c7378306511..650e67a2e0a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2979,6 +2979,9 @@ static int poll_single_socket( struct sock *sock, int mask ) if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) return 0; + if (sock->state == SOCK_CONNECTING && (pollfd.revents & (POLLERR | POLLHUP))) + pollfd.revents &= ~POLLOUT; + if ((mask & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && sock->type == WS_SOCK_STREAM) { char dummy; -- 2.34.1

1 0

[PATCH] urlmon: Don't allow direct sink callbacks when reporting data.
by Jacek Caban 06 Jan '22

06 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52286 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 222914, 222932, 222998, 222999. dlls/urlmon/bindprot.c | 49 +++++++++++++++++++++------------- dlls/urlmon/tests/protocol.c | 51 +++++++++++++++++++++++++++--------- 2 files changed, 70 insertions(+), 30 deletions(-)

2 1

[PATCH] mshtml: Fix nsnode leak when cloning.
by Gabriel Ivăncescu 06 Jan '22

06 Jan '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 996c28c..23ab719 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -800,6 +800,7 @@ static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fD } hres = This->vtbl->clone(This, nsnode, &new_node); + nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres; -- 2.34.1

2 1

WSASend behaviour / gRPC compatibility
by Ruud Schramp 06 Jan '22

06 Jan '22

Hello All, I am trying to run a Python gRPC application in WINE. It turns out the gRPC Windows binding uses WSASend which first tries the "blocking" variant on a overlapped socket. Based on the code, the EXPECTED behaviour is that WSASend is atomic: It either sends nothing and reports WSAEWOULDBLOCK, or it sends everything and reports SUCCESS. The behaviour in WINE is: It sends upto the TCP Congestion window, and I haven't seen it report WSAEWOULDBLOCK. (WSASend() returns 0) Anyone observed this before? How do other programs handle this? I reported the same issue at the gRPC group https://groups.google.com/g/grpc-io/c/-RzRZ867jy0 Best regards, Ruud

2 1

[PATCH vkd3d 8/8] vkd3d-shader/hlsl: Support multiplication for all numeric types in fold_constants().
by Francisco Casas 06 Jan '22

06 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 75 +++++++++++++++------------ 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 2f34a730..b36448de 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -173,6 +173,43 @@ static int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, return 1; } +static int constant_op2_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = tgt->node.data_type->base_type; + uint32_t u1, u2; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = src1->value[k].f * src2->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = src1->value[k].d * src2->value[k].d; + break; + case HLSL_TYPE_INT: + u1 = src1->value[k].i; + u2 = src2->value[k].i; + tgt->value[k].i = (int32_t)(u1 * u2); + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = src1->value[k].u * src2->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.", debug_hlsl_expr_op(HLSL_OP2_MUL), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -210,8 +247,13 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont case HLSL_OP2_ADD: success = constant_op2_add(ctx, res, arg1, arg2); break; + case HLSL_OP2_MUL: + success = constant_op2_mul(ctx, res, arg1, arg2); + break; default: - goto fallback; + FIXME("Fold op %#x.\n", expr->op); + success = 0; + break; } if (success) @@ -225,35 +267,4 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont vkd3d_free(res); return false; } - -fallback: - - switch (instr->data_type->base_type) - { - case HLSL_TYPE_UINT: - { - switch (expr->op) - { - case HLSL_OP2_MUL: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u * arg2->value[i].u; - break; - - default: - FIXME("Fold uint op %#x.\n", expr->op); - vkd3d_free(res); - return false; - } - break; - } - - default: - FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); - vkd3d_free(res); - return false; - } - - list_add_before(&expr->node.entry, &res->node.entry); - hlsl_replace_node(&expr->node, &res->node); - return true; } \ No newline at end of file -- 2.25.1

1 0

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Move replace_node() to hlsl.c.
by Francisco Casas 06 Jan '22

06 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- This in order to make this function accessible from the new hlsl_constant_ops.c file in the following patches. I also needed to call it from hlsl.y to implement the implicit conversion of overloaded function parameters, which I will probably send in the future. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 14 ++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl_codegen.c | 13 ------------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d2ea4c34..3fb84b28 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1384,6 +1384,20 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl vkd3d_string_buffer_cleanup(&buffer); } +void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +{ + struct hlsl_src *src, *next; + + LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) + { + hlsl_src_remove(src); + hlsl_src_from_node(src, new); + } + list_remove(&old->entry); + hlsl_free_instr(old); +} + + void hlsl_free_type(struct hlsl_type *type) { struct hlsl_struct_field *field, *next_field; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 57acf3a0..393b3f1f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -680,6 +680,8 @@ void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); + void hlsl_free_instr(struct hlsl_ir_node *node); void hlsl_free_instr_list(struct list *list); void hlsl_free_type(struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..00f3dae3 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -224,19 +224,6 @@ static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx return progress; } -static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) -{ - struct hlsl_src *src, *next; - - LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) - { - hlsl_src_remove(src); - hlsl_src_from_node(src, new); - } - list_remove(&old->entry); - hlsl_free_instr(old); -} - /* Lower casts from vec1 to vecN to swizzles. */ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { -- 2.25.1

1 0

[tools] testbot/SetWinLocale: Add support for setting the code pages to UTF-8.
by Francois Gouget 06 Jan '22

06 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 67 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 3a74406a49..c62d663335 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -47,6 +47,7 @@ my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; my $HKCU_DESKTOP = "HKCU\\Control Panel\\Desktop"; my $HKLM_LANGUAGE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language"; my $HKLM_LOCALE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"; +my $HKLM_CODE_PAGE = "HKLM\\System\\CurrentControlSet\\Control\\Nls\\CodePage"; # @@ -297,7 +298,7 @@ sub CheckLocale($$) } my ($OptHostName, $OptShow, $OptReboot); -my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); +my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard, $OptUTF8); while (@ARGV) { my $Arg = shift @ARGV; @@ -351,6 +352,10 @@ while (@ARGV) { $OptCountry = CheckValue($Arg, $OptCountry); } + elsif ($Arg eq "--utf8") + { + $OptUTF8 = 1; + } elsif ($Arg eq "--debug") { $Debug = 1; @@ -413,7 +418,7 @@ if (!defined $Usage) } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and - !$OptCountry and !$OptShow) + !$OptCountry and !$OptUTF8 and !$OptShow) { Error("you must specify at least one locale to change\n"); $Usage = 2; @@ -433,7 +438,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -456,6 +461,13 @@ if (defined $Usage) print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID().\n"; print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; + print " --utf8 Set the code pages (ACP, MACCP and OEMCP) to UTF-8.\n"; + print " . Windows 10 GUI: Time & language -> Language ->\n"; + print " Administrative Language Settings -> Change system locale ->\n"; + print " Beta: Use Unicode UTF-8 for worldwide language support.\n"; + print " . APIs: GetACP(), GetOEMCP().\n"; + print " . Powershell: Automatically and unconditionally set by\n"; + print " Set-WinSystemLocale for the relevant locales.\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; @@ -533,6 +545,26 @@ sub RegGetValue($;$) return $Values->{defined $VName ? $VName : "(Default)"}; } +sub RegSetValue($$$$) +{ + my ($Key, $VName, $Type, $Value) = @_; + + my $Cmd = ["reg.exe", "add", $Key, "/f"]; + push @$Cmd, (defined $VName ? ("/v", $VName) : ("/ve")); + $Value = join("\\0", @$Value) if (ref($Value) eq "ARRAY"); + push @$Cmd, "/t" , $Type, "/d", $Value; + + my $Pid = $TA->Run($Cmd, 0); + if (!$Pid) + { + FatalError("failed to run @$Cmd\n"); + } + if (!defined $TA->Wait($Pid, 10)) + { + FatalError("@$Cmd timed out: ", $TA->GetLastError(), "\n"); + } +} + # # Show the host's locale settings @@ -570,6 +602,11 @@ sub GetWinSettings($) $Settings->{SysLanguage} = RegGetValue($HKLM_LANGUAGE, "Default"); $Settings->{SysLocale} = RegGetValue($HKLM_LOCALE, "(Default)"); } + if ($OptUTF8 or $All) + { + my $Values = RegGetValues($HKLM_CODE_PAGE, "*CP"); + map { $Settings->{$_} = $Values->{$_} } ("ACP", "MACCP", "OEMCP"); + } return $Settings; } @@ -595,6 +632,9 @@ sub ShowWinSettings($) print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; + print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; + print "MACCP (--utf8) = ", Value2Str($Settings->{MACCP}), "\n"; + print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n"; } if ($OptShow) @@ -784,6 +824,20 @@ if (!$DryRun) } +# +# Change the code pages manually +# + +if ($OptUTF8) +{ + # intl.cpl does not support setting a specific code page + foreach my $VName ("ACP", "MACCP", "OEMCP") + { + RegSetValue($HKLM_CODE_PAGE, $VName, "REG_SZ", "65001"); + } +} + + # # Reboot to finalize the changes # @@ -861,6 +915,13 @@ if ($OptSystem) CheckSetting($Settings, "SysLanguage", $LCIDSystem, "for --system $OptSystem", 1); CheckSetting($Settings, "SysLocale", "0000$LCIDSystem", "for --system $OptSystem", 1); } +if ($OptUTF8) +{ + foreach my $VName ("ACP", "MACCP", "OEMCP") + { + CheckSetting($Settings, $VName, "65001", "for --utf8"); + } +} exit(1) if (!$Success); -- 2.30.2

1 0

[PATCH v2] darwin: Fix non-Metal build
by Keno Fischer 06 Jan '22

06 Jan '22

The build was relying on QuartzCore definitions even if Metal was not found, so move the appropriate import out of the ifdef and add the QuartzCore framework to the make line. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- v2: Drop `-framework QuartzCore` from configure.ac as suggested by Dean Greer <gcenx83(a)gmail.com>. configure | 2 +- configure.ac | 2 +- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_window.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d57fc6cf43b..bf65b916b7d 100755 --- a/configure +++ b/configure @@ -10321,7 +10321,7 @@ fi fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then - METAL_LIBS="-framework Metal -framework QuartzCore" + METAL_LIBS="-framework Metal" fi diff --git a/configure.ac b/configure.ac index de79b47ea2a..1a36e98f3e8 100644 --- a/configure.ac +++ b/configure.ac @@ -757,7 +757,7 @@ case $host_os in fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then - AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore") + AC_SUBST(METAL_LIBS,"-framework Metal") fi dnl Check for MTLDevice registryID property diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 6329e8e76c8..fc3dddbdae7 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemac.drv IMPORTS = uuid rpcrt4 user32 gdi32 advapi32 win32u DELAYIMPORTS = ole32 shell32 imm32 -EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS) +EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d0672b7fb06..a18fc069604 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -25,8 +25,8 @@ #import <CoreVideo/CoreVideo.h> #ifdef HAVE_METAL_METAL_H #import <Metal/Metal.h> -#import <QuartzCore/QuartzCore.h> #endif +#import <QuartzCore/QuartzCore.h> #import "cocoa_window.h" -- 2.25.1

7 16

[PATCH v3] winemac: Unconditionally link to QuartzCore.
by Huw Davies 06 Jan '22

06 Jan '22

From: Keno Fischer <keno(a)juliacomputing.com> This fixes non-Metal builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52216 Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 2 +- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_window.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ddd45b8c241..b42cb8a5346 100644 --- a/configure.ac +++ b/configure.ac @@ -757,7 +757,7 @@ case $host_os in fi if test "$ac_cv_header_Metal_Metal_h" = "yes" then - AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore") + AC_SUBST(METAL_LIBS,"-framework Metal") fi dnl Check for MTLDevice registryID property diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 6329e8e76c8..fc3dddbdae7 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemac.drv IMPORTS = uuid rpcrt4 user32 gdi32 advapi32 win32u DELAYIMPORTS = ole32 shell32 imm32 -EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS) +EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 10524e4b3a2..7708157a992 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -25,8 +25,8 @@ #import <CoreVideo/CoreVideo.h> #ifdef HAVE_METAL_METAL_H #import <Metal/Metal.h> -#import <QuartzCore/QuartzCore.h> #endif +#import <QuartzCore/QuartzCore.h> #import "cocoa_window.h" -- 2.23.0

1 0

[PATCH 2/2] win32u: Allow selecting 32-bit DDBs into display compatible DCs.
by Zhiyi Zhang 06 Jan '22

06 Jan '22

Device context bit depths other than 32-bit are emulated and the real bit depth for display DCs is still 32-bit. Thus, a 32-bit DDB should be allowed to be selected into a display compatible DC even if the DC reports a different bit depth. Fix a regression from d171d11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51805 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 2 -- dlls/win32u/bitmap.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e745fb9c7b3..a857b295849 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2301,7 +2301,6 @@ static void test_display_dc(void) bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); old_hbitmap = SelectObject(mem_dc, hbitmap); - todo_wine ok(!!old_hbitmap, "Failed to select bitmap.\n"); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); @@ -2329,7 +2328,6 @@ static void test_display_dc(void) ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */, "Selecting bitmap succeeded.\n"); else - todo_wine_if(bpps[i] == 32) ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */, "Failed to select bitmap.\n"); diff --git a/dlls/win32u/bitmap.c b/dlls/win32u/bitmap.c index 00c8b347af5..2be88715948 100644 --- a/dlls/win32u/bitmap.c +++ b/dlls/win32u/bitmap.c @@ -401,7 +401,9 @@ HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) if (!is_bitmapobj_dib( bitmap ) && bitmap->dib.dsBm.bmBitsPixel != 1 && - bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL )) + bitmap->dib.dsBm.bmBitsPixel != NtGdiGetDeviceCaps( hdc, BITSPIXEL ) && + /* Display compatible DCs should accept 32-bit DDBs because other color depths are emulated */ + !(NtGdiGetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASDISPLAY && bitmap->dib.dsBm.bmBitsPixel == 32)) { WARN( "Wrong format bitmap %u bpp\n", bitmap->dib.dsBm.bmBitsPixel ); GDI_ReleaseObj( handle ); -- 2.32.0

2 1

[PATCH 1/2] user32/tests: Test selecting DDBs of different depth into display compatible DCs.
by Zhiyi Zhang 06 Jan '22

06 Jan '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 110 +++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bd348576726..e745fb9c7b3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2180,13 +2180,17 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { + static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + HBITMAP hbitmap, old_hbitmap; + INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; - INT count, old_count; DISPLAY_DEVICEA dd; + HDC hdc, mem_dc; + DIBSECTION dib; + BITMAP bitmap; BOOL ret; LONG res; - HDC hdc; /* Test DCs covering the entire virtual screen */ hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -2199,6 +2203,51 @@ static void test_display_dc(void) check_display_dc(hdc, &dm, FALSE); + /* Test that CreateCompatibleBitmap() for display DCs creates DDBs */ + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + ok(!!hbitmap, "CreateCompatibleBitmap failed, error %d.\n", GetLastError()); + count = GetObjectW(hbitmap, sizeof(dib), &dib); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm.dmPelsWidth, dm.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + if (bpps[i] != 1 && bpps[i] != 32) + ok(!old_hbitmap, "Selecting bitmap succeeded.\n"); + else + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test selecting a DDB of the same color depth into a display compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm.dmBitsPerPel, bpp); + hbitmap = CreateCompatibleBitmap(hdc, dm.dmPelsWidth, dm.dmPelsHeight); + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, bitmap.bmBitsPixel); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + /* Tests after mode changes to a different resolution */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); @@ -2226,7 +2275,7 @@ static void test_display_dc(void) dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) { - if (dm2.dmBitsPerPel != dm.dmBitsPerPel) + if (dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) break; } if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) @@ -2239,6 +2288,59 @@ static void test_display_dc(void) { check_display_dc(hdc, &dm2, FALSE); + /* Test selecting a compatible bitmap of a different color depth previously created for + * a display DC into a new compatible DC */ + count = GetObjectW(hbitmap, sizeof(bitmap), &bitmap); + ok(count == sizeof(BITMAP), "GetObject failed, count %d.\n", count); + ok(bitmap.bmBitsPixel == dm.dmBitsPerPel, "Expected %d, got %d.\n", dm.dmBitsPerPel, + bitmap.bmBitsPixel); + + /* Note that hbitmap is of a different color depth and it can be successfully selected + * into the new compatible DC */ + mem_dc = CreateCompatibleDC(hdc); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + old_hbitmap = SelectObject(mem_dc, hbitmap); + todo_wine + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + bpp = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(bpp == dm2.dmBitsPerPel, "Expected bpp %d, got %d.\n", dm2.dmBitsPerPel, bpp); + SelectObject(mem_dc, old_hbitmap); + DeleteDC(mem_dc); + DeleteObject(hbitmap); + + /* Test selecting a DDB of a different color depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + hbitmap = CreateBitmap(dm2.dmPelsWidth, dm2.dmPelsHeight, 1, bpps[i], NULL); + ok(!!hbitmap, "CreateBitmap failed, error %d.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + /* On Win7 dual-QXL test bot and XP, only 1-bit DDBs and DDBs with the same color + * depth can be selected to the compatible DC. On newer versions of Windows, only + * 1-bit and 32-bit DDBs can be selected into the compatible DC even if + * GetDeviceCaps(BITSPIXEL) reports a different color depth, for example, 16-bit. + * It's most likely due to the fact that lower color depth are emulated on newer + * versions of Windows as the real color depth is still 32-bit */ + if (bpps[i] != 1 && bpps[i] != 32) + todo_wine_if(bpps[i] == dm2.dmBitsPerPel) + ok(!old_hbitmap || broken(!!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Selecting bitmap succeeded.\n"); + else + todo_wine_if(bpps[i] == 32) + ok(!!old_hbitmap || broken(!old_hbitmap) /* Win7 dual-QXL test bot and XP */, + "Failed to select bitmap.\n"); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + hbitmap = NULL; + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); } @@ -2248,6 +2350,8 @@ static void test_display_dc(void) win_skip("Failed to find a different color depth other than %u.\n", dm.dmBitsPerPel); } + if (hbitmap) + DeleteObject(hbitmap); DeleteDC(hdc); /* Test DCs covering a specific monitor */ -- 2.32.0

2 1

Re: [PATCH] programs/cmd: expand commandline before starting parsing it
by Eric Pouech 06 Jan '22

06 Jan '22

Hi Alexandre, this one will be harder to test... it only happens when cmd is not in batch mode (ie cmd reading directly from console APIs) all the tests in cmd/tests are done in batch mode (ie cmd reading from file APIs) since the expansion of variables is done currently done differently in batch mode vs non batch mode in cmd, adding a test to current infrastructure won't cover the use case (and it already works correctly in batch mode) it would require a new test harness inside cmd/tests to generate console input events instead of just passing the file handle I'll provide the tests UC for the other patches, but I'm rather in favor of applying this patch without a test case A+ On Wed, 5 Jan 2022 at 22:58, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Needs tests". > > This means that you need to write some test cases demonstrating that > the patch is correct. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. > -- -- Eric Pouech

2 1

[PATCH] dinput: Wait for the internal thread with a timeout.
by Rémi Bernon 06 Jan '22

06 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52263 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Instead of 222958-222964, as a temporary solution. dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a62d4d2ea3d..8347e3aa586 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1379,7 +1379,8 @@ static void dinput_thread_start(void) static void dinput_thread_stop(void) { PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 0, 0 ); - WaitForSingleObject( dinput_thread, INFINITE ); + if (WaitForSingleObject( dinput_thread, 500 ) == WAIT_TIMEOUT) + WARN("Timeout while waiting for internal thread\n"); CloseHandle( dinput_thread ); } -- 2.34.1

1 0

[PATCH vkd3d v3 1/3] vkd3d-compiler: Print usage instructions only if --help is specified.
by Zebediah Figura 06 Jan '22

06 Jan '22

vkd3d-compiler is hardly the only program to print usage instructions on all invalid invocations, but it's rather annoying to have one's whole screen wiped due to a typo. It also makes it hard to notice the actual error messages printed on e.g. `vkd3d-compiler -x`. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4d7d628ca..4e56e8fa5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -209,6 +209,7 @@ struct options enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; bool preprocess_only; + bool print_help; bool print_version; bool print_source_types; bool print_target_types; @@ -446,6 +447,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case 'h': + case OPTION_HELP: + options->print_help = true; + return true; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -623,9 +629,12 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) + return 1; + + if (options.print_help) { print_usage(argv[0]); - return 1; + return 0; } if (options.print_version) -- 2.34.1

5 13

[PATCH vkd3d v3 05/12] vkd3d-shader/hlsl: Add Gather methods with offset and tests.
by Francisco Casas 06 Jan '22

06 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 + libs/vkd3d-shader/hlsl.c | 4 + libs/vkd3d-shader/hlsl.h | 4 + libs/vkd3d-shader/hlsl.y | 109 +++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 67 ++++++++++++++++ tests/hlsl-gather-offset.shader_test | 93 +++++++++++++++++++++++ tests/hlsl-gather.shader_test | 107 ++++++++++++++++++++++++++ 7 files changed, 388 insertions(+) create mode 100644 tests/hlsl-gather-offset.shader_test create mode 100644 tests/hlsl-gather.shader_test diff --git a/Makefile.am b/Makefile.am index 16848f5a..749df363 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,8 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather-offset.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -294,6 +296,8 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather-offset.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index b426e461..82820daf 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1277,6 +1277,10 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru { [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", + [HLSL_RESOURCE_GATHER_RED] = "gather4r", + [HLSL_RESOURCE_GATHER_GREEN] = "gather4g", + [HLSL_RESOURCE_GATHER_BLUE] = "gather4b", + [HLSL_RESOURCE_GATHER_ALPHA] = "gather4a", }; vkd3d_string_buffer_printf(buffer, "%s(resource = ", type_names[load->load_type]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2396adb4..49fa8d9d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -378,6 +378,10 @@ enum hlsl_resource_load_type { HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, + HLSL_RESOURCE_GATHER_RED, + HLSL_RESOURCE_GATHER_GREEN, + HLSL_RESOURCE_GATHER_BLUE, + HLSL_RESOURCE_GATHER_ALPHA, }; struct hlsl_ir_resource_load diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 33bfee5b..9aa0138d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1930,6 +1930,115 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } + else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") + || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) + { + const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + enum hlsl_resource_load_type load_type; + const struct hlsl_type *sampler_type; + struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *offset = NULL; + struct hlsl_ir_load *sampler_load; + struct hlsl_type *result_type; + struct hlsl_ir_node *coords; + int status_out_arg; + int read_channel; + + if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed")) + { + load_type = HLSL_RESOURCE_GATHER_RED; + read_channel = 0; + } + else if (!strcmp(name, "GatherGreen")) + { + load_type = HLSL_RESOURCE_GATHER_GREEN; + read_channel = 1; + } + else if (!strcmp(name, "GatherBlue")) + { + load_type = HLSL_RESOURCE_GATHER_BLUE; + read_channel = 2; + } + else if (!strcmp(name, "GatherAlpha")) + { + load_type = HLSL_RESOURCE_GATHER_ALPHA; + read_channel = 3; + } + else { + assert(!"Unexpected Gather method."); + } + + + if (!strcmp(name, "Gather")) + { + if (params->args_count != 2 && params->args_count != 3) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method 'Gather': expected 2 or 3, but got %u.", params->args_count); + return false; + } + } + else if (params->args_count < 2 || params->args_count == 5 || params->args_count > 7) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method '%s': expected 2,3,4,6 or 7, but got %u.", name, params->args_count); + return false; + } + + status_out_arg = -1; + if (params->args_count == 4) + status_out_arg = 3; + if (params->args_count == 7) + status_out_arg = 6; + if (status_out_arg != -1) + FIXME("Ignoring 'status' output parameter.\n"); + + if (params->args_count == 6 || params->args_count == 7) + FIXME("Ignoring multiple offset parameters.\n"); + + if (params->args_count == 3 || params->args_count == 4) + { + if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2], + hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim), loc))) + offset = params->args[2]; + } + + sampler_type = params->args[0]->data_type; + if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER + || sampler_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, sampler_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if (read_channel >= object_type->e.resource_format->dimx) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Method %s() requires at least %d channels.", name, read_channel+1); + return false; + } + + result_type = hlsl_get_vector_type(ctx, object_type->e.resource_format->base_type, 4); + + /* Only HLSL_IR_LOAD can return an object. */ + sampler_load = hlsl_ir_load(params->args[0]); + + if (!(coords = add_implicit_conversion(ctx, instrs, params->args[1], + hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc))) + coords = params->args[1]; + + if (!(load = hlsl_new_resource_load(ctx, result_type, + load_type, object_load->src.var, object_load->src.offset.node, + sampler_load->src.var, sampler_load->src.offset.node, coords, offset, loc))) + return false; + list_add_tail(instrs, &load->node.entry); + return true; + } else { struct vkd3d_string_buffer *string; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 11e1f59a..be35d125 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1654,6 +1654,56 @@ static void write_sm4_loop(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } + +static void write_sm4_gather(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords, + unsigned int swizzle, const struct hlsl_ir_node *texel_offset) +{ + struct sm4_instruction instr; + unsigned int writemask; + int n_srcs = 0; + + memset(&instr, 0, sizeof(instr)); + + /* TODO: possible optimization, if the offset ranges from -8 to 7, an VKD3D_SM4_OP_GATHER4 with + an aoffimmi modifier can be used. */ + instr.opcode = texel_offset? VKD3D_SM5_OP_GATHER4_PO : VKD3D_SM4_OP_GATHER4; + + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); + instr.dst_count = 1; + + sm4_register_from_node(&instr.srcs[n_srcs].reg, &writemask, &instr.srcs[n_srcs].swizzle_type, coords); + instr.srcs[n_srcs].swizzle = hlsl_swizzle_from_writemask(writemask); + n_srcs++; + + if (texel_offset) + { + sm4_register_from_node(&instr.srcs[n_srcs].reg, &writemask, &instr.srcs[n_srcs].swizzle_type, texel_offset); + instr.srcs[n_srcs].swizzle = hlsl_swizzle_from_writemask(writemask); + + n_srcs++; + } + + sm4_register_from_deref(ctx, &instr.srcs[n_srcs].reg, &writemask, &instr.srcs[n_srcs].swizzle_type, + resource, resource_type); + instr.srcs[n_srcs].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + n_srcs++; + + sm4_register_from_deref(ctx, &instr.srcs[n_srcs].reg, &writemask, NULL, + sampler, sampler->var->data_type); + instr.srcs[n_srcs].reg.type = VKD3D_SM4_RT_SAMPLER; + instr.srcs[n_srcs].reg.dim = VKD3D_SM4_DIMENSION_VEC4; + instr.srcs[n_srcs].swizzle_type = VKD3D_SM4_SWIZZLE_SCALAR; + instr.srcs[n_srcs].swizzle = swizzle; + n_srcs++; + + instr.src_count = n_srcs; + + write_sm4_instruction(buffer, &instr); +} + + static void write_sm4_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_resource_load *load) { @@ -1694,6 +1744,23 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords, texel_offset); break; + + case HLSL_RESOURCE_GATHER_RED: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(X, X, X, X), texel_offset); + break; + case HLSL_RESOURCE_GATHER_GREEN: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(Y, Y, Y, Y), texel_offset); + break; + case HLSL_RESOURCE_GATHER_BLUE: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(Z, Z, Z, Z), texel_offset); + break; + case HLSL_RESOURCE_GATHER_ALPHA: + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, HLSL_SWIZZLE(W, W, W, W), texel_offset); + break; } } diff --git a/tests/hlsl-gather-offset.shader_test b/tests/hlsl-gather-offset.shader_test new file mode 100644 index 00000000..d7e1a233 --- /dev/null +++ b/tests/hlsl-gather-offset.shader_test @@ -0,0 +1,93 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2), int2(1, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.2, 0.1) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherRed(s, float2(0.6, 0.6), int2(-1, 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 1)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8), int2(-1, -1)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(1, 0)); +} + +[test] +draw quad +probe all rgba (0.5, 0.0, 0.5, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0, -1)); +} + +[test] +draw quad +probe all rgba (0.0, 0.4, 0.0, 0.4) diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl-gather.shader_test new file mode 100644 index 00000000..2682c6ef --- /dev/null +++ b/tests/hlsl-gather.shader_test @@ -0,0 +1,107 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherRed(s, float2(0.6, 0.6), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.2, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 0), int2(0, 0), int2(0, 0), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.5, 0.0, 0.5) + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0, 0)); +} + +[test] +draw quad +probe all rgba (0.4, 0.0, 0.4, 0.0) -- 2.25.1

3 4

[PATCH] ws2_32: Trace the address bound to in bind().
by Zebediah Figura 06 Jan '22

06 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2b05884acaf..f0c8f4a72d0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1143,6 +1143,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } + if (!status) TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); + free( params ); free( ret_addr ); -- 2.34.1

2 1

[PATCH 4/4] urlmon: Don't allow direct sink calls from protocol handler's locking functions.
by Jacek Caban 05 Jan '22

05 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52286 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 16 +++++++++-- dlls/urlmon/tests/protocol.c | 51 +++++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 14 deletions(-)

2 1

[PATCH 3/4] urlmon: Process tasks before returning from ProtocolSinkHandler_ReportData.
by Jacek Caban 05 Jan '22

05 Jan '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/bindprot.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

1 1

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