August 2021 - Wine-Devel - list.winehq.org

Re: [RFC PATCH 0/5] XAudio PE conversion.

by Alexandre Julliard

Rémi Bernon <rbernon(a)codeweavers.com> writes: > On 6/25/21 2:38 PM, Jacek Caban wrote: >> On 6/23/21 8:38 PM, Alexandre Julliard wrote: >>> And honestly, building our dependencies as PE and linking them >>> statically would make things so much easier for everybody, that there >>> would need to be strong practical reasons to go out of our way to start >>> relying on distro packages for this. A general dislike of the approach >>> is not good enough IMHO. >> >> I agree that it's a good way to move forward. >> To implement it, we will need to build dependencies with winegcc >> (rather than plain mingw). I did experiment with it last year, you >> may see it here: >> https://github.com/cjacek/wine-addons >> While the build system itself is just a rough draft and needs >> rethinking, it shows how to build static libs with winegcc (it links >> them into standalone PE files, but they should be ready to >> statically link to Wine modules as well). >> We will probably also need such static libs to be more portable by >> getting rid of libgcc dependency, but that's a latter step. >> Jacek >> > > Hi all! > > I went ahead on this approach, to see how nicely this could be > integrated into Wine build, things well pretty well, and I reached a > point where I'm quite happy with the result. Sorry about the late reply, I finally found the time to look into this. I like your idea of using the Wine makefiles and bypassing the upstream build system. I'm not convinced that it can work in all cases, but when it works it definitely makes things a lot easier. > The "wine-ext" repository references a fork of every dependency as a > submodule. It needs to be cloned somewhere, with > "--recurse-submodules", and then its path provided to "configure > --with-wine-ext=<path>", which will check that its "VERSION" file > number is what current version of Wine expects. That would make it hard to do bisects. You'd need to be able to extract multiple versions at once, or switch wine-ext commits to follow Wine, at which point we would be reinventing git submodules. > (I'm also not completely sure if it makes a real conceptual difference > with including these sources directly in Wine tree, but I can see how > this is a bit "cleaner".) Maybe a little cleaner, but I'm thinking that importing the sources would save a lot of trouble. Especially since with your approach we only need to import *.[ch] and not the rest of the project. > * There's some remaining dependencies, although I thought maybe they > weren't the most important ones, and maybe a unixlib split could be > more appropriate: More important ones would be GnuTLS and libxml2. It may be interesting to see how well GnuTLS works with your scheme. -- Alexandre Julliard julliard(a)winehq.org

Aug. 31, 2021

[PATCH vkd3d 5/5] tests: Test a number of simple HLSL operations.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-operations.shader_test | 86 +++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 tests/hlsl-operations.shader_test diff --git a/Makefile.am b/Makefile.am index c14f33c6..35599d9a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ + tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ @@ -276,6 +277,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ + tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ diff --git a/tests/hlsl-operations.shader_test b/tests/hlsl-operations.shader_test new file mode 100644 index 00000000..3c8036b5 --- /dev/null +++ b/tests/hlsl-operations.shader_test @@ -0,0 +1,86 @@ +[pixel shader] +float4 main(uniform float zero, uniform float one, uniform float x, uniform float y, + float4 pos : SV_POSITION) : SV_TARGET +{ + int izero = zero; + int ione = one; + int ix = x; + int iy = y; + uint uzero = zero; + uint uone = one; + uint ux = x; + uint uy = y; + + if (pos.x == 0.5) + return float4(x + y, x - y, x * y, x / y); + if (pos.x == 1.5) + return float4(ix + iy, ix - iy, ix * iy, ix / iy); + if (pos.x == 2.5) + return float4(ux + uy, ux - uy, ux * uy, ux / uy); + if (pos.x == 3.5) + return float4(x % y, +x, -x, y / x); + if (pos.x == 4.5) + return float4(ix % iy, +ix, -ix, iy / ix); + if (pos.x == 5.5) + return float4(ux % uy, +ux, -ux, uy / ux); + if (pos.x == 6.5) + return float4(x == y, x != y, x < y, x <= y); + if (pos.x == 7.5) + return float4(x > y, x >= y, !x, !zero); + if (pos.x == 8.5) + return float4(ix == iy, ix != iy, ix < iy, ix <= iy); + if (pos.x == 9.5) + return float4(ix > iy, ix >= iy, !ix, !izero); + if (pos.x == 10.5) + return float4(ix & iy, ix | iy, ix ^ iy, ~ix); + if (pos.x == 11.5) + return float4(ix >> 2, ix << 2, iy >> 2, iy << 2); + if (pos.x == 12.5) + return float4(ux == uy, ux != uy, ux < uy, ux <= uy); + if (pos.x == 13.5) + return float4(ux > uy, ux >= uy, !ux, !uzero); + if (pos.x == 14.5) + return float4(ux & uy, ux | uy, ux ^ uy, ~ux); + if (pos.x == 15.5) + return float4(ux >> 2, ux << 2, uy >> 2, uy << 2); + if (pos.x == 16.5) + return float4(zero && zero, zero && one, one && zero, one && one); + if (pos.x == 17.5) + return float4(zero || zero, zero || one, one || zero, one || one); + if (pos.x == 18.5) + return float4(izero && izero, izero && ione, ione && izero, ione && ione); + if (pos.x == 19.5) + return float4(izero || izero, izero || ione, ione || izero, ione || ione); + if (pos.x == 20.5) + return float4(uzero && uzero, uzero && uone, uone && uzero, uone && uone); + if (pos.x == 21.5) + return float4(uzero || uzero, uzero || uone, uone || uzero, uone || uone); + + return float4(0.0, 0.0, 0.0, 0.0); +} + +[test] +uniform 0 float4 0.0 1.0 5.0 15.0 +draw quad +probe rgba (0, 0) (20.0, -10.0, 75.0, 0.33333333) 1 +probe rgba (1, 0) (20.0, -10.0, 75.0, 0.0) +probe rgba (2, 0) (20.0, 4294967300.0, 75.0, 0.0) +probe rgba (3, 0) (5.0, 5.0, -5.0, 3.0) 1 +probe rgba (4, 0) (5.0, 5.0, -5.0, 3.0) +probe rgba (5, 0) (5.0, 5.0, 4294967300.0, 3.0) +probe rgba (6, 0) (0.0, 1.0, 1.0, 1.0) +probe rgba (7, 0) (0.0, 0.0, 0.0, 1.0) +probe rgba (8, 0) (0.0, 1.0, 1.0, 1.0) +probe rgba (9, 0) (0.0, 0.0, 0.0, 1.0) +probe rgba (10, 0) (5.0, 15.0, 10.0, -6.0) +probe rgba (11, 0) (1.0, 20.0, 3.0, 60.0) +probe rgba (12, 0) (0.0, 1.0, 1.0, 1.0) +probe rgba (13, 0) (0.0, 0.0, 0.0, 1.0) +probe rgba (14, 0) (5.0, 15.0, 10.0, 4294967300.0) +probe rgba (15, 0) (1.0, 20.0, 3.0, 60.0) +probe rgba (16, 0) (0.0, 0.0, 0.0, 1.0) +probe rgba (17, 0) (0.0, 1.0, 1.0, 1.0) +probe rgba (18, 0) (0.0, 0.0, 0.0, 1.0) +probe rgba (19, 0) (0.0, 1.0, 1.0, 1.0) +probe rgba (20, 0) (0.0, 0.0, 0.0, 1.0) +probe rgba (21, 0) (0.0, 1.0, 1.0, 1.0) -- 2.33.0

Aug. 31, 2021

[PATCH vkd3d 4/5] tests: Test a for loop, with break and continue.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-for.shader_test | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 tests/hlsl-for.shader_test diff --git a/Makefile.am b/Makefile.am index f9d232e2..c14f33c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ vkd3d_shader_tests = \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ + tests/hlsl-for.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -270,6 +271,7 @@ XFAIL_TESTS = \ tests/hlsl-comma.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ + tests/hlsl-for.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-mul.shader_test \ diff --git a/tests/hlsl-for.shader_test b/tests/hlsl-for.shader_test new file mode 100644 index 00000000..b133ce99 --- /dev/null +++ b/tests/hlsl-for.shader_test @@ -0,0 +1,22 @@ +[pixel shader] +float4 main(float4 pos : SV_POSITION) : SV_TARGET +{ + int i; + float x = 0.0; + for (i = 0; i < 10; i++) + { + x += i; + if (pos.x == 1.5 && i == 5) + break; + if (pos.x == 2.5 && i >= 7) + continue; + x -= 1; + } + return float4(i, x, 0.0, 0.0); +} + +[test] +draw quad +probe rgba (0, 0) (10.0, 35.0, 0.0, 0.0) +probe rgba (1, 0) (5.0, 10.0, 0.0, 0.0) +probe rgba (2, 0) (10.0, 38.0, 0.0, 0.0) -- 2.33.0

Aug. 31, 2021

[PATCH vkd3d 3/5] tests: Test matrix multiplication.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-mul.shader_test | 78 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 tests/hlsl-mul.shader_test diff --git a/Makefile.am b/Makefile.am index 8dbbefc7..f9d232e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ @@ -271,6 +272,7 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl-mul.shader_test new file mode 100644 index 00000000..4d5af691 --- /dev/null +++ b/tests/hlsl-mul.shader_test @@ -0,0 +1,78 @@ +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + float x = 10.0; + float1 v1 = float1(10.0); + float3 v3 = float3(1.0, 2.0, 3.0); + float4 v4 = float4(1.0, 2.0, 3.0, 4.0); + float1x1 m11 = float1x1(10.0); + float1x4 m14 = float1x4(1.0, 2.0, 3.0, 4.0); + float4x1 m41 = float4x1(1.0, 2.0, 3.0, 4.0); + float3x3 m33 = float3x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0, + 7.0, 8.0, 9.0); + float4x4 m44 = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + + if (pos.x == 0.5) + return mul(m44, v4); + if (pos.x == 1.5) + return mul(v4, m44); + if (pos.x == 2.5) + return mul(m44, v3); + if (pos.x == 3.5) + return mul(v3, m44); + if (pos.x == 4.5) + return float4(mul(m33, v4), 0.0); + if (pos.x == 5.5) + return float4(mul(v4, m33), 0.0); + if (pos.x == 6.5) + return mul(x, m44)[1]; + if (pos.x == 7.5) + return mul(m44, x)[1]; + if (pos.x == 8.5) + return mul(v1, m44); + if (pos.x == 9.5) + return mul(m44, v1); + if (pos.x == 10.5) + return mul(m11, m44); + if (pos.x == 11.5) + return mul(m44, m11); + if (pos.x == 12.5) + return mul(m14, m44); + if (pos.x == 13.5) + return mul(m44, m14)[1]; + if (pos.x == 14.5) + return mul(m41, m44)[1]; + if (pos.x == 15.5) + return mul(m44, m41); + if (pos.x == 16.5) + return mul(m33, m44)[1]; + if (pos.x == 17.5) + return float4(mul(m44, m33)[1], 0.0); + + return float4(0.0, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe rgba (0, 0) (30.0, 70.0, 110.0, 150.0) +probe rgba (1, 0) (90.0, 100.0, 110.0, 120.0) +probe rgba (2, 0) (14.0, 38.0, 62.0, 86.0) +probe rgba (3, 0) (38.0, 44.0, 50.0, 56.0) +probe rgba (4, 0) (14.0, 32.0, 50.0, 0.0) +probe rgba (5, 0) (30.0, 36.0, 42.0, 0.0) +probe rgba (6, 0) (50.0, 60.0, 70.0, 80.0) +probe rgba (7, 0) (50.0, 60.0, 70.0, 80.0) +probe rgba (8, 0) (10.0, 20.0, 30.0, 40.0) +probe rgba (9, 0) (10.0, 50.0, 90.0, 130.0) +probe rgba (10, 0) (10.0, 20.0, 30.0, 40.0) +probe rgba (11, 0) (10.0, 50.0, 90.0, 130.0) +probe rgba (12, 0) (90.0, 100.0, 110.0, 120.0) +probe rgba (13, 0) (5.0, 10.0, 15.0, 20.0) +probe rgba (14, 0) (2.0, 4.0, 6.0, 8.0) +probe rgba (15, 0) (30.0, 70.0, 110.0, 150.0) +probe rgba (16, 0) (83.0, 98.0, 113.0, 128.0) +probe rgba (17, 0) (78.0, 96.0, 114.0, 0.0) -- 2.33.0

Aug. 31, 2021

[PATCH vkd3d 2/5] tests: Test the shape of the sum of two numeric values.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-shape.shader_test | 121 +++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 tests/hlsl-shape.shader_test diff --git a/Makefile.am b/Makefile.am index 3de58991..8dbbefc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-shape.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ @@ -273,6 +274,7 @@ XFAIL_TESTS = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-shape.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test new file mode 100644 index 00000000..0d488da4 --- /dev/null +++ b/tests/hlsl-shape.shader_test @@ -0,0 +1,121 @@ +[pixel shader] +float4 main(float4 pos : sv_position) : sv_target +{ + /* Scalar and scalar */ + float x = 1.0; + float y = 2.0; + if (pos.x == 0.5) + return float4(x + y, 0.0, 0.0, 0.0); + + /* Vector and vector */ + float1 v1 = float1(1.0); + float2 v2 = float2(2.0, 3.0); + float4 v4 = float4(4.0, 5.0, 6.0, 7.0); + if (pos.x == 10.5) + return float4(v1 + v2, 0.0, 0.0); + if (pos.x == 11.5) + return float4(v1 + v4); + if (pos.x == 12.5) + return float4(v2 + v4, 0.0, 0.0); + + /* Scalar and vector */ + if (pos.x == 20.5) + return float4(x + v1, v1 + x, 0.0, 0.0); + if (pos.x == 21.5) + return float4(v4 + x); + if (pos.x == 22.5) + return float4(x + v4); + + /* Matrix and matrix */ + float1x4 m14 = float1x4(1.0, 2.0, 3.0, 4.0); + float4x1 m41 = float4x1(5.0, 6.0, 7.0, 8.0); + float2x2 m22 = float2x2(9.0, 10.0, 11.0, 12.0); + float2x3 m23 = float2x3(13.0, 14.0, 15.0, + 16.0, 17.0, 18.0); + float4x4 m44 = float4x4(35.0, 36.0, 37.0, 38.0, + 39.0, 40.0, 41.0, 42.0, + 43.0, 44.0, 45.0, 46.0, + 47.0, 48.0, 49.0, 50.0); + if (pos.x == 30.5) + return float4(m22 + m23); + if (pos.x == 31.5) + return float4(m23 + m22); + if (pos.x == 32.5) + return float4(m14 + m44); + if (pos.x == 33.5) + return float4(m44 + m14); + if (pos.x == 34.5) + return float4(m41 + m44); + if (pos.x == 35.5) + return float4(m44 + m41); + if (pos.x == 36.5) + return float4((m44 + m23)[0], 0.0); + if (pos.x == 37.5) + return float4((m44 + m23)[1], 0.0); + + /* Matrix and vector */ + if (pos.x == 50.5) + return v4 + m14; + if (pos.x == 51.5) + return m14 + v4; + if (pos.x == 52.5) + return v4 + m41; + if (pos.x == 53.5) + return m41 + v4; + if (pos.x == 54.5) + return v4 + m22; + if (pos.x == 55.5) + return m22 + v4; + if (pos.x == 56.5) + return float4(v1 + m14); + if (pos.x == 57.5) + return float4(m14 + v1); + if (pos.x == 58.5) + return float4(v2 + m41, 0.0, 0.0); + if (pos.x == 59.5) + return float4(m41 + v2, 0.0, 0.0); + + /* Matrix and scalar */ + if (pos.x == 70.5) + return (x + m44)[0]; + if (pos.x == 71.5) + return (m44 + x)[1]; + + return float4(0.0, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe rgba (0, 0) (3.0, 0.0, 0.0, 0.0) + +probe rgba (10, 0) (3.0, 4.0, 0.0, 0.0) +probe rgba (11, 0) (5.0, 6.0, 7.0, 8.0) +probe rgba (12, 0) (6.0, 8.0, 0.0, 0.0) + +probe rgba (20, 0) (2.0, 2.0, 0.0, 0.0) +probe rgba (21, 0) (5.0, 6.0, 7.0, 8.0) +probe rgba (22, 0) (5.0, 6.0, 7.0, 8.0) + +probe rgba (30, 0) (22.0, 24.0, 27.0, 29.0) +probe rgba (31, 0) (22.0, 24.0, 27.0, 29.0) +probe rgba (32, 0) (36.0, 38.0, 40.0, 42.0) +probe rgba (33, 0) (36.0, 38.0, 40.0, 42.0) +probe rgba (34, 0) (40.0, 45.0, 50.0, 55.0) +probe rgba (35, 0) (40.0, 45.0, 50.0, 55.0) +probe rgba (36, 0) (48.0, 50.0, 52.0, 0.0) +probe rgba (37, 0) (55.0, 57.0, 59.0, 0.0) + +probe rgba (50, 0) (5.0, 7.0, 9.0, 11.0) +probe rgba (51, 0) (5.0, 7.0, 9.0, 11.0) +probe rgba (52, 0) (9.0, 11.0, 13.0, 15.0) +probe rgba (53, 0) (9.0, 11.0, 13.0, 15.0) +probe rgba (54, 0) (13.0, 15.0, 17.0, 19.0) +probe rgba (55, 0) (13.0, 15.0, 17.0, 19.0) +probe rgba (56, 0) (2.0, 3.0, 4.0, 5.0) +probe rgba (57, 0) (2.0, 3.0, 4.0, 5.0) +probe rgba (58, 0) (7.0, 9.0, 0.0, 0.0) +probe rgba (59, 0) (7.0, 9.0, 0.0, 0.0) + + +probe rgba (70, 0) (36.0, 37.0, 38.0, 39.0) +probe rgba (71, 0) (40.0, 41.0, 42.0, 43.0) -- 2.33.0

Aug. 31, 2021

[PATCH vkd3d 1/5] tests: Test casting to and then from bool

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-bool-cast.shader_test | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 tests/hlsl-bool-cast.shader_test diff --git a/Makefile.am b/Makefile.am index c66f7b50..3de58991 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-invalid.shader_test \ @@ -265,6 +266,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test new file mode 100644 index 00000000..8880b2f5 --- /dev/null +++ b/tests/hlsl-bool-cast.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + return float4( + (float)(bool)0.0, + (float)(bool)0, + (float)(bool)2.0, + (float)(bool)2 + ); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 1.0, 1.0) -- 2.33.0

Aug. 31, 2021

Re: [PATCH 3/3] dbghelp: fix failing SymInitialize for a live 32bit target from a 64bit caller in WOW64

by Alexandre Julliard

Gabriel Ivăncescu <gabrielopcode(a)gmail.com> writes: > On 31/08/2021 12:53, Alexandre Julliard wrote: >> Eric Pouech <eric.pouech(a)gmail.com> writes: >> >>> When: >>> - caller of dbghelp is a 64bit process, >>> - invoking SymInitialize on a 32bit live target running under WOW64 >>> >>> SymInitialize fails because: >>> - check_live_target() erroneously reads the 64bit PEB of the target, >>> while it actually wants the 32bit PEB. >>> - as the ELF base header address isn't set (hidden in CloudFileFlags) >>> in the 64bit PEB, hence causing the failure >>> >>> So ensure that check_live_target() actually reads the 32bit PEB when >>> handling a 32bit process. >>> >>> >>> ---- >>> >>> I couldn't find a simpler way to fix it :-( >>> (offsetting PEB address by 0x1000 works but is way too hacky) >> Offsetting by 0x1000 is fine. >> But I'd say that the ELF data should be stored in the 64-bit >> PEB. Also >> note that once the new Wow64 architecture is enabled, all ELF data >> inside 32-bit processes is going to be 64-bit. >> > > Sorry for the off topic remark, but is there some brief documentation > on how this is going to work posted anywhere? Will it be optional? > (i.e. if the host supplies 32-bit libs, wine will still use them). Nothing is defined yet, but I expect there will be some kind of runtime option. -- Alexandre Julliard julliard(a)winehq.org

Aug. 31, 2021

Re: [PATCH] msxml3: SchemaCache_version() is unused so remove it.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Aug. 31, 2021

Re: [PATCH v8 2/2] user32: Don't save maximized position for toplevel windows covering the entire work area.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=96898 Your paranoid android. === w1064 (32 bit report) === user32: win.c:2271: Test failed: style 0x200000: expected !100 win.c:2271: Test failed: style 0x300000: expected !100 === w1064_tsign (32 bit report) === user32: win.c:4073: Test failed: hwnd 0003017E/0003017E message 0200 win.c:4077: Test failed: hwnd 0003017E/0003017E message 0201 win.c:4086: Test failed: hwnd 00120210/00120210 message 0202 win.c:4089: Test failed: hwnd 00120210/00120210 message 0201 === w10pro64_ar (64 bit report) === user32: win.c:4073: Test failed: hwnd 0000000000020194/0000000000020194 message 0200 win.c:4077: Test failed: hwnd 0000000000020194/0000000000020194 message 0201 win.c:4086: Test failed: hwnd 00000000000802C2/00000000000802C2 message 0202 win.c:4089: Test failed: hwnd 00000000000802C2/00000000000802C2 message 0201 === debiant2 (32 bit German report) === user32: win.c:10383: Test failed: Expected foreground window 00020054, got 00E300A4 win.c:10385: Test failed: GetActiveWindow() = 00000000 win.c:10385: Test failed: GetFocus() = 00000000 win.c:10386: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. win.c:10387: Test failed: Received WM_ACTIVATEAPP(0), did not expect it. win.c:10395: Test failed: Expected foreground window 00020054, got 00000000 win.c:10397: Test failed: GetActiveWindow() = 00000000 win.c:10397: Test failed: GetFocus() = 00000000 win.c:10405: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. === debiant2 (32 bit French report) === user32: win.c:10366: Test failed: Expected foreground window 00020054, got 00E300A4

Aug. 31, 2021

Re: [PATCH] newdev: Add DiInstallDevice stub.

by Alexandre Julliard

Gijs Vermeulen <gijsvrm(a)gmail.com> writes: > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51299 > Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> > --- > dlls/newdev/main.c | 8 ++++++++ > dlls/newdev/newdev.spec | 2 +- > include/setupapi.h | 29 ++++++++++++++++++++++++++--- > 3 files changed, 35 insertions(+), 4 deletions(-) > > diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c > index 72e7cbc690d..f06148b5342 100644 > --- a/dlls/newdev/main.c > +++ b/dlls/newdev/main.c > @@ -166,3 +166,11 @@ BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BO > FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); > return TRUE; > } > + > +BOOL WINAPI DiInstallDevice(HWND parent, HDEVINFO handle, PSP_DEVINFO_DATA devdata, PSP_DRVINFO_DATA drvdata, > + DWORD flags, BOOL *reboot) This should use either the A or W type, depending on what Windows does. Types that depend on UNICODE shouldn't be used inside Wine. -- Alexandre Julliard julliard(a)winehq.org

Aug. 31, 2021