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

Francois Gouget : testbot/web: Simplify generating the Submit page header.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: tools Branch: master Commit: 2752cda32ea515e5a7cac60ef342961394b25170 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2752cda32ea515e5a7cac60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 22 00:03:21 2022 +0200 testbot/web: Simplify generating the Submit page header. This takes advantage of the fact that all of the @Headers parts are joined with linebreaks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9292d38..ca225b6 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -620,14 +620,13 @@ sub GetHeaderText($) } if ($self->{Page} == 2 or $self->{Page} == 4) { - my $HeaderText = "Select the VMs on which you want to run your test."; + push @Headers, "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); $VMs->AddFilter("Status", ["offline", "maintenance"]); if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; + push @Headers, "NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; } - push @Headers, $HeaderText; } if (($self->{Page} == 3 or $self->{Page} == 0) and $self->{Impacts}) { @@ -652,7 +651,7 @@ sub GetHeaderText($) } push @TestExecutables, "$ModuleName: ". join(" ", @TestUnits) if (@TestUnits); } - push @Headers, join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); + push @Headers, "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables; } return join("<br>\n", @Headers);

1 0

Biswapriyo Nath : include: Add Windows.Gaming.Input.FlightStick runtimeclass declaration.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: 14b387463ef14afb038c16f7ac34b61ea1391daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=14b387463ef14afb038c16f7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Apr 21 19:53:30 2022 +0200 include: Add Windows.Gaming.Input.FlightStick runtimeclass declaration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.idl | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index 6f557883167..fdae3aa70b1 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -34,18 +34,22 @@ import "windows.devices.power.idl"; namespace Windows.Gaming.Input { typedef enum ArcadeStickButtons ArcadeStickButtons; + typedef enum FlightStickButtons FlightStickButtons; typedef enum GamepadButtons GamepadButtons; typedef enum GameControllerButtonLabel GameControllerButtonLabel; typedef enum GameControllerSwitchKind GameControllerSwitchKind; typedef enum GameControllerSwitchPosition GameControllerSwitchPosition; typedef enum RacingWheelButtons RacingWheelButtons; typedef struct ArcadeStickReading ArcadeStickReading; + typedef struct FlightStickReading FlightStickReading; typedef struct GamepadReading GamepadReading; typedef struct GamepadVibration GamepadVibration; typedef struct RacingWheelReading RacingWheelReading; interface IArcadeStick; interface IArcadeStickStatics; interface IArcadeStickStatics2; + interface IFlightStick; + interface IFlightStickStatics; interface IGameController; interface IGameControllerBatteryInfo; interface IGamepad; @@ -58,6 +62,7 @@ namespace Windows.Gaming.Input { interface IRawGameController; interface IRawGameController2; runtimeclass ArcadeStick; + runtimeclass FlightStick; runtimeclass Gamepad; runtimeclass Headset; runtimeclass RacingWheel; @@ -65,6 +70,7 @@ namespace Windows.Gaming.Input { declare { interface Windows.Foundation.EventHandler<Windows.Gaming.Input.ArcadeStick *>; + interface Windows.Foundation.EventHandler<Windows.Gaming.Input.FlightStick *>; interface Windows.Foundation.EventHandler<Windows.Gaming.Input.Gamepad *>; interface Windows.Foundation.EventHandler<Windows.Gaming.Input.RacingWheel *>; interface Windows.Foundation.EventHandler<Windows.Gaming.Input.RawGameController *>; @@ -73,6 +79,9 @@ namespace Windows.Gaming.Input { interface Windows.Foundation.Collections.IIterator<Windows.Gaming.Input.ArcadeStick *>; interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.ArcadeStick *>; interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.ArcadeStick *>; + interface Windows.Foundation.Collections.IIterator<Windows.Gaming.Input.FlightStick *>; + interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.FlightStick *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.FlightStick *>; interface Windows.Foundation.Collections.IIterator<Windows.Gaming.Input.Gamepad *>; interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.Gamepad *>; interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.Gamepad *>; @@ -108,6 +117,17 @@ namespace Windows.Gaming.Input { Special2 = 0x800 }; + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + flags + ] + enum FlightStickButtons + { + None = 0x0, + FirePrimary = 0x1, + FireSecondary = 0x2, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), flags @@ -273,6 +293,18 @@ namespace Windows.Gaming.Input { Windows.Gaming.Input.ArcadeStickButtons Buttons; }; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] + struct FlightStickReading + { + UINT64 Timestamp; + Windows.Gaming.Input.FlightStickButtons Buttons; + Windows.Gaming.Input.GameControllerSwitchPosition HatSwitch; + DOUBLE Roll; + DOUBLE Pitch; + DOUBLE Yaw; + DOUBLE Throttle; + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct GamepadReading { @@ -349,6 +381,38 @@ namespace Windows.Gaming.Input { [out, retval] Windows.Gaming.Input.ArcadeStick **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.FlightStick), + uuid(b4a2c01c-b83b-4459-a1a9-97b03c33da7c) + ] + interface IFlightStick : IInspectable + requires Windows.Gaming.Input.IGameController + { + [propget] HRESULT HatSwitchKind([out, retval] Windows.Gaming.Input.GameControllerSwitchKind *value); + HRESULT GetButtonLabel([in] Windows.Gaming.Input.FlightStickButtons button, + [out, retval] Windows.Gaming.Input.GameControllerButtonLabel *value); + HRESULT GetCurrentReading([out, retval] Windows.Gaming.Input.FlightStickReading *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.FlightStick), + uuid(5514924a-fecc-435e-83dc-5cec8a18a520) + ] + interface IFlightStickStatics : IInspectable + { + [eventadd] HRESULT FlightStickAdded([in] Windows.Foundation.EventHandler<Windows.Gaming.Input.FlightStick *> *value, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT FlightStickAdded([in] EventRegistrationToken token); + [eventadd] HRESULT FlightStickRemoved([in] Windows.Foundation.EventHandler<Windows.Gaming.Input.FlightStick *> *value, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT FlightStickRemoved([in] EventRegistrationToken token); + [propget] HRESULT FlightSticks([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.FlightStick *> **value); + HRESULT FromGameController([in] Windows.Gaming.Input.IGameController *controller, + [out, retval] Windows.Gaming.Input.FlightStick **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(1baf6522-5f64-42c5-8267-b9fe2215bfbd) @@ -537,6 +601,19 @@ namespace Windows.Gaming.Input { [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Gaming.Input.IGameControllerBatteryInfo; } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile), + static(Windows.Gaming.Input.IFlightStickStatics, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass FlightStick + { + [default] interface Windows.Gaming.Input.IFlightStick; + interface Windows.Gaming.Input.IGameController; + interface Windows.Gaming.Input.IGameControllerBatteryInfo; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0

Rémi Bernon : dinput/tests: Add tests for joystick with many axes and units.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: 43eb6707bcf4287336fe7ef14fa29b8b82a7f7c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43eb6707bcf4287336fe7ef1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 21 19:50:17 2022 +0200 dinput/tests: Add tests for joystick with many axes and units. Checking that only a few axes get really mapped to the slider axes, and that we shouldn't use HID_USAGE_SIMULATION_RUDDER if there's already an Rz mapped axis. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 572 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 572 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43eb6707bcf4287336fe…

1 0

Mohamad Al-Jaf : include: Add CMSMPEGDecoderMFT coclass.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: 234b74223cf8c99db259d25feb3be9b0b6a2a1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=234b74223cf8c99db259d25f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Apr 21 03:55:33 2022 -0400 include: Add CMSMPEGDecoderMFT coclass. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index dcf28ab682c..0846b08382c 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -44,6 +44,11 @@ coclass CResamplerMediaObject {} ] coclass CMSH264DecoderMFT {} +[ + uuid(2d709e52-123f-49b5-9cbc-9af5cde28fb9) +] +coclass CMSMPEGDecoderMFT {} + [ uuid(2eeb4adf-4578-4d10-bca7-bb955f56320a) ]

1 0

Rémi Bernon : dinput/tests: Queue IRP when the expect ret_status is STATUS_PENDING.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: c6966b52948190fee25124aa3387e1ea4a0bb675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6966b52948190fee25124aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 21 19:50:19 2022 +0200 dinput/tests: Queue IRP when the expect ret_status is STATUS_PENDING. And complete it on the next IOCTL_WINETEST_HID_WAIT_EXPECT ioctl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver_bus.c | 71 ++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index 6d7f86d0691..45a984b6c36 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -95,7 +95,6 @@ static void expect_queue_cleanup( struct expect_queue *queue ) if (irp) { - irp->IoStatus.Information = 0; irp->IoStatus.Status = STATUS_DELETE_PENDING; IoCompleteRequest( irp, IO_NO_INCREMENT ); } @@ -162,29 +161,64 @@ static void WINAPI wait_cancel_routine( DEVICE_OBJECT *device, IRP *irp ) IoCompleteRequest( irp, IO_NO_INCREMENT ); } -static NTSTATUS expect_queue_wait( struct expect_queue *queue, IRP *irp ) +static NTSTATUS expect_queue_add_pending_locked( struct expect_queue *queue, IRP *irp ) +{ + if (queue->pending_wait) return STATUS_INVALID_PARAMETER; + + IoSetCancelRoutine( irp, wait_cancel_routine ); + if (irp->Cancel && !IoSetCancelRoutine( irp, NULL )) + return STATUS_CANCELLED; + + irp->Tail.Overlay.DriverContext[0] = queue; + IoMarkIrpPending( irp ); + queue->pending_wait = irp; + + return STATUS_PENDING; +} + +static NTSTATUS expect_queue_add_pending( struct expect_queue *queue, IRP *irp ) { NTSTATUS status; KIRQL irql; KeAcquireSpinLock( &queue->lock, &irql ); - if (queue->pos == queue->end) - status = STATUS_SUCCESS; - else + status = expect_queue_add_pending_locked( queue, irp ); + KeReleaseSpinLock( &queue->lock, irql ); + + return status; +} + +static void expect_queue_clear_pending( struct expect_queue *queue ) +{ + KIRQL irql; + IRP *irp; + + KeAcquireSpinLock( &queue->lock, &irql ); + if ((irp = queue->pending_wait)) { - IoSetCancelRoutine( irp, wait_cancel_routine ); - if (irp->Cancel && !IoSetCancelRoutine( irp, NULL )) - status = STATUS_CANCELLED; - else - { - irp->Tail.Overlay.DriverContext[0] = queue; - IoMarkIrpPending( irp ); - queue->pending_wait = irp; - status = STATUS_PENDING; - } + queue->pending_wait = NULL; + if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; } KeReleaseSpinLock( &queue->lock, irql ); + if (irp) + { + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } +} + +static NTSTATUS expect_queue_wait( struct expect_queue *queue, IRP *irp ) +{ + NTSTATUS status; + KIRQL irql; + + irp->IoStatus.Information = 0; + KeAcquireSpinLock( &queue->lock, &irql ); + if (queue->pos == queue->end) status = STATUS_SUCCESS; + else status = expect_queue_add_pending_locked( queue, irp ); + KeReleaseSpinLock( &queue->lock, irql ); + return status; } @@ -233,7 +267,6 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ if (irp) { - irp->IoStatus.Information = 0; irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); } @@ -1055,6 +1088,7 @@ static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; status = expect.ret_status; + if (status == STATUS_PENDING) status = expect_queue_add_pending( &impl->expect_queue, irp ); break; } @@ -1078,6 +1112,7 @@ static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; memcpy( packet->reportBuffer, expect.report_buf, irp->IoStatus.Information ); status = expect.ret_status; + if (status == STATUS_PENDING) status = expect_queue_add_pending( &impl->expect_queue, irp ); break; } @@ -1101,6 +1136,7 @@ static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; status = expect.ret_status; + if (status == STATUS_PENDING) status = expect_queue_add_pending( &impl->expect_queue, irp ); break; } @@ -1124,6 +1160,7 @@ static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; memcpy( packet->reportBuffer, expect.report_buf, irp->IoStatus.Information ); status = expect.ret_status; + if (status == STATUS_PENDING) status = expect_queue_add_pending( &impl->expect_queue, irp ); break; } @@ -1147,6 +1184,7 @@ static NTSTATUS WINAPI pdo_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) irp->IoStatus.Information = expect.ret_length ? expect.ret_length : expect.report_len; status = expect.ret_status; + if (status == STATUS_PENDING) status = expect_queue_add_pending( &impl->expect_queue, irp ); break; } @@ -1215,6 +1253,7 @@ static NTSTATUS WINAPI pdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_SUCCESS; break; case IOCTL_WINETEST_HID_WAIT_EXPECT: + expect_queue_clear_pending( &impl->expect_queue ); status = expect_queue_wait( &impl->expect_queue, irp ); break; case IOCTL_WINETEST_HID_SEND_INPUT:

1 0

Rémi Bernon : dinput/tests: Add more IForceFeedbackMotor and IAsyncOperation_boolean tests.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: d141e354568c419b0914808d0d90b06e0c5e2297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d141e354568c419b0914808d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 21 19:50:20 2022 +0200 dinput/tests: Add more IForceFeedbackMotor and IAsyncOperation_boolean tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 458 +++++++++++++++++++++++++++++++++++++ 1 file changed, 458 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d141e354568c419b0914…

1 0

Zebediah Figura : ddraw/tests: Use winetest_push_context() in test_viewport().
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: edebe24a071f1670fd7c0cfa3eb5d8e797b6b3af URL: https://source.winehq.org/git/wine.git/?a=commit;h=edebe24a071f1670fd7c0cfa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 20:04:28 2022 -0500 ddraw/tests: Use winetest_push_context() in test_viewport(). 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> --- dlls/ddraw/tests/ddraw1.c | 28 ++++++++++---------- dlls/ddraw/tests/ddraw2.c | 57 ++++++++++++++++++++++------------------- dlls/ddraw/tests/ddraw4.c | 56 ++++++++++++++++++++++------------------ dlls/ddraw/tests/ddraw7.c | 65 ++++++++++++++++++++++++++++------------------- 4 files changed, 116 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=edebe24a071f1670fd7c…

1 0

Rémi Bernon : dinput/tests: Add some IRawGameController_get_ForceFeedbackMotors tests.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: 19f0f3cb65c681badfbf8c0be46f4a863ddfbba7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f0f3cb65c681badfbf8c0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 21 19:50:18 2022 +0200 dinput/tests: Add some IRawGameController_get_ForceFeedbackMotors tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput_test.h | 4 +- dlls/dinput/tests/force_feedback.c | 737 +++++++++++++++++++++++++++++++++++++ dlls/dinput/tests/hid.c | 9 +- 3 files changed, 747 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19f0f3cb65c681badfbf…

1 0

Zebediah Figura : win32u: Remove the "proc" parameter to NtUserSetSystemTimer().
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: 5e4dedff8e062fb21e0719ccbbbb5d5ca53cec75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4dedff8e062fb21e0719cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:31 2022 -0500 win32u: Remove the "proc" parameter to NtUserSetSystemTimer(). Testing on 32-bit Windows 10 suggests that the function only has three parameters. The test fixed in this patch (which still succeeds on e.g. Windows 2003) suggests that the final parameter to SetSystemTimer() is not a callback, either. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/user32/caret.c | 4 ++-- dlls/user32/input.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/message.c | 11 +++++++++++ dlls/user32/scroll.c | 8 ++++---- dlls/user32/tests/msg.c | 3 +-- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 8 +++----- dlls/win32u/win32u.spec | 2 +- dlls/wow64win/user.c | 3 +-- include/ntuser.h | 2 +- include/winuser.h | 2 +- 13 files changed, 29 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e4dedff8e062fb21e07…

1 0

Zebediah Figura : user32: Do not call the lparam for WM_SYSTIMER messages.
by Alexandre Julliard April 21, 2022

April 21, 2022

Module: wine Branch: master Commit: ea4353858d96235f362c5f94c9c5e0e83ad04edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4353858d96235f362c5f94… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:33 2022 -0500 user32: Do not call the lparam for WM_SYSTIMER messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 376ff2193e3..990323dde65 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -861,22 +861,19 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) LRESULT retval; /* Process timer messages */ - if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) + if (msg->lParam && msg->message == WM_TIMER) { - if (msg->lParam) + __TRY { - __TRY - { - retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, - msg->message, msg->wParam, GetTickCount() ); - } - __EXCEPT_ALL - { - retval = 0; - } - __ENDTRY - return retval; + retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, + msg->message, msg->wParam, GetTickCount() ); + } + __EXCEPT_ALL + { + retval = 0; } + __ENDTRY + return retval; } return NtUserDispatchMessageA( msg ); }

1 0