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

Giovanni Mascellani : vkd3d-shader/hlsl: Parse lerp() intrinsic.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: vkd3d Branch: master Commit: 7682da58a87f7cbd0d024a83797cc8914dc6f3d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7682da58a87f7cbd0d024a8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:30 2022 +0200 vkd3d-shader/hlsl: Parse lerp() intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 21 +++++++++++++++++++++ tests/hlsl-lerp.shader_test | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7469b525..09a01c6d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2109,6 +2109,26 @@ static bool intrinsic_ldexp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[0], arg, loc); } +static bool intrinsic_lerp(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *neg, *add, *mul; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, arg, loc))) + return false; + + if (!(add = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, params->args[1], neg, loc))) + return false; + + if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[2], add, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, arg, mul, loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2298,6 +2318,7 @@ intrinsic_functions[] = {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, {"ldexp", 2, true, intrinsic_ldexp}, + {"lerp", 3, true, intrinsic_lerp}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, {"mul", 2, true, intrinsic_mul}, diff --git a/tests/hlsl-lerp.shader_test b/tests/hlsl-lerp.shader_test index a472379b..3f93b02d 100644 --- a/tests/hlsl-lerp.shader_test +++ b/tests/hlsl-lerp.shader_test @@ -12,7 +12,7 @@ float4 main() : SV_TARGET uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 0.0 -10.0 10.0 100.0 uniform 8 float4 0.0 1.0 -1.0 0.75 -todo draw quad +draw quad probe all rgba (2.0, -10.0, -2.0, 76.25) [require] @@ -32,5 +32,5 @@ float4 main() : SV_TARGET uniform 0 int4 2 3 4 0 uniform 4 int4 0 -10 10 1000000 uniform 8 int4 0 1 -1 1000000 -todo draw quad +draw quad probe all rgba (2.0, -10.0, -2.0, 1e12)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 dot product instructions.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: vkd3d Branch: master Commit: c7198bc964fd38cb23ca929064a29c99f0fbf66d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7198bc964fd38cb23ca929… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:28 2022 +0200 vkd3d-shader/hlsl: Write SM4 dot product instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ tests/hlsl-dot.shader_test | 6 +++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a6ac2aa3..79027169 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1314,6 +1314,25 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d write_sm4_instruction(buffer, &instr); } +/* dp# instructions don't map the swizzle. */ +static void write_sm4_binary_op_dot(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, + const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = opcode; + + sm4_dst_from_node(&instr.dsts[0], dst); + instr.dst_count = 1; + + sm4_src_from_node(&instr.srcs[0], src1, VKD3DSP_WRITEMASK_ALL); + sm4_src_from_node(&instr.srcs[1], src2, VKD3DSP_WRITEMASK_ALL); + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_binary_op_with_two_destinations(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned dst_idx, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) @@ -1679,6 +1698,38 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP2_DOT: + switch (dst_type->base_type) + { + case HLSL_TYPE_FLOAT: + switch (arg1->data_type->dimx) + { + case 4: + write_sm4_binary_op_dot(buffer, VKD3D_SM4_OP_DP4, &expr->node, arg1, arg2); + break; + + case 3: + write_sm4_binary_op_dot(buffer, VKD3D_SM4_OP_DP3, &expr->node, arg1, arg2); + break; + + case 2: + write_sm4_binary_op_dot(buffer, VKD3D_SM4_OP_DP2, &expr->node, arg1, arg2); + break; + + case 1: + assert(0); + break; + + default: + assert(0); + } + break; + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 %s dot expression.", dst_type_string->buffer); + } + break; + case HLSL_OP2_EQUAL: { const struct hlsl_type *src_type = arg1->data_type; diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test index 74a85ca0..a83c2488 100644 --- a/tests/hlsl-dot.shader_test +++ b/tests/hlsl-dot.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo draw quad +draw quad probe all rgba (166.0, 166.0, 166.0, 166.0) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo draw quad +draw quad probe all rgba (53.0, 53.0, 53.0, 53.0) [pixel shader] @@ -40,7 +40,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo draw quad +draw quad probe all rgba (92.0, 92.0, 92.0, 92.0) [pixel shader]

1 0

Giovanni Mascellani : tests: Test lerp() intrinsic.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: vkd3d Branch: master Commit: 80586bf7a90baec849144045c54ef933ffab5d3f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=80586bf7a90baec84914404… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:26 2022 +0200 tests: Test lerp() intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> 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 | 1 + tests/hlsl-lerp.shader_test | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/Makefile.am b/Makefile.am index ff900a6c..0cb90b2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,6 +89,7 @@ vkd3d_shader_tests = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-ldexp.shader_test \ + tests/hlsl-lerp.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-matrix-indexing.shader_test \ diff --git a/tests/hlsl-lerp.shader_test b/tests/hlsl-lerp.shader_test new file mode 100644 index 00000000..a472379b --- /dev/null +++ b/tests/hlsl-lerp.shader_test @@ -0,0 +1,36 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; +uniform float4 s; + +float4 main() : SV_TARGET +{ + return lerp(x, y, s); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +uniform 4 float4 0.0 -10.0 10.0 100.0 +uniform 8 float4 0.0 1.0 -1.0 0.75 +todo draw quad +probe all rgba (2.0, -10.0, -2.0, 76.25) + +[require] +shader model >= 4.0 + +[pixel shader] +uniform int4 x; +uniform int4 y; +uniform int4 s; + +float4 main() : SV_TARGET +{ + return lerp(x, y, s); +} + +[test] +uniform 0 int4 2 3 4 0 +uniform 4 int4 0 -10 10 1000000 +uniform 8 int4 0 1 -1 1000000 +todo draw quad +probe all rgba (2.0, -10.0, -2.0, 1e12)

1 0

Giovanni Mascellani : tests: Test dot() intrinsic.
by Alexandre Julliard June 27, 2022

June 27, 2022

Module: vkd3d Branch: master Commit: 7b6e782139bc91dab1dfc0597316ef34a5dde9bd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7b6e782139bc91dab1dfc05… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 24 09:41:24 2022 +0200 tests: Test dot() intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/hlsl-dot.shader_test | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/Makefile.am b/Makefile.am index ad6a0a41..400e79e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-cross.shader_test \ + tests/hlsl-dot.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test new file mode 100644 index 00000000..cb117d15 --- /dev/null +++ b/tests/hlsl-dot.shader_test @@ -0,0 +1,96 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (166.0, 166.0, 166.0, 166.0) + +[pixel shader] +uniform float2 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (53.0, 53.0, 53.0, 53.0) + +[pixel shader] +uniform float x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (92.0, 92.0, 92.0, 92.0) + +[pixel shader] +uniform float x; +uniform float y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +% Account for both the SM1 and SM4 uniform layout +uniform 0 float4 2.0 3.0 0.0 0.0 +uniform 4 float4 3.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (6.0, 6.0, 6.0, 6.0) + +[pixel shader fail] +uniform float1x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float1x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +}

1 0

Arkadiusz Hiler : win32u: Don't report cloned monitors in EnumDisplayMonitors().
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: af8ed02b572081206be6c505261f5f2e98a8053c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8ed02b572081206be6c505… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jun 24 18:05:33 2022 +0300 win32u: Don't report cloned monitors in EnumDisplayMonitors(). Based on: ca39b1c22dfa ("user32: Don't report mirrored slave monitors in EnumDisplayMonitors.") 2affb854e524 ("user32: Change slave to a more neutral word.") Which seem to got lost during: 318673405c62 ("win32u: Move NtUserEnumDisplayMonitors implementation from user32.") Fixes regression with Elite Dangerous launcher freezing when cloned displays are present. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/win32u/sysparams.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 8565b1bef99..a5a69a84bd9 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -223,6 +223,7 @@ struct monitor unsigned int flags; RECT rc_monitor; RECT rc_work; + BOOL is_clone; }; static struct list adapters = LIST_INIT(adapters); @@ -1249,7 +1250,7 @@ static BOOL update_display_cache_from_registry(void) DWORD adapter_id, monitor_id, monitor_count = 0, size; KEY_BASIC_INFORMATION key; struct adapter *adapter; - struct monitor *monitor; + struct monitor *monitor, *monitor2; HANDLE mutex = NULL; NTSTATUS status; BOOL ret; @@ -1295,6 +1296,15 @@ static BOOL update_display_cache_from_registry(void) break; } + LIST_FOR_EACH_ENTRY(monitor2, &monitors, struct monitor, entry) + { + if (EqualRect(&monitor2->rc_monitor, &monitor->rc_monitor)) + { + monitor->is_clone = TRUE; + break; + } + } + monitor->handle = UlongToHandle( ++monitor_count ); list_add_tail( &monitors, &monitor->entry ); } @@ -2016,6 +2026,7 @@ BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc get_thread_dpi() ); OffsetRect( &monrect, -origin.x, -origin.y ); if (!intersect_rect( &monrect, &monrect, &limit )) continue; + if (monitor->is_clone) continue; enum_info[count].handle = monitor->handle; enum_info[count].rect = monrect;

1 0

Andrew Eikum : maintainers: Remove myself as maintainer.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 754378ba0c3b6251fead8bfb450148767a0ca9af URL: https://source.winehq.org/git/wine.git/?a=commit;h=754378ba0c3b6251fead8bfb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 24 08:18:48 2022 -0500 maintainers: Remove myself as maintainer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c60a383b3b9..c5f560b2617 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -36,7 +36,7 @@ F: dlls/ntdll/signal_arm* F: programs/winedbg/be_arm* Audio I/O -M: Andrew Eikum <aeikum(a)codeweavers.com> +P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/dsound/ F: dlls/mmdevapi/ F: dlls/winealsa.drv/ @@ -104,7 +104,6 @@ F: dlls/dpwsockx/ DirectShow M: Zebediah Figura <z.figura12(a)gmail.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/amstream/ F: dlls/devenum/ F: dlls/mciqtz32/ @@ -188,7 +187,6 @@ F: dlls/jscript/ Joystick input M: Rémi Bernon <rbernon(a)codeweavers.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput*/ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/ @@ -196,7 +194,7 @@ F: dlls/winexinput.sys/ F: dlls/xinput*/ Media format conversion -M: Andrew Eikum <aeikum(a)codeweavers.com> +P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/*.acm/ F: dlls/msacm32/ @@ -252,7 +250,6 @@ F: dlls/ole32/storage32.h F: dlls/ole32/tests/storage32.c OLE Typelibs -P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c @@ -388,7 +385,6 @@ F: dlls/xmllite/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Alex Henrie <alexhenrie24(a)gmail.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> P: Esme Povirk <esme(a)codeweavers.com>

1 0

Jinoh Kang : winedbg: Clarify options specific to GDB proxy mode.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: f815c2642e6d6c5b56d5b14b5bbad3c3ad58009c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f815c2642e6d6c5b56d5b14b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jun 21 18:53:09 2022 +0900 winedbg: Clarify options specific to GDB proxy mode. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/winedbg/winedbg.man.in | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 7eae4faa756..c58696ba1c9 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -69,17 +69,38 @@ will exit. When in \fBgdb\fR proxy mode, the following options are available: .PP .IP \fB--no-start\fR -\fBgdb\fR will not be automatically -started. Relevant information for starting \fBgdb\fR is printed on -screen. This is somehow useful when not directly using \fBgdb\fR but -some graphical front-ends, like \fBddd\fR or \fBkgbd\fR. +Don't launch \fBgdb\fR directly; instead, print the \fBtarget remote\fR +GDB command to execute and listen for connection from any GDB-compatible +debugger. Normally, \fB--gdb\fR will start both the proxy debugging server +and an instance of \fBgdb\fR for the front end. This option instructs +\fBwinedbg\fR to skip launching of \fBgdb\fR, and instead prints +the GDB command that can be used to manually connect to the server. +This command is in the form +.IP +.in +4n +.EX +target remote localhost:\fI<port>\fR +.EE +.in +.IP +where \fI<port>\fR is the TCP port \fBwinedbg\fR's proxy debugging server is bound to. +.IP +This option allows the user to replace \fBgdb\fR with some other +debugger front end, such as \fBddd\fR, \fBkgdb\fR, \fBgdbgui\fR, or Qt Creator. +Regardless of whether \fB--no-start\fR is specified, \fBwinedbg\fR will quit +after the first connection is hung up (e.g. \fBgdb\fR detaches from the +debuggee). .IP \fB--port\fR\ \fIport\fR -Start the \fBgdb\fR server on the given port. If this option is not -specified, a randomly chosen port will be used. If \fB--no-start\fR is -specified, the port used will be printed on startup. +Start the GDB proxy debugging server on the given port. If this option is not +specified, \fBwinedbg\fR will let the operating system choose any available port. +This option can be used in conjunction with \fB--no-start\fR to specify the port the +server shall be bound to. .IP \fB--with-xterm\fR -This will run \fBgdb\fR in its own xterm instead of using the current -Unix console for textual display. +This will run the \fBgdb\fR front end in a new +.BR xterm (1) +window instead of using the current Unix terminal for its interface. +This option is ignored if \fB--no-start\fR is +specified. .PP In all modes, the rest of the command line, when passed, is used to identify which program, if any, is to be debugged:

1 0

Huw Davies : wow64: Report the correct size for SystemLogicalProcessorInformationEx.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 04d07d65e3e411d807a0447f5bc892ec669640f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d07d65e3e411d807a0447f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 24 11:06:39 2022 +0100 wow64: Report the correct size for SystemLogicalProcessorInformationEx. Spotted by Brendan Shanks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 5 +++-- dlls/wow64/system.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e019fcb5975..c367b4f372e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1168,7 +1168,7 @@ static void test_query_logicalprocex(void) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex_public, *infoex_core, *infoex_numa, *infoex_cache, *infoex_package, *infoex_group, *ex; - DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_union; + DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_union, ret_len; unsigned int i, j; NTSTATUS status; BOOL ret; @@ -1226,8 +1226,9 @@ static void test_query_logicalprocex(void) infoex_group = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_group); relationship = RelationAll; - status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &ret_len); ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); + ok(ret_len == len, "got %08lx expected %08lx\n", ret_len, len); ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public); ok(ret, "got %d, error %ld\n", ret, GetLastError()); diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index 0727bc25bbe..c5c1563afc2 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -617,7 +617,7 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformationEx( UINT *args ) status = NtQuerySystemInformationEx( class, &handle, sizeof(handle), info, size, &size ); if (!status) { - for (pos = pos32 = 0; pos < size && pos32 < len; pos += ex->Size, pos32 += size32) + for (pos = pos32 = 0; pos < size; pos += ex->Size, pos32 += size32) { ex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((char *)info + pos); ex32 = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX32 *)((char *)info32 + pos32); @@ -645,8 +645,8 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformationEx( UINT *args ) } if (pos32 + size32 <= len) put_logical_proc_info_ex( ex32, ex ); } - if (pos < size) status = STATUS_INFO_LENGTH_MISMATCH; - else size = pos32; + if (pos32 > len) status = STATUS_INFO_LENGTH_MISMATCH; + size = pos32; } if (retlen) *retlen = size; return status;

1 0

Jacek Caban : user32: Use NtUserThunkedMenuItemInfo for GetSubMenu implementation.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 313f75a0afc108db904aae4885da1f3783cd34c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313f75a0afc108db904aae48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 17:58:18 2022 +0200 user32: Use NtUserThunkedMenuItemInfo for GetSubMenu implementation. --- dlls/user32/menu.c | 104 ++--------------------------------------------------- dlls/win32u/menu.c | 41 +++++++++++---------- include/ntuser.h | 1 + 3 files changed, 26 insertions(+), 120 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 043af437356..6fb381ea617 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -115,32 +115,6 @@ static POPUPMENU *MENU_GetMenu(HMENU hMenu) return menu; } -static POPUPMENU *grab_menu_ptr(HMENU hMenu) -{ - POPUPMENU *menu = get_user_handle_ptr( hMenu, NTUSER_OBJ_MENU ); - - if (menu == OBJ_OTHER_PROCESS) - { - WARN("other process menu %p?\n", hMenu); - return NULL; - } - - if (menu) - menu->refcount++; - else - WARN("invalid menu handle=%p\n", hMenu); - return menu; -} - -static void release_menu_ptr(POPUPMENU *menu) -{ - if (menu) - { - menu->refcount--; - release_user_handle_ptr(menu); - } -} - /*********************************************************************** * MENU_CopySysPopup * @@ -232,66 +206,6 @@ HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) } -static POPUPMENU *find_menu_item(HMENU hmenu, UINT id, UINT flags, UINT *pos) -{ - UINT fallback_pos = ~0u, i; - POPUPMENU *menu; - - menu = grab_menu_ptr(hmenu); - if (!menu) - return NULL; - - if (flags & MF_BYPOSITION) - { - if (id >= menu->nItems) - { - release_menu_ptr(menu); - return NULL; - } - - if (pos) *pos = id; - return menu; - } - else - { - MENUITEM *item = menu->items; - for (i = 0; i < menu->nItems; i++, item++) - { - if (item->fType & MF_POPUP) - { - POPUPMENU *submenu = find_menu_item(item->hSubMenu, id, flags, pos); - - if (submenu) - { - release_menu_ptr(menu); - return submenu; - } - else if (item->wID == id) - { - /* fallback to this item if nothing else found */ - fallback_pos = i; - } - } - else if (item->wID == id) - { - if (pos) *pos = i; - return menu; - } - } - } - - if (fallback_pos != ~0u) - *pos = fallback_pos; - else - { - release_menu_ptr(menu); - menu = NULL; - } - - return menu; -} - - /********************************************************************** * MENU_ParseResource * @@ -755,22 +669,10 @@ HMENU WINAPI GetMenu( HWND hWnd ) /********************************************************************** * GetSubMenu (USER32.@) */ -HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) +HMENU WINAPI GetSubMenu( HMENU menu, INT pos ) { - POPUPMENU *menu; - HMENU submenu; - UINT pos; - - if (!(menu = find_menu_item(hMenu, nPos, MF_BYPOSITION, &pos))) - return 0; - - if (menu->items[pos].fType & MF_POPUP) - submenu = menu->items[pos].hSubMenu; - else - submenu = 0; - - release_menu_ptr(menu); - return submenu; + UINT ret = NtUserThunkedMenuItemInfo( menu, pos, MF_BYPOSITION, NtUserGetSubMenu, NULL, NULL ); + return UlongToHandle( ret ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 4ba5b42ec9d..598576437c6 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1151,6 +1151,25 @@ static BOOL check_menu_radio_item( HMENU handle, UINT first, UINT last, UINT che return done; } +/* see GetSubMenu */ +static HMENU get_sub_menu( HMENU handle, INT pos ) +{ + POPUPMENU *menu; + HMENU submenu; + UINT i; + + if (!(menu = find_menu_item( handle, pos, MF_BYPOSITION, &i ))) + return 0; + + if (menu->items[i].fType & MF_POPUP) + submenu = menu->items[i].hSubMenu; + else + submenu = 0; + + release_menu_ptr(menu); + return submenu; +} + /********************************************************************** * NtUserThunkedMenuItemInfo (win32u.@) */ @@ -1178,6 +1197,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT case NtUserGetMenuItemInfoW: return get_menu_item_info( handle, pos, flags, info, FALSE ); + case NtUserGetSubMenu: + return HandleToUlong( get_sub_menu( handle, pos )); + case NtUserInsertMenuItem: if (!info || info->cbSize != sizeof(*info)) { @@ -1314,25 +1336,6 @@ BOOL WINAPI NtUserSetMenuContextHelpId( HMENU handle, DWORD id ) return TRUE; } -/* see GetSubMenu */ -static HMENU get_sub_menu( HMENU handle, INT pos ) -{ - POPUPMENU *menu; - HMENU submenu; - UINT i; - - if (!(menu = find_menu_item( handle, pos, MF_BYPOSITION, &i ))) - return 0; - - if (menu->items[i].fType & MF_POPUP) - submenu = menu->items[i].hSubMenu; - else - submenu = 0; - - release_menu_ptr(menu); - return submenu; -} - /********************************************************************** * NtUserMenuItemFromPoint (win32u.@) */ diff --git a/include/ntuser.h b/include/ntuser.h index e15345bb7d6..bf4e9f4b13a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -229,6 +229,7 @@ enum NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW, NtUserGetMenuState, + NtUserGetSubMenu, }; struct send_message_timeout_params

1 0

Jacek Caban : win32u: Move CheckMenuRadioItem implementation from user32.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: d7dba1ed740708d584093152d571f8f0b1440bdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7dba1ed740708d584093152… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 17:53:02 2022 +0200 win32u: Move CheckMenuRadioItem implementation from user32. --- dlls/user32/menu.c | 49 +++++-------------------------------------------- dlls/win32u/menu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 342ee08a89b..043af437356 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1098,51 +1098,12 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, /********************************************************************** * CheckMenuRadioItem (USER32.@) */ - -BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, - UINT check, UINT flags) +BOOL WINAPI CheckMenuRadioItem( HMENU menu, UINT first, UINT last, UINT check, UINT flags ) { - POPUPMENU *first_menu = NULL, *check_menu; - UINT i, check_pos; - BOOL done = FALSE; - - for (i = first; i <= last; i++) - { - MENUITEM *item; - - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - - if (!first_menu) - first_menu = grab_menu_ptr(check_menu->obj.handle); - - if (first_menu != check_menu) - { - release_menu_ptr(check_menu); - continue; - } - - item = &check_menu->items[check_pos]; - if (item->fType != MFT_SEPARATOR) - { - if (i == check) - { - item->fType |= MFT_RADIOCHECK; - item->fState |= MFS_CHECKED; - done = TRUE; - } - else - { - /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ - item->fState &= ~MFS_CHECKED; - } - } - - release_menu_ptr(check_menu); - } - release_menu_ptr(first_menu); - - return done; + MENUITEMINFOW info; /* abuse to pass last and check */ + info.cch = last; + info.fMask = check; + return NtUserThunkedMenuItemInfo( menu, first, flags, NtUserCheckMenuRadioItem, &info, NULL ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index eab97e58d39..4ba5b42ec9d 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1109,6 +1109,48 @@ static BOOL get_menu_item_info( HMENU handle, UINT id, UINT flags, MENUITEMINFOW return TRUE; } +static BOOL check_menu_radio_item( HMENU handle, UINT first, UINT last, UINT check, UINT flags ) +{ + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; + BOOL done = FALSE; + + for (i = first; i <= last; i++) + { + MENUITEM *item; + + if (!(check_menu = find_menu_item( handle, i, flags, &check_pos ))) continue; + if (!first_menu) first_menu = grab_menu_ptr( check_menu->obj.handle ); + + if (first_menu != check_menu) + { + release_menu_ptr(check_menu); + continue; + } + + item = &check_menu->items[check_pos]; + if (item->fType != MFT_SEPARATOR) + { + if (i == check) + { + item->fType |= MFT_RADIOCHECK; + item->fState |= MFS_CHECKED; + done = TRUE; + } + else + { + /* Windows does not remove MFT_RADIOCHECK */ + item->fState &= ~MFS_CHECKED; + } + } + + release_menu_ptr( check_menu ); + } + + release_menu_ptr( first_menu ); + return done; +} + /********************************************************************** * NtUserThunkedMenuItemInfo (win32u.@) */ @@ -1121,6 +1163,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT switch (method) { + case NtUserCheckMenuRadioItem: + return check_menu_radio_item( handle, pos, info->cch, info->fMask, flags ); + case NtUserGetMenuItemID: if (!(menu = find_menu_item( handle, pos, flags, &i ))) return -1; ret = menu->items[i].fType & MF_POPUP ? -1 : menu->items[i].wID; diff --git a/include/ntuser.h b/include/ntuser.h index 41b328376a9..e15345bb7d6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -224,6 +224,7 @@ enum NtUserSetMenuItemInfo, NtUserInsertMenuItem, /* Wine extensions */ + NtUserCheckMenuRadioItem, NtUserGetMenuItemID, NtUserGetMenuItemInfoA, NtUserGetMenuItemInfoW,

1 0