March 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : tests: Split hlsl-operations into individual test units.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: vkd3d Branch: master Commit: e9ff88469e4e3d45b2cdf09df016ecc2199af2d0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e9ff88469e4e3d45b2cdf09… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 7 19:55:40 2022 -0600 tests: Split hlsl-operations into individual test units. Partly to make the tests easier to navigate, and partly to allow marking some tests as SM4+. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 12 +- tests/arithmetic-float.shader_test | 25 +++ tests/arithmetic-int.shader_test | 25 +++ tests/arithmetic-uint.shader_test | 25 +++ tests/bitwise.shader_test | 129 +++++++++++++ tests/hlsl-operations.shader_test | 367 ------------------------------------- tests/logic-operations.shader_test | 158 ++++++++++++++++ 7 files changed, 372 insertions(+), 369 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e9ff88469e4e3d45b2c…

1 0

Zebediah Figura : tests: Avoid depending on float accuracy in the round() test.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: vkd3d Branch: master Commit: 9bbce56dadb25570e052a45474d8c4edbcfe2f16 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9bbce56dadb25570e052a45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 7 19:55:41 2022 -0600 tests: Avoid depending on float accuracy in the round() test. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/round.shader_test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/round.shader_test b/tests/round.shader_test index cc5a6975..59ac62d5 100644 --- a/tests/round.shader_test +++ b/tests/round.shader_test @@ -5,9 +5,9 @@ float4 main(uniform float4 u) : sv_target } [test] -uniform 0 float4 -0.5 6.5 7.5 3.4 +uniform 0 float4 -0.4 -6.6 7.6 3.4 draw quad -probe all rgba (0.0, 6.0, 8.0, 3.0) 4 +probe all rgba (0.0, -7.0, 8.0, 3.0) 4 @@ -21,9 +21,9 @@ float4 main(uniform float4 u) : sv_target } [test] -uniform 0 float4 -0.5 6.5 7.5 3.4 +uniform 0 float4 -0.4 -6.6 7.6 3.4 draw quad -probe all rgba (6.0, 8.0, 0.0, 3.0) 4 +probe all rgba (-7.0, 8.0, 0.0, 3.0) 4

1 0

Zebediah Figura : tests: Avoid using non-float uniforms where possible.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: vkd3d Branch: master Commit: 1f4056125de3622732f0546ec852d39ee5e0ee4f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f4056125de3622732f0546… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 7 19:55:43 2022 -0600 tests: Avoid using non-float uniforms where possible. SM1 encodes these differently. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-vector-indexing-uniform.shader_test | 4 ++-- tests/round.shader_test | 7 ++++--- tests/saturate.shader_test | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/hlsl-vector-indexing-uniform.shader_test b/tests/hlsl-vector-indexing-uniform.shader_test index 26a45879..e5ffbdd0 100644 --- a/tests/hlsl-vector-indexing-uniform.shader_test +++ b/tests/hlsl-vector-indexing-uniform.shader_test @@ -1,7 +1,7 @@ % Use a uniform to prevent the compiler from optimizing. [pixel shader] -uniform int i; +uniform float i; float4 main() : SV_TARGET { float4 color = float4(0.5, 0.4, 0.3, 0.2); @@ -11,6 +11,6 @@ float4 main() : SV_TARGET } [test] -uniform 0 uint 2 +uniform 0 float 2 draw quad probe all rgba (0.5, 0.3, 0.8, 0.2) diff --git a/tests/round.shader_test b/tests/round.shader_test index 59ac62d5..5e40dc6d 100644 --- a/tests/round.shader_test +++ b/tests/round.shader_test @@ -28,12 +28,13 @@ probe all rgba (-7.0, 8.0, 0.0, 3.0) 4 [pixel shader] -float4 main(uniform int4 u) : sv_target +float4 main(uniform float4 u) : sv_target { - return round(u); + int4 i = u; + return round(i); } [test] -uniform 0 int4 -1 0 2 10 +uniform 0 float4 -1 0 2 10 draw quad probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/saturate.shader_test b/tests/saturate.shader_test index e99df5b3..41ccc62a 100644 --- a/tests/saturate.shader_test +++ b/tests/saturate.shader_test @@ -10,12 +10,13 @@ draw quad probe all rgba (0.7, 0.0, 1.0, 0.0) [pixel shader] -float4 main(uniform int4 u) : sv_target +float4 main(uniform float4 u) : sv_target { - return saturate(u); + int4 i = u; + return saturate(i); } [test] -uniform 0 int4 -2 0 2 -1 +uniform 0 float4 -2 0 2 -1 draw quad probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

Zebediah Figura : tests: Mark some tests as requiring shader model 4.0.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: vkd3d Branch: master Commit: 721ea8fa6031d78ce03740a7c6fb216879066ebf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=721ea8fa6031d78ce03740a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 7 19:55:44 2022 -0600 tests: Mark some tests as requiring shader model 4.0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/arithmetic-uint.shader_test | 3 +++ tests/bitwise.shader_test | 3 +++ tests/cast-to-float.shader_test | 4 +++- tests/cast-to-half.shader_test | 3 +++ tests/cast-to-int.shader_test | 3 +++ tests/cast-to-uint.shader_test | 3 +++ tests/floor.shader_test | 3 +++ tests/hlsl-function-cast.shader_test | 3 +++ tests/sampler-offset.shader_test | 3 +++ tests/shader_runner.c | 3 +++ tests/shader_runner.h | 3 ++- tests/shader_runner_d3d11.c | 1 + tests/shader_runner_d3d12.c | 1 + 13 files changed, 34 insertions(+), 2 deletions(-) diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test index d73947f9..b016dbb6 100644 --- a/tests/arithmetic-uint.shader_test +++ b/tests/arithmetic-uint.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [pixel shader] float4 main() : SV_TARGET { diff --git a/tests/bitwise.shader_test b/tests/bitwise.shader_test index 679cf9cd..55160037 100644 --- a/tests/bitwise.shader_test +++ b/tests/bitwise.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [pixel shader] float4 main() : SV_TARGET { diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test index 75822e52..f0910020 100644 --- a/tests/cast-to-float.shader_test +++ b/tests/cast-to-float.shader_test @@ -1,5 +1,7 @@ -[pixel shader] +[require] +shader model >= 4.0 +[pixel shader] float4 main(uniform int i, uniform uint u, uniform bool b, uniform half h) : sv_target { return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); diff --git a/tests/cast-to-half.shader_test b/tests/cast-to-half.shader_test index 6db5412d..81d6bc5d 100644 --- a/tests/cast-to-half.shader_test +++ b/tests/cast-to-half.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [pixel shader] float4 main(uniform int i, uniform uint u, uniform bool b, uniform float f) : sv_target diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test index c7d1e23c..fe8c79a3 100644 --- a/tests/cast-to-int.shader_test +++ b/tests/cast-to-int.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [pixel shader] float4 main(uniform float f, uniform uint u, uniform bool b, uniform half h) : sv_target diff --git a/tests/cast-to-uint.shader_test b/tests/cast-to-uint.shader_test index 01b0442c..93862a36 100644 --- a/tests/cast-to-uint.shader_test +++ b/tests/cast-to-uint.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [pixel shader] float4 main(uniform float f, uniform int i, uniform bool b, uniform half h) : sv_target diff --git a/tests/floor.shader_test b/tests/floor.shader_test index 033d759c..c111f98b 100644 --- a/tests/floor.shader_test +++ b/tests/floor.shader_test @@ -23,6 +23,9 @@ uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (6.0, 7.0, -1.0, 3.0) 4 +[require] +shader model >= 4.0 + [pixel shader] float4 main(uniform int4 u) : sv_target { diff --git a/tests/hlsl-function-cast.shader_test b/tests/hlsl-function-cast.shader_test index 4f80ac59..41c452e5 100644 --- a/tests/hlsl-function-cast.shader_test +++ b/tests/hlsl-function-cast.shader_test @@ -67,6 +67,9 @@ uniform 0 float4 -1.9 -1.0 2.9 4.0 draw quad probe all rgba (-1.0, -1.0, 2.0, 4.0) +[require] +shader model >= 4.0 + [pixel shader] void func(inout float4 a) diff --git a/tests/sampler-offset.shader_test b/tests/sampler-offset.shader_test index 83900c55..6f8357df 100644 --- a/tests/sampler-offset.shader_test +++ b/tests/sampler-offset.shader_test @@ -1,3 +1,6 @@ +[require] +shader model >= 4.0 + [sampler 0] filter point point point address clamp clamp clamp diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 558d074d..1808a581 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -105,6 +105,7 @@ static void parse_require_directive(struct shader_context *context, const char * { static const char *const model_strings[] = { + [SHADER_MODEL_2_0] = "2.0", [SHADER_MODEL_4_0] = "4.0", [SHADER_MODEL_4_1] = "4.1", [SHADER_MODEL_5_0] = "5.0", @@ -445,6 +446,8 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con char line[256]; FILE *f; + context->minimum_shader_model = SHADER_MODEL_2_0; + for (i = 1; i < argc; ++i) { if (argv[i][0] != '-') diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 245ef358..822a863f 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -25,7 +25,8 @@ enum shader_model { - SHADER_MODEL_4_0 = 0, + SHADER_MODEL_2_0, + SHADER_MODEL_4_0, SHADER_MODEL_4_1, SHADER_MODEL_5_0, SHADER_MODEL_5_1, diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index d77a4b24..79f98640 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -441,6 +441,7 @@ static void d3d11_runner_draw_quad(struct shader_context *c) static const char *const ps_profiles[] = { + [SHADER_MODEL_2_0] = "ps_4_0", [SHADER_MODEL_4_0] = "ps_4_0", [SHADER_MODEL_4_1] = "ps_4_1", [SHADER_MODEL_5_0] = "ps_5_0", diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 3b415ec7..00bb9e41 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -58,6 +58,7 @@ static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_m static const char *const shader_models[] = { + [SHADER_MODEL_2_0] = "ps_4_0", [SHADER_MODEL_4_0] = "ps_4_0", [SHADER_MODEL_4_1] = "ps_4_1", [SHADER_MODEL_5_0] = "ps_5_0",

1 0

Zebediah Figura : tests: Use SM1-compatible uniform layouts in shader tests.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: vkd3d Branch: master Commit: efd9e9e9902811ffa80aa5be864171ef449a8b61 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=efd9e9e9902811ffa80aa5b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 7 19:55:42 2022 -0600 tests: Use SM1-compatible uniform layouts in shader tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-clamp.shader_test | 4 ++-- tests/hlsl-storage-qualifiers.shader_test | 7 ++++--- tests/math.shader_test | 4 ++-- tests/max.shader_test | 8 ++++---- tests/pow.shader_test | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/hlsl-clamp.shader_test b/tests/hlsl-clamp.shader_test index 73f396ff..8e26270c 100644 --- a/tests/hlsl-clamp.shader_test +++ b/tests/hlsl-clamp.shader_test @@ -1,7 +1,7 @@ [pixel shader] -float4 main(uniform float u, uniform float v, uniform float w) : sv_target +float4 main(uniform float3 u) : sv_target { - return float4(clamp(u, v, w), clamp(0.9, v, w), clamp(u, -0.5, w), clamp(0.6, -0.4, 0.3)); + return float4(clamp(u.x, u.y, u.z), clamp(0.9, u.y, u.z), clamp(u.x, -0.5, u.z), clamp(0.6, -0.4, 0.3)); } [test] diff --git a/tests/hlsl-storage-qualifiers.shader_test b/tests/hlsl-storage-qualifiers.shader_test index 0e22bb6f..00e7b836 100644 --- a/tests/hlsl-storage-qualifiers.shader_test +++ b/tests/hlsl-storage-qualifiers.shader_test @@ -9,12 +9,13 @@ void sub(float a, uniform float b, in float c, uniform in float d, out float4 o) sub2(float4(a, b, c, d), o); } -void main(in uniform float a, uniform float b, out float4 o : sv_target) +void main(in uniform float4 a, uniform float4 b, out float4 o : sv_target) { - sub(a, b, 0.3, 0.4, o); + sub(a.x, b.x, 0.3, 0.4, o); } [test] -uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 0 float4 0.1 0.0 0.0 0.0 +uniform 4 float4 0.2 0.0 0.0 0.0 draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/math.shader_test b/tests/math.shader_test index 2fe59a08..6bd9656d 100644 --- a/tests/math.shader_test +++ b/tests/math.shader_test @@ -1,7 +1,7 @@ [pixel shader] -float4 main(uniform float u, uniform float v, uniform float w, uniform float x, - uniform float y, uniform float z) : SV_TARGET +float4 main(uniform float4 a, uniform float2 b) : SV_TARGET { + float u = a.x, v = a.y, w = a.z, x = a.w, y = b.x, z = b.y; return float4(x * y - z / w + --u / -v, z * x / y + w / -v, u + v - w, diff --git a/tests/max.shader_test b/tests/max.shader_test index 56c9a84e..50083f33 100644 --- a/tests/max.shader_test +++ b/tests/max.shader_test @@ -1,7 +1,7 @@ [pixel shader] -float4 main(uniform float u, uniform float v) : sv_target +float4 main(uniform float2 u) : sv_target { - return float4(max(u, v), max(2, 2.1), max(true, 2), max(-1, -1)); + return float4(max(u.x, u.y), max(2, 2.1), max(true, 2), max(-1, -1)); } [test] @@ -10,11 +10,11 @@ draw quad probe all rgba (0.7, 2.1, 2.0, -1.0) [pixel shader] -float4 main(uniform float2 u, uniform float2 v) : sv_target +float4 main(uniform float4 u) : sv_target { float3 a = float3(-0.1, 0.2, 0.3); - return float4(max(u, v), max(a, u)); + return float4(max(u.xy, u.zw), max(a, u.xy)); } [test] diff --git a/tests/pow.shader_test b/tests/pow.shader_test index 21011e6c..6470494e 100644 --- a/tests/pow.shader_test +++ b/tests/pow.shader_test @@ -1,7 +1,7 @@ [pixel shader] -float4 main(uniform float2 u, uniform float2 v) : sv_target +float4 main(uniform float4 u) : sv_target { - return float4(pow(u.y, 3), pow(u, v), pow(0.5, v.y)); + return float4(pow(u.y, 3), pow(u.xy, u.zw), pow(0.5, u.w)); } [test]

1 0

Alex Henrie : tzres: Inform translators of 31-character limit.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: b1485bec414f5ad5218c1f2785e672f7583fc4f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1485bec414f5ad5218c1f27… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Mar 4 10:17:52 2022 -0700 tzres: Inform translators of 31-character limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51619 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 556 ++++++++++++------------ po/ar.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ast.po | 702 ++++++++++++++++++++++++++---- po/bg.po | 268 ++++++++++++ po/ca.po | 392 +++++++++++++++++ po/cs.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/da.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/de.po | 276 ++++++++++++ po/el.po | 268 ++++++++++++ po/en.po | 268 ++++++++++++ po/en_US.po | 268 ++++++++++++ po/eo.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/es.po | 563 ++++++++++++++++++++++-- po/fa.po | 847 ++++++++++++++++++++++++++++--------- po/fi.po | 306 ++++++++++++++ po/fr.po | 1152 ++++++++++++++++++++++++++++++++++++++++++-------- po/he.po | 1028 +++++++++++++++++++++++++++++++++++--------- po/hi.po | 268 ++++++++++++ po/hr.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/hu.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/it.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ja.po | 268 ++++++++++++ po/ko.po | 268 ++++++++++++ po/lt.po | 366 ++++++++++++++++ po/ml.po | 268 ++++++++++++ po/nb_NO.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/nl.po | 302 +++++++++++++ po/or.po | 268 ++++++++++++ po/pa.po | 268 ++++++++++++ po/pl.po | 344 +++++++++++++++ po/pt_BR.po | 376 ++++++++++++++++ po/pt_PT.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/rm.po | 268 ++++++++++++ po/ro.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ru.po | 840 +++++++++++++++++++++++++++++++----- po/si.po | 330 +++++++++++++++ po/sk.po | 1024 +++++++++++++++++++++++++++++++++++--------- po/sl.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 855 ++++++++++++++++++++++++++++--------- po/sr_RS(a)latin.po | 855 ++++++++++++++++++++++++++++--------- po/sv.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ta.po | 268 ++++++++++++ po/te.po | 268 ++++++++++++ po/th.po | 847 ++++++++++++++++++++++++++++--------- po/tr.po | 300 +++++++++++++ po/uk.po | 370 ++++++++++++++++ po/wa.po | 847 ++++++++++++++++++++++++++++--------- po/wine.pot | 268 ++++++++++++ po/zh_CN.po | 268 ++++++++++++ po/zh_TW.po | 268 ++++++++++++ 50 files changed, 25640 insertions(+), 4270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1485bec414f5ad5218c…

1 0

Rémi Bernon : winebus.sys: Don't reset report descriptor when starting a collection.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 99ef287bb727c658c513adcc2d9b1b46691d8bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ef287bb727c658c513adcc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 7 13:14:10 2022 +0100 winebus.sys: Don't reset report descriptor when starting a collection. Fixes regression introduced in 1200e9d472deaa99e80d8fd80821008e3c9021bc, incorrectly split from hid_device_begin_report_descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index d5637c0353b..3e83a05cdf6 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -83,7 +83,6 @@ static BOOL hid_device_begin_collection(struct hid_report_descriptor *desc, cons COLLECTION(1, type), }; - memset(desc, 0, sizeof(*desc)); return hid_report_descriptor_append(desc, template, sizeof(template)); }

1 0

Paul Gofman : ws2_32: Return WSAENOBUFS from setsockopt() for IPPROTO_IP with negative optlen.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 9744055cf4d1c53ea5ca611ccb3c3b8e471e5147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9744055cf4d1c53ea5ca611c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:06 2022 +0300 ws2_32: Return WSAENOBUFS from setsockopt() for IPPROTO_IP with negative optlen. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index efc0a5b488a..40d86becef9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2946,6 +2946,12 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int break; case IPPROTO_IP: + if (optlen < 0) + { + SetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + switch(optname) { case IP_ADD_MEMBERSHIP:

1 0

Paul Gofman : ws2_32/tests: Add tests for bigger option value in test_set_getsockopt().
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 47438903ae958ff0131ab90812eaf1de66fd9866 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47438903ae958ff0131ab908… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:09 2022 +0300 ws2_32/tests: Add tests for bigger option value in test_set_getsockopt(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 49 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6e492ffbb61..1fc8d132b63 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1164,15 +1164,17 @@ static void test_set_getsockopt(void) BOOL accepts_short_len; unsigned int sizes[3]; DWORD values[3]; + BOOL accepts_large_value; + BOOL bool_value; } test_optsize[] = { - {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}}, - {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}}, - {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}}, - {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}}, - {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}}, - {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}, {0}, FALSE}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, }; SOCKET s, s2; int i, j, err, lasterr; @@ -1457,6 +1459,41 @@ static void test_set_getsockopt(void) } ok(size == (test_optsize[i].optname == SO_OPENTYPE ? 4 : -1), "Got unexpected size %d.\n", size); + expected_size = test_optsize[i].sizes[2]; + if (expected_size == 1) + expected_value = 0xdeadbe00; + else + expected_value = test_optsize[i].bool_value ? 0x1 : 0x100; + if (test_optsize[i].accepts_large_value) + { + expected_err = 0; + expected_last_error = 0; + } + else + { + expected_err = -1; + expected_last_error = WSAEINVAL; + } + + value = 0x100; + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, 4); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + if (test_optsize[i].accepts_large_value) + { + value = 0xdeadbeef; + SetLastError(0xdeadbeef); + size = 4; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == expected_err, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + todo_wine_if(test_optsize[i].optname == SO_DONTROUTE || test_optsize[i].optname == SO_LINGER) + ok(value == expected_value, "Got unexpected value %#x, expected %#x.\n", value, expected_value); + ok(size == expected_size, "Got unexpected size %u, expected %u.\n", size, expected_size); + } + winetest_pop_context(); for (j = 0; j < ARRAY_SIZE(test_optsize[i].sizes); ++j)

1 0

Paul Gofman : ws2_32: Pre-validate optlen in getsockopt().
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 20e2edba076a4b452d3246e771ed13a6bed6753e URL: https://source.winehq.org/git/wine.git/?a=commit;h=20e2edba076a4b452d3246e7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:03 2022 +0300 ws2_32: Pre-validate optlen in getsockopt(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e5e29107853..30dc007167a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1395,11 +1395,18 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl TRACE( "socket %#Ix, %s, optval %p, optlen %p (%d)\n", s, debugstr_sockopt(level, optname), optval, optlen, optlen ? *optlen : 0 ); - if ((level != SOL_SOCKET || optname != SO_OPENTYPE) && - !socket_list_find( s )) + if ((level != SOL_SOCKET || optname != SO_OPENTYPE)) { - SetLastError( WSAENOTSOCK ); - return SOCKET_ERROR; + if (!socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return SOCKET_ERROR; + } + if (!optlen || *optlen <= 0) + { + SetLastError( WSAEFAULT ); + return -1; + } } switch(level) @@ -1464,7 +1471,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_CONNECT_TIME: - if (!optlen || !optval) + if (!optval) { SetLastError( WSAEFAULT ); return -1; @@ -1483,7 +1490,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int len = sizeof(linger); int ret; - if (!optlen || *optlen < sizeof(BOOL)|| !optval) + if (*optlen < sizeof(BOOL)|| !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1500,7 +1507,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl /* As mentioned in setsockopt, Windows ignores this, so we * always return true here */ case SO_DONTROUTE: - if (!optlen || *optlen < sizeof(BOOL) || !optval) + if (*optlen < sizeof(BOOL) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1521,7 +1528,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int size; /* struct linger and LINGER have different sizes */ - if (!optlen || *optlen < sizeof(LINGER) || !optval) + if (*optlen < sizeof(LINGER) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1540,7 +1547,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_MAX_MSG_SIZE: - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1574,9 +1581,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl ret = ws_protocol_info(s, optname == SO_PROTOCOL_INFOW, &infow, &size); if (ret) { - if (!optlen || !optval || *optlen < size) + if (!optval || *optlen < size) { - if(optlen) *optlen = size; + *optlen = size; ret = 0; SetLastError(WSAEFAULT); } @@ -1606,7 +1613,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl WSAPROTOCOL_INFOW info; int size; - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1765,7 +1772,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); case IPV6_PROTECTION_LEVEL: - if (!optlen || *optlen < sizeof(UINT) || !optval) + if (*optlen < sizeof(UINT) || !optval) { SetLastError( WSAEFAULT ); return -1;

1 0