February 2022 - Wine-commits

Francisco Casas : tests: Test struct initializers.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 40c9799d34995e98305ba71e27b3b358bfa601e8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=40c9799d34995e98305ba71… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 3 23:44:18 2022 +0100 tests: Test struct initializers. Signed-off-by: Francisco Casas <fcasas(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> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 84 +++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/Makefile.am b/Makefile.am index 84c7b85..8cedf20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-gather.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ @@ -299,6 +300,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 0000000..f4028b5 --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,84 @@ +[pixel shader] +struct stu +{ + int3 aaa; + float3 bbb; + int2 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]; + int2 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)

1 0

Francisco Casas : tests: Test invalid number of arguments on initializers.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 053f5354cc2be972a00708bb719773b1aec3329f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=053f5354cc2be972a00708b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 3 23:44:19 2022 +0100 tests: Test invalid number of arguments on initializers. Signed-off-by: Francisco Casas <fcasas(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> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + .../hlsl-initializer-invalid-arg-count.shader_test | 107 +++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/Makefile.am b/Makefile.am index 8cedf20..7358faa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather-offset.shader_test \ tests/hlsl-gather.shader_test \ + tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ @@ -298,6 +299,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-invalid-arg-count.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-arg-count.shader_test b/tests/hlsl-initializer-invalid-arg-count.shader_test new file mode 100644 index 0000000..4332fbe --- /dev/null +++ b/tests/hlsl-initializer-invalid-arg-count.shader_test @@ -0,0 +1,107 @@ +[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; +}

1 0

Francisco Casas : tests: Test complex initializers for numeric types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 82720796d03aaaa8e33330451e7c357f90419c15 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=82720796d03aaaa8e333304… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 3 23:44:20 2022 +0100 tests: Test complex initializers for numeric types. Signed-off-by: Francisco Casas <fcasas(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> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-initializer-numeric.shader_test | 35 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7358faa..b045cec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-gather.shader_test \ tests/hlsl-initializer-invalid-arg-count.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-intrinsic-override.shader_test \ @@ -301,6 +302,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-invalid-arg-count.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 0000000..2fce390 --- /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

1 0

Francisco Casas : tests: Test nested initializers.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 6061a4e6e360485d7d715f0eaf792e8e76ebacd6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6061a4e6e360485d7d715f0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 3 23:44:21 2022 +0100 tests: Test nested initializers. Signed-off-by: Francisco Casas <fcasas(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> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-initializer-nested.shader_test | 56 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/Makefile.am b/Makefile.am index b045cec..92c49c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-gather.shader_test \ tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ @@ -302,6 +303,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ diff --git a/tests/hlsl-initializer-nested.shader_test b/tests/hlsl-initializer-nested.shader_test new file mode 100644 index 0000000..b00259c --- /dev/null +++ b/tests/hlsl-initializer-nested.shader_test @@ -0,0 +1,56 @@ +[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)

1 0

Francisco Casas : tests: Test initialization using a numeric constructor with implicit truncation.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 6b58079cbd728c0744d75293c492ad0a74986f59 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b58079cbd728c0744d7529… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 3 23:44:22 2022 +0100 tests: Test initialization using a numeric constructor with implicit truncation. Signed-off-by: Francisco Casas <fcasas(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> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ ...hlsl-numeric-constructor-truncation.shader_test | 33 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/Makefile.am b/Makefile.am index 92c49c3..8a32802 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,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 \ @@ -316,6 +317,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 0000000..f18b34d --- /dev/null +++ b/tests/hlsl-numeric-constructor-truncation.shader_test @@ -0,0 +1,33 @@ +[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)

1 0

Francisco Casas : tests: Test single numeric initializers.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: e3d55e315b41ccf0603f6a22ff54d09b8002ae50 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3d55e315b41ccf0603f6a2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 3 23:44:23 2022 +0100 tests: Test single numeric initializers. Signed-off-by: Francisco Casas <fcasas(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> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/hlsl-single-numeric-initializer.shader_test | 26 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Makefile.am b/Makefile.am index 8a32802..e52c4c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,6 +84,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 0000000..3b348d6 --- /dev/null +++ b/tests/hlsl-single-numeric-initializer.shader_test @@ -0,0 +1,26 @@ +[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)

1 0

Francisco Casas : tests: Test initializer argument flattening.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: vkd3d Branch: master Commit: 832d6b67024022de5f153643a9307d63a4ac4c8b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=832d6b67024022de5f15364… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 3 23:44:24 2022 +0100 tests: Test initializer argument flattening. Signed-off-by: Francisco Casas <fcasas(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> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-initializer-flatten.shader_test | 73 ++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/Makefile.am b/Makefile.am index e52c4c1..7a7bd6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-gather-offset.shader_test \ tests/hlsl-gather.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-nested.shader_test \ @@ -303,6 +304,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-nested.shader_test \ diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl-initializer-flatten.shader_test new file mode 100644 index 0000000..6b35c6b --- /dev/null +++ b/tests/hlsl-initializer-flatten.shader_test @@ -0,0 +1,73 @@ +[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)

1 0

CJ Silver : WWN Issue 411
by Jeremy Newman 04 Feb '22

04 Feb '22

Module: website Branch: master Commit: 987e7ab767ea15c1cc9bd69bf78826a87ecfd4dd URL: https://source.winehq.org/git/website.git/?a=commit;h=987e7ab767ea15c1cc9bd… Author: CJ Silver <cjsilver(a)codeweavers.com> Date: Fri Feb 4 11:20:28 2022 -0600 WWN Issue 411 --- news/en/2022020402.xml | 12 ++ wwn/en/wn20220204_411.xml | 502 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 514 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=987e7ab767ea15c1c…

1 0

Paul Gofman : hnetcfg: Handle NULL strings in update_mapping_list().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 31f0509b72e2bfdef83c313e0dd41374f4fb6828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f0509b72e2bfdef83c313e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:32 2022 +0300 hnetcfg: Handle NULL strings in update_mapping_list(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 611a652ce5e..47bfc16be79 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -540,6 +540,22 @@ static LONG long_from_bstr( BSTR s ) return _wtoi( s ); } +static BSTR mapping_move_bstr( BSTR *s ) +{ + BSTR ret; + + if (*s) + { + ret = *s; + *s = NULL; + } + else if (!(ret = SysAllocString( L"" ))) + { + ERR( "No memory.\n" ); + } + return ret; +} + static void update_mapping_list(void) { struct xml_value_desc mapping_desc[ARRAY_SIZE(port_mapping_template)]; @@ -579,20 +595,17 @@ static void update_mapping_list(void) } break; } - new_mappings[index].external_ip = mapping_desc[PM_EXTERNAL_IP].value; - mapping_desc[PM_EXTERNAL_IP].value = NULL; + new_mappings[index].external_ip = mapping_move_bstr( &mapping_desc[PM_EXTERNAL_IP].value ); new_mappings[index].external = long_from_bstr( mapping_desc[PM_EXTERNAL].value ); - new_mappings[index].protocol = mapping_desc[PM_PROTOCOL].value; - mapping_desc[PM_PROTOCOL].value = NULL; + new_mappings[index].protocol = mapping_move_bstr( &mapping_desc[PM_PROTOCOL].value ); new_mappings[index].internal = long_from_bstr( mapping_desc[PM_INTERNAL].value ); - new_mappings[index].client = mapping_desc[PM_CLIENT].value; - mapping_desc[PM_CLIENT].value = NULL; - if (!wcsicmp( mapping_desc[PM_ENABLED].value, L"true" ) || long_from_bstr( mapping_desc[PM_ENABLED].value )) + new_mappings[index].client = mapping_move_bstr( &mapping_desc[PM_CLIENT].value ); + if (mapping_desc[PM_ENABLED].value && (!wcsicmp( mapping_desc[PM_ENABLED].value, L"true" ) + || long_from_bstr( mapping_desc[PM_ENABLED].value ))) new_mappings[index].enabled = VARIANT_TRUE; else new_mappings[index].enabled = VARIANT_FALSE; - new_mappings[index].descr = mapping_desc[PM_DESC].value; - mapping_desc[PM_DESC].value = NULL; + new_mappings[index].descr = mapping_move_bstr( &mapping_desc[PM_DESC].value ); TRACE( "%s %s %s:%u -> %s:%u, enabled %d.\n", debugstr_w(new_mappings[index].descr), debugstr_w(new_mappings[index].protocol), debugstr_w(new_mappings[index].external_ip),

1 0

Paul Gofman : hnetcfg/tests: Don't leak IEnumVARIANT reference in test_static_port_mapping_collection().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 69acffb95424c06e8f9eacfa9fe9969e2ae3261c URL: https://source.winehq.org/git/wine.git/?a=commit;h=69acffb95424c06e8f9eacfa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:33 2022 +0300 hnetcfg/tests: Don't leak IEnumVARIANT reference in test_static_port_mapping_collection(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index b6b353ac87d..f344019d1d3 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -188,6 +188,7 @@ static void test_static_port_mapping_collection( IStaticPortMappingCollection *p hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void **)&enum_ports); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IUnknown_Release( unk ); refcount2 = get_refcount((IUnknown *)ports); ok(refcount2 == refcount, "Got unexpected refcount %u, refcount2 %u.\n", refcount, refcount2);

1 0