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

Nikolay Sivov : dwrite/tests: Fix context text.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 76fa97cdddc9eb0860a4056ccd62d41438ee8252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76fa97cdddc9eb0860a4056c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 20:44:32 2022 +0300 dwrite/tests: Fix context text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index efeb3644747..38eb1aeeb7d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8286,7 +8286,7 @@ static void test_GetFontSignature(void) get_expected_fontsig(font, &expected_signature); - winetest_push_context("Font %s\n", wine_dbgstr_w(nameW)); + winetest_push_context("Font %s", wine_dbgstr_w(nameW)); ok(fontsig.fsUsb[0] == expected_signature.fsUsb[0], "fsUsb[0] %#lx, expected %#lx.\n", fontsig.fsUsb[0], expected_signature.fsUsb[0]);

1 0

Jacek Caban : win32u: Move NtUserSetMenu implemenetation from user32.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 9015ae5978a15adb8e2fdd48824d08b3cf3680ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=9015ae5978a15adb8e2fdd48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 20 15:57:42 2022 +0200 win32u: Move NtUserSetMenu implemenetation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 - dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 49 ---------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 8 ++++++ dlls/win32u/menu.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 +++ dlls/win32u/window.c | 2 +- dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 1 + 14 files changed, 86 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9015ae5978a15adb8e2f…

1 0

Rémi Bernon : include: Remove nested namespaces in windows.gaming.input.forcefeedback.idl.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: b1998870df603ab581f26a0bcefaeedd61354523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1998870df603ab581f26a0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 20 19:04:01 2022 +0200 include: Remove nested namespaces in windows.gaming.input.forcefeedback.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.forcefeedback.idl | 138 +++++++++++-------------- 1 file changed, 58 insertions(+), 80 deletions(-) diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl index da153a3285a..39705918b6e 100644 --- a/include/windows.gaming.input.forcefeedback.idl +++ b/include/windows.gaming.input.forcefeedback.idl @@ -26,91 +26,69 @@ import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -namespace Windows { - namespace Gaming { - namespace Input { - namespace ForceFeedback { - typedef enum ForceFeedbackEffectAxes ForceFeedbackEffectAxes; - typedef enum ForceFeedbackLoadEffectResult ForceFeedbackLoadEffectResult; - interface IForceFeedbackEffect; - runtimeclass ForceFeedbackMotor; - } - } - } -} +namespace Windows.Gaming.Input.ForceFeedback { + typedef enum ForceFeedbackEffectAxes ForceFeedbackEffectAxes; + typedef enum ForceFeedbackLoadEffectResult ForceFeedbackLoadEffectResult; + interface IForceFeedbackEffect; + runtimeclass ForceFeedbackMotor; -namespace Windows { - namespace Gaming { - namespace Input { - namespace ForceFeedback { - declare { - interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; - interface Windows.Foundation.IAsyncOperation<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; - interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor*>; - } - } - } + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; + interface Windows.Foundation.IAsyncOperation<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; + interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor *>; } -} -namespace Windows { - namespace Gaming { - namespace Input { - namespace ForceFeedback { - [ - contract(Windows.Foundation.UniversalApiContract, 3.0), - flags - ] - enum ForceFeedbackEffectAxes - { - None = 0x0, - X = 0x1, - Y = 0x2, - Z = 0x4 - }; + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + flags + ] + enum ForceFeedbackEffectAxes + { + None = 0x0, + X = 0x1, + Y = 0x2, + Z = 0x4 + }; - [contract(Windows.Foundation.UniversalApiContract, 3.0)] - enum ForceFeedbackLoadEffectResult - { - Succeeded = 0, - EffectStorageFull = 1, - EffectNotSupported = 2 - }; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + enum ForceFeedbackLoadEffectResult + { + Succeeded = 0, + EffectStorageFull = 1, + EffectNotSupported = 2 + }; - [ - contract(Windows.Foundation.UniversalApiContract, 3.0), - exclusiveto(Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor), - uuid(8d3d417c-a5ea-4516-8026-2b00f74ef6e5) - ] - interface IForceFeedbackMotor : IInspectable - { - [propget] HRESULT AreEffectsPaused([out, retval] boolean* value); - [propget] HRESULT MasterGain([out, retval] DOUBLE* value); - [propput] HRESULT MasterGain([in] DOUBLE value); - [propget] HRESULT IsEnabled([out, retval] boolean* value); - [propget] HRESULT SupportedAxes([out, retval] Windows.Gaming.Input.ForceFeedback.ForceFeedbackEffectAxes* value); - HRESULT LoadEffectAsync([in] Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect* effect, - [out, retval] Windows.Foundation.IAsyncOperation<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>** async_op); - HRESULT PauseAllEffects(); - HRESULT ResumeAllEffects(); - HRESULT StopAllEffects(); - HRESULT TryDisableAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); - HRESULT TryEnableAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); - HRESULT TryResetAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); - HRESULT TryUnloadEffectAsync([in] Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect* effect, - [out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); - } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor), + uuid(8d3d417c-a5ea-4516-8026-2b00f74ef6e5) + ] + interface IForceFeedbackMotor : IInspectable + { + [propget] HRESULT AreEffectsPaused([out, retval] boolean *value); + [propget] HRESULT MasterGain([out, retval] DOUBLE *value); + [propput] HRESULT MasterGain([in] DOUBLE value); + [propget] HRESULT IsEnabled([out, retval] boolean *value); + [propget] HRESULT SupportedAxes([out, retval] Windows.Gaming.Input.ForceFeedback.ForceFeedbackEffectAxes *value); + HRESULT LoadEffectAsync([in] Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect *effect, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult> **async_op); + HRESULT PauseAllEffects(); + HRESULT ResumeAllEffects(); + HRESULT StopAllEffects(); + HRESULT TryDisableAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean> **async_op); + HRESULT TryEnableAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean> **async_op); + HRESULT TryResetAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean> **async_op); + HRESULT TryUnloadEffectAsync([in] Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect *effect, + [out, retval] Windows.Foundation.IAsyncOperation<boolean> **async_op); + } - [ - contract(Windows.Foundation.UniversalApiContract, 3.0), - marshaling_behavior(agile), - threading(both) - ] - runtimeclass ForceFeedbackMotor - { - [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackMotor; - } - } - } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ForceFeedbackMotor + { + [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackMotor; } }

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.RacingWheel runtimeclass declaration.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 8421f1ec8bef034982ce3b953341e4f9fac50695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8421f1ec8bef034982ce3b95… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 20 19:04:00 2022 +0200 include: Add Windows.Gaming.Input.RacingWheel runtimeclass declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.idl | 113 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index d5a652f9532..6f557883167 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -38,9 +38,11 @@ namespace Windows.Gaming.Input { typedef enum GameControllerButtonLabel GameControllerButtonLabel; typedef enum GameControllerSwitchKind GameControllerSwitchKind; typedef enum GameControllerSwitchPosition GameControllerSwitchPosition; + typedef enum RacingWheelButtons RacingWheelButtons; typedef struct ArcadeStickReading ArcadeStickReading; typedef struct GamepadReading GamepadReading; typedef struct GamepadVibration GamepadVibration; + typedef struct RacingWheelReading RacingWheelReading; interface IArcadeStick; interface IArcadeStickStatics; interface IArcadeStickStatics2; @@ -50,16 +52,21 @@ namespace Windows.Gaming.Input { interface IGamepad2; interface IGamepadStatics; interface IGamepadStatics2; + interface IRacingWheel; + interface IRacingWheelStatics; + interface IRacingWheelStatics2; interface IRawGameController; interface IRawGameController2; runtimeclass ArcadeStick; runtimeclass Gamepad; runtimeclass Headset; + runtimeclass RacingWheel; runtimeclass RawGameController; declare { interface Windows.Foundation.EventHandler<Windows.Gaming.Input.ArcadeStick *>; interface Windows.Foundation.EventHandler<Windows.Gaming.Input.Gamepad *>; + interface Windows.Foundation.EventHandler<Windows.Gaming.Input.RacingWheel *>; interface Windows.Foundation.EventHandler<Windows.Gaming.Input.RawGameController *>; interface Windows.Foundation.TypedEventHandler<Windows.Gaming.Input.IGameController *, Windows.Gaming.Input.Headset *>; interface Windows.Foundation.TypedEventHandler<Windows.Gaming.Input.IGameController *, Windows.System.UserChangedEventArgs *>; @@ -70,6 +77,10 @@ namespace Windows.Gaming.Input { interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.Gamepad *>; interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.Gamepad *>; interface Windows.Foundation.Collections.IVector<Windows.Gaming.Input.Gamepad *>; + interface Windows.Foundation.Collections.IIterator<Windows.Gaming.Input.RacingWheel *>; + interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.RacingWheel *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.RacingWheel *>; + interface Windows.Foundation.Collections.IVector<Windows.Gaming.Input.RacingWheel *>; interface Windows.Foundation.Collections.IIterator<Windows.Gaming.Input.RawGameController *>; interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.RawGameController *>; interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.RawGameController *>; @@ -224,6 +235,37 @@ namespace Windows.Gaming.Input { UpLeft = 8 }; + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + flags + ] + enum RacingWheelButtons + { + None = 0x0, + PreviousGear = 0x1, + NextGear = 0x2, + DPadUp = 0x4, + DPadDown = 0x8, + DPadLeft = 0x10, + DPadRight = 0x20, + Button1 = 0x40, + Button2 = 0x80, + Button3 = 0x100, + Button4 = 0x200, + Button5 = 0x400, + Button6 = 0x800, + Button7 = 0x1000, + Button8 = 0x2000, + Button9 = 0x4000, + Button10 = 0x8000, + Button11 = 0x10000, + Button12 = 0x20000, + Button13 = 0x40000, + Button14 = 0x80000, + Button15 = 0x100000, + Button16 = 0x200000, + }; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] struct ArcadeStickReading { @@ -253,6 +295,19 @@ namespace Windows.Gaming.Input { DOUBLE RightTrigger; }; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + struct RacingWheelReading + { + UINT64 Timestamp; + Windows.Gaming.Input.RacingWheelButtons Buttons; + INT32 PatternShifterGear; + DOUBLE Wheel; + DOUBLE Throttle; + DOUBLE Brake; + DOUBLE Clutch; + DOUBLE Handbrake; + }; + [ contract(Windows.Foundation.UniversalApiContract, 3.0), exclusiveto(Windows.Gaming.Input.ArcadeStick), @@ -327,6 +382,50 @@ namespace Windows.Gaming.Input { HRESULT GetCurrentReading([out, retval] Windows.Gaming.Input.GamepadReading *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.RacingWheel), + uuid(f546656f-e106-4c82-a90f-554012904b85) + ] + interface IRacingWheel : IInspectable + requires Windows.Gaming.Input.IGameController + { + [propget] HRESULT HasClutch([out, retval] boolean *value); + [propget] HRESULT HasHandbrake([out, retval] boolean *value); + [propget] HRESULT HasPatternShifter([out, retval] boolean *value); + [propget] HRESULT MaxPatternShifterGear([out, retval] INT32 *value); + [propget] HRESULT MaxWheelAngle([out, retval] DOUBLE *value); + [propget] HRESULT WheelMotor([out, retval] Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor **value); + HRESULT GetButtonLabel([in] Windows.Gaming.Input.RacingWheelButtons button, [out, retval] Windows.Gaming.Input.GameControllerButtonLabel *value); + HRESULT GetCurrentReading([out, retval] Windows.Gaming.Input.RacingWheelReading *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.RacingWheel), + uuid(3ac12cd5-581b-4936-9f94-69f1e6514c7d) + ] + interface IRacingWheelStatics : IInspectable + { + [eventadd] HRESULT RacingWheelAdded([in] Windows.Foundation.EventHandler<RacingWheel *> *value, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT RacingWheelAdded([in] EventRegistrationToken token); + [eventadd] HRESULT RacingWheelRemoved([in] Windows.Foundation.EventHandler<RacingWheel *> *value, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT RacingWheelRemoved([in] EventRegistrationToken token); + [propget] HRESULT RacingWheels([out, retval] Windows.Foundation.Collections.IVectorView<RacingWheel *> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.RacingWheel), + uuid(e666bcaa-edfd-4323-a9f6-3c384048d1ed) + ] + interface IRacingWheelStatics2 : IInspectable + requires Windows.Gaming.Input.IRacingWheelStatics + { + HRESULT FromGameController([in] Windows.Gaming.Input.IGameController *controller, + [out, retval] Windows.Gaming.Input.RacingWheel **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 4.0), exclusiveto(Windows.Gaming.Input.RawGameController), @@ -464,6 +563,20 @@ namespace Windows.Gaming.Input { [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Gaming.Input.IGameControllerBatteryInfo; } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + static(Windows.Gaming.Input.IRacingWheelStatics, Windows.Foundation.UniversalApiContract, 3.0), + static(Windows.Gaming.Input.IRacingWheelStatics2, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass RacingWheel + { + [default] interface Windows.Gaming.Input.IRacingWheel; + interface Windows.Gaming.Input.IGameController; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Gaming.Input.IGameControllerBatteryInfo; + } + [ contract(Windows.Foundation.UniversalApiContract, 4.0), marshaling_behavior(agile),

1 0

Biswapriyo Nath : include: Add IArcadeStick interface in windows.gaming.input.idl.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 38b140f69c1a3214b17097311b9c5cf11f70996e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38b140f69c1a3214b1709731… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Apr 20 19:03:59 2022 +0200 include: Add IArcadeStick interface in windows.gaming.input.idl. 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 | 93 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index 4e9bb6e2465..d5a652f9532 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -33,12 +33,17 @@ import "windows.devices.power.idl"; #endif namespace Windows.Gaming.Input { + typedef enum ArcadeStickButtons ArcadeStickButtons; typedef enum GamepadButtons GamepadButtons; typedef enum GameControllerButtonLabel GameControllerButtonLabel; typedef enum GameControllerSwitchKind GameControllerSwitchKind; typedef enum GameControllerSwitchPosition GameControllerSwitchPosition; + typedef struct ArcadeStickReading ArcadeStickReading; typedef struct GamepadReading GamepadReading; typedef struct GamepadVibration GamepadVibration; + interface IArcadeStick; + interface IArcadeStickStatics; + interface IArcadeStickStatics2; interface IGameController; interface IGameControllerBatteryInfo; interface IGamepad; @@ -47,15 +52,20 @@ namespace Windows.Gaming.Input { interface IGamepadStatics2; interface IRawGameController; interface IRawGameController2; + runtimeclass ArcadeStick; runtimeclass Gamepad; runtimeclass Headset; runtimeclass RawGameController; declare { + interface Windows.Foundation.EventHandler<Windows.Gaming.Input.ArcadeStick *>; interface Windows.Foundation.EventHandler<Windows.Gaming.Input.Gamepad *>; interface Windows.Foundation.EventHandler<Windows.Gaming.Input.RawGameController *>; interface Windows.Foundation.TypedEventHandler<Windows.Gaming.Input.IGameController *, Windows.Gaming.Input.Headset *>; interface Windows.Foundation.TypedEventHandler<Windows.Gaming.Input.IGameController *, Windows.System.UserChangedEventArgs *>; + 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.Gamepad *>; interface Windows.Foundation.Collections.IIterable<Windows.Gaming.Input.Gamepad *>; interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.Gamepad *>; @@ -66,6 +76,27 @@ namespace Windows.Gaming.Input { interface Windows.Foundation.Collections.IVector<Windows.Gaming.Input.RawGameController *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + flags + ] + enum ArcadeStickButtons + { + None = 0x0, + StickUp = 0x1, + StickDown = 0x2, + StickLeft = 0x4, + StickRight = 0x8, + Action1 = 0x10, + Action2 = 0x20, + Action3 = 0x40, + Action4 = 0x80, + Action5 = 0x100, + Action6 = 0x200, + Special1 = 0x400, + Special2 = 0x800 + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), flags @@ -193,6 +224,13 @@ namespace Windows.Gaming.Input { UpLeft = 8 }; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + struct ArcadeStickReading + { + UINT64 Timestamp; + Windows.Gaming.Input.ArcadeStickButtons Buttons; + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct GamepadReading { @@ -215,6 +253,47 @@ namespace Windows.Gaming.Input { DOUBLE RightTrigger; }; + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ArcadeStick), + uuid(b14a539d-befb-4c81-8051-15ecf3b13036) + ] + interface IArcadeStick : IInspectable + requires Windows.Gaming.Input.IGameController + { + HRESULT GetButtonLabel([in] Windows.Gaming.Input.ArcadeStickButtons button, + [out, retval] Windows.Gaming.Input.GameControllerButtonLabel *value); + HRESULT GetCurrentReading([out, retval] Windows.Gaming.Input.ArcadeStickReading *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ArcadeStick), + uuid(5c37b8c8-37b1-4ad8-9458-200f1a30018e) + ] + interface IArcadeStickStatics : IInspectable + { + [eventadd] HRESULT ArcadeStickAdded([in] Windows.Foundation.EventHandler<Windows.Gaming.Input.ArcadeStick *> *value, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT ArcadeStickAdded([in] EventRegistrationToken token); + [eventadd] HRESULT ArcadeStickRemoved([in] Windows.Foundation.EventHandler<Windows.Gaming.Input.ArcadeStick *> *value, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT ArcadeStickRemoved([in] EventRegistrationToken token); + [propget] HRESULT ArcadeSticks([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.ArcadeStick *> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.ArcadeStick), + uuid(52b5d744-bb86-445a-b59c-596f0e2a49df) + ] + interface IArcadeStickStatics2 : IInspectable + requires Windows.Gaming.Input.IArcadeStickStatics + { + HRESULT FromGameController([in] Windows.Gaming.Input.IGameController *controller, + [out, retval] Windows.Gaming.Input.ArcadeStick **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(1baf6522-5f64-42c5-8267-b9fe2215bfbd) @@ -345,6 +424,20 @@ namespace Windows.Gaming.Input { HRESULT TryGetBatteryReport([out, retval] Windows.Devices.Power.BatteryReport **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + static(Windows.Gaming.Input.IArcadeStickStatics, Windows.Foundation.UniversalApiContract, 3.0), + static(Windows.Gaming.Input.IArcadeStickStatics2, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass ArcadeStick + { + [default] interface Windows.Gaming.Input.IArcadeStick; + interface Windows.Gaming.Input.IGameController; + [contract(Windows.Foundation.UniversalApiContract, 4.0)] interface Windows.Gaming.Input.IGameControllerBatteryInfo; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0

Nikolay Sivov : dwrite/tests: Use safe table access helpers for GetFontSignature().
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 77c06dfb29a35704f6ff616941cb026c9e6de967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77c06dfb29a35704f6ff6169… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 20:44:31 2022 +0300 dwrite/tests: Use safe table access helpers for GetFontSignature(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0a02ba1236d..efeb3644747 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -157,7 +157,7 @@ enum TT_HEAD_MACSTYLE TT_HEAD_MACSTYLE_EXTENDED = 1 << 6, }; -typedef struct +struct tt_os2 { USHORT version; SHORT xAvgCharWidth; @@ -202,7 +202,7 @@ typedef struct USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} TT_OS2_V2; +}; enum OS2_FSSELECTION { OS2_FSSELECTION_ITALIC = 1 << 0, @@ -2024,7 +2024,7 @@ static void test_CreateFontFace(void) static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS1 *metrics) { void *os2_context, *head_context, *post_context, *hhea_context; - const TT_OS2_V2 *tt_os2; + const struct tt_os2 *tt_os2; const TT_HEAD *tt_head; const TT_POST *tt_post; const TT_HHEA *tt_hhea; @@ -2684,8 +2684,8 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) void *os2_context, *head_context; IDWriteLocalizedStrings *names; DWRITE_FONT_SIMULATIONS sim; + const struct tt_os2 *tt_os2; IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; DWRITE_FONT_STYLE style; const TT_HEAD *tt_head; LONG weight; @@ -6479,8 +6479,8 @@ static void test_GetGdiCompatibleMetrics(void) static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) { + const struct tt_os2 *tt_os2; IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; void *os2_context; UINT32 size; BOOL exists; @@ -7448,7 +7448,7 @@ static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) { BOOL exists, is_symbol = FALSE; struct dwrite_fonttable cmap; - const TT_OS2_V2 *tt_os2; + const struct tt_os2 *tt_os2; const BYTE *tables; void *os2_context; WORD num_tables; @@ -8188,10 +8188,9 @@ static void test_CreateFontFaceReference(void) static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) { - void *os2_context; + struct dwrite_fonttable os2; IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; - UINT32 size; + WORD version; BOOL exists; HRESULT hr; @@ -8200,25 +8199,29 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&os2.data, &os2.size, &os2.context, &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (tt_os2) { - fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); - fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); - fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); - fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + if (os2.data) + { + fontsig->fsUsb[0] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange1)); + fontsig->fsUsb[1] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange2)); + fontsig->fsUsb[2] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange3)); + fontsig->fsUsb[3] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulUnicodeRange4)); - if (GET_BE_WORD(tt_os2->version) == 0) { + version = table_read_be_word(&os2, NULL, FIELD_OFFSET(struct tt_os2, version)); + if (version == 0) + { fontsig->fsCsb[0] = 0; fontsig->fsCsb[1] = 0; } - else { - fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + else + { + fontsig->fsCsb[0] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulCodePageRange1)); + fontsig->fsCsb[1] = table_read_be_dword(&os2, NULL, FIELD_OFFSET(struct tt_os2, ulCodePageRange2)); } - IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + IDWriteFontFace_ReleaseFontTable(fontface, os2.context); } IDWriteFontFace_Release(fontface);

1 0

Rémi Bernon : kernelbase: Allocate global memory handle table dynamically.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: c0584779f89e2f6372039a2e6db2d59b8025f5e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0584779f89e2f6372039a2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 20 15:03:13 2022 +0200 kernelbase: Allocate global memory handle table dynamically. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52763 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/main.c | 1 + dlls/kernelbase/memory.c | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index f4bd3e99283..6043fe49dd5 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -33,6 +33,7 @@ struct pseudo_console extern WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; +extern void init_global_data(void) DECLSPEC_HIDDEN; extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_console(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 2f2312eccb8..0309ec91589 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -46,6 +46,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { DisableThreadLibraryCalls( hinst ); IsWow64Process( GetCurrentProcess(), &is_wow64 ); + init_global_data(); init_locale( hinst ); init_startup_info( NtCurrentTeb()->Peb->ProcessParameters ); init_console(); diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 21e7c5ef9d9..ea223c3986a 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -608,14 +608,8 @@ struct mem_entry C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); #define MAX_MEM_HANDLES 0x10000 -static struct mem_entry mem_entries[MAX_MEM_HANDLES]; -static struct mem_entry *next_free_mem = mem_entries; - -static struct kernelbase_global_data kernelbase_global_data = -{ - .mem_entries = mem_entries, - .mem_entries_end = mem_entries + MAX_MEM_HANDLES, -}; +static struct mem_entry *next_free_mem; +static struct kernelbase_global_data global_data = {0}; /* align the storage needed for the HLOCAL on an 8-byte boundary thus * LocalAlloc/LocalReAlloc'ing with LMEM_MOVEABLE of memory with @@ -627,7 +621,7 @@ static struct kernelbase_global_data kernelbase_global_data = static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); - struct kernelbase_global_data *data = &kernelbase_global_data; + struct kernelbase_global_data *data = &global_data; if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (!(mem->flags & MEM_FLAG_USED)) return NULL; @@ -646,6 +640,12 @@ static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) return handle; } +void init_global_data(void) +{ + global_data.mem_entries = VirtualAlloc( NULL, MAX_MEM_HANDLES * sizeof(struct mem_entry), MEM_COMMIT, PAGE_READWRITE ); + if (!(next_free_mem = global_data.mem_entries)) ERR( "Failed to allocate kernelbase global handle table\n" ); + global_data.mem_entries_end = global_data.mem_entries + MAX_MEM_HANDLES; +} /*********************************************************************** * KernelBaseGetGlobalData (kernelbase.@) @@ -653,7 +653,7 @@ static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) void *WINAPI KernelBaseGetGlobalData(void) { WARN_(globalmem)( "semi-stub!\n" ); - return &kernelbase_global_data; + return &global_data; } @@ -709,7 +709,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) } RtlLockHeap( heap ); - if ((mem = next_free_mem) < mem_entries || mem >= mem_entries + MAX_MEM_HANDLES) + if ((mem = next_free_mem) < global_data.mem_entries || mem >= global_data.mem_entries_end) mem = NULL; else {

1 0

Zebediah Figura : wined3d: Factor out context_gl_apply_texture_draw_state().
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 68cd60436c621fefeedf1168c1209d3e7352dd34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68cd60436c621fefeedf1168… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 19 20:20:37 2022 -0500 wined3d: Factor out context_gl_apply_texture_draw_state(). 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/wined3d/arb_program_shader.c | 21 +------------------- dlls/wined3d/context_gl.c | 38 +++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 21 +------------------- dlls/wined3d/texture.c | 42 ++++----------------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 46 insertions(+), 78 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b4c395ec355..12606bbd0b0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7908,26 +7908,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl dst_rect = &d; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - GLenum buffer; - - if (dst_location == WINED3D_LOCATION_DRAWABLE) - { - TRACE("Destination texture %p is onscreen.\n", dst_texture); - buffer = wined3d_texture_get_gl_buffer(dst_texture); - } - else - { - TRACE("Destination texture %p is offscreen.\n", dst_texture); - buffer = GL_COLOR_ATTACHMENT0; - } - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, - &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); - wined3d_context_gl_set_draw_buffer(context_gl, buffer); - wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); - context_invalidate_state(context, STATE_FRAMEBUFFER); - } + context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8ac5c28c892..dd4204067bc 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3613,6 +3613,44 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ return rt_mask; } +void context_gl_apply_texture_draw_state(struct wined3d_context_gl *context_gl, + struct wined3d_texture *texture, unsigned int sub_resource_idx, unsigned int location) +{ + const struct wined3d_format *format = texture->resource.format; + GLenum buffer; + + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + return; + + if (format->depth_size || format->stencil_size) + { + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, + NULL, 0, &texture->resource, sub_resource_idx, location); + + buffer = GL_NONE; + } + else + { + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, + &texture->resource, sub_resource_idx, NULL, 0, location); + + if (location == WINED3D_LOCATION_DRAWABLE) + { + TRACE("Texture %p is onscreen.\n", texture); + buffer = wined3d_texture_get_gl_buffer(texture); + } + else + { + TRACE("Texture %p is offscreen.\n", texture); + buffer = GL_COLOR_ATTACHMENT0; + } + } + + wined3d_context_gl_set_draw_buffer(context_gl, buffer); + wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); + context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); +} + /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f79fa1571e6..82c022e4ba7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13205,26 +13205,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli dst_rect = &d; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - GLenum buffer; - - if (dst_location == WINED3D_LOCATION_DRAWABLE) - { - TRACE("Destination texture %p is onscreen.\n", dst_texture); - buffer = wined3d_texture_get_gl_buffer(dst_texture); - } - else - { - TRACE("Destination texture %p is offscreen.\n", dst_texture); - buffer = GL_COLOR_ATTACHMENT0; - } - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, - &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); - wined3d_context_gl_set_draw_buffer(context_gl, buffer); - wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); - context_invalidate_state(context, STATE_FRAMEBUFFER); - } + context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c495de171d5..eaa7cdf3ea5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -523,25 +523,14 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont checkGLcall("glReadBuffer()"); wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); + context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location); + if (dst_location == WINED3D_LOCATION_DRAWABLE) { - TRACE("Destination texture %p is onscreen.\n", dst_texture); - buffer = wined3d_texture_get_gl_buffer(dst_texture); d = *dst_rect; wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &d); dst_rect = &d; } - else - { - TRACE("Destination texture %p is offscreen.\n", dst_texture); - buffer = GL_COLOR_ATTACHMENT0; - } - - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, - &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); - wined3d_context_gl_set_draw_buffer(context_gl, buffer); - wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); - context_invalidate_state(context, STATE_FRAMEBUFFER); gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); context_invalidate_state(context, STATE_BLEND); @@ -633,11 +622,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct &src_texture->resource, src_sub_resource_idx, src_location); wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, NULL, 0, - &dst_texture->resource, dst_sub_resource_idx, dst_location); - wined3d_context_gl_set_draw_buffer(context_gl, GL_NONE); - wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); - context_invalidate_state(context, STATE_FRAMEBUFFER); + context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location); if (gl_mask & GL_DEPTH_BUFFER_BIT) { @@ -6053,26 +6038,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit dst_rect = &r; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - GLenum buffer; - - if (dst_location == WINED3D_LOCATION_DRAWABLE) - { - TRACE("Destination texture %p is onscreen.\n", dst_texture); - buffer = wined3d_texture_get_gl_buffer(dst_texture); - } - else - { - TRACE("Destination texture %p is offscreen.\n", dst_texture); - buffer = GL_COLOR_ATTACHMENT0; - } - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, - dst_resource, dst_sub_resource_idx, NULL, 0, dst_location); - wined3d_context_gl_set_draw_buffer(context_gl, buffer); - wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); - context_invalidate_state(context, STATE_FRAMEBUFFER); - } + context_gl_apply_texture_draw_state(context_gl, dst_texture, dst_sub_resource_idx, dst_location); gl_info->gl_ops.gl.p_glEnable(src_texture_gl->target); checkGLcall("glEnable(target)"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 54bccb3db5e..b9ca990932d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2824,6 +2824,8 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSP HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; +void context_gl_apply_texture_draw_state(struct wined3d_context_gl *context_gl, + struct wined3d_texture *texture, unsigned int sub_resource_idx, unsigned int location); void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN;

1 0

Jacek Caban : win32u: Move NtUserGetMenuItemRect implementation from user32.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 19a2af27673271a464172fb8f115ca4f811325e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a2af27673271a464172fb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 20 15:57:02 2022 +0200 win32u: Move NtUserGetMenuItemRect implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 49 ++----------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 8 files changed, 57 insertions(+), 49 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8df665c9132..c62e0818e60 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4262,13 +4262,13 @@ BOOL WINAPI GetMenuBarInfo( HWND hwnd, LONG idObject, LONG idItem, PMENUBARINFO } else if (idItem == 0) { - GetMenuItemRect(hwnd, hmenu, 0, &pmbi->rcBar); + NtUserGetMenuItemRect( hwnd, hmenu, 0, &pmbi->rcBar ); pmbi->rcBar.right = pmbi->rcBar.left + menu->Width; pmbi->rcBar.bottom = pmbi->rcBar.top + menu->Height; } else { - GetMenuItemRect(hwnd, hmenu, idItem - 1, &pmbi->rcBar); + NtUserGetMenuItemRect( hwnd, hmenu, idItem - 1, &pmbi->rcBar ); } pmbi->hMenu = hmenu; @@ -5120,51 +5120,6 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, } -/********************************************************************** - * GetMenuItemRect (USER32.@) - * - * ATTENTION: Here, the returned values in rect are the screen - * coordinates of the item just like if the menu was - * always on the upper left side of the application. - * - */ -BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) -{ - POPUPMENU *menu; - UINT pos; - RECT window_rect; - - TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); - - if (!rect) - return FALSE; - - if (!(menu = find_menu_item(hMenu, uItem, MF_BYPOSITION, &pos))) - return FALSE; - - if (!hwnd) hwnd = menu->hWnd; - if (!hwnd) - { - release_menu_ptr(menu); - return FALSE; - } - - *rect = menu->items[pos].rect; - OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); - - /* Popup menu item draws in the client area */ - if (menu->wFlags & MF_POPUP) MapWindowPoints(hwnd, 0, (POINT *)rect, 2); - else - { - /* Sysmenu draws in the non-client area */ - GetWindowRect(hwnd, &window_rect); - OffsetRect(rect, window_rect.left, window_rect.top); - } - - release_menu_ptr(menu); - return TRUE; -} - /********************************************************************** * SetMenuInfo (USER32.@) * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8af07c49e98..6c54957795b 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -338,7 +338,7 @@ @ stdcall GetMenuItemID(long long) @ stdcall GetMenuItemInfoA(long long long ptr) @ stdcall GetMenuItemInfoW(long long long ptr) -@ stdcall GetMenuItemRect(long long long ptr) +@ stdcall GetMenuItemRect(long long long ptr) NtUserGetMenuItemRect @ stdcall GetMenuState(long long long) @ stdcall GetMenuStringA(long long ptr long long) @ stdcall GetMenuStringW(long long ptr long long) diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index fcb6b83b2e8..ef539d1ffdd 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -348,6 +348,46 @@ BOOL draw_menu_bar( HWND hwnd ) SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } +/********************************************************************** + * NtUserGetMenuItemRect (win32u.@) + */ +BOOL WINAPI NtUserGetMenuItemRect( HWND hwnd, HMENU handle, UINT item, RECT *rect ) +{ + POPUPMENU *menu; + UINT pos; + RECT window_rect; + + TRACE( "(%p,%p,%d,%p)\n", hwnd, handle, item, rect ); + + if (!rect) + return FALSE; + + if (!(menu = find_menu_item( handle, item, MF_BYPOSITION, &pos ))) + return FALSE; + + if (!hwnd) hwnd = menu->hWnd; + if (!hwnd) + { + release_menu_ptr( menu ); + return FALSE; + } + + *rect = menu->items[pos].rect; + OffsetRect( rect, menu->items_rect.left, menu->items_rect.top ); + + /* Popup menu item draws in the client area */ + if (menu->wFlags & MF_POPUP) map_window_points( hwnd, 0, (POINT *)rect, 2, get_thread_dpi() ); + else + { + /* Sysmenu draws in the non-client area */ + get_window_rect( hwnd, &window_rect, get_thread_dpi() ); + OffsetRect( rect, window_rect.left, window_rect.top ); + } + + release_menu_ptr(menu); + return TRUE; +} + /********************************************************************** * NtUserSetMenuContextHelpId (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 18204a34379..3ac03cef0d9 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -136,6 +136,7 @@ static void * const syscalls[] = NtUserGetKeyboardLayoutName, NtUserGetKeyboardState, NtUserGetLayeredWindowAttributes, + NtUserGetMenuItemRect, NtUserGetMouseMovePointsEx, NtUserGetObjectInformation, NtUserGetOpenClipboardWindow, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 4acb1dae455..44094a55b13 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -954,7 +954,7 @@ @ stub NtUserGetListBoxInfo @ stub NtUserGetMenuBarInfo @ stub NtUserGetMenuIndex -@ stub NtUserGetMenuItemRect +@ stdcall -syscall NtUserGetMenuItemRect(long long long ptr) @ stdcall NtUserGetMessage(ptr long long long) @ stdcall -syscall NtUserGetMouseMovePointsEx(long ptr ptr long long) @ stdcall -syscall NtUserGetObjectInformation(long long long long ptr) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index fe1b2a2e2e1..52df3a4d67c 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -123,6 +123,7 @@ SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ + SYSCALL_ENTRY( NtUserGetMenuItemRect ) \ SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 08c65e8a3df..f964b2d1b11 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -642,6 +642,16 @@ NTSTATUS WINAPI wow64_NtUserCheckMenuItem( UINT *args ) return NtUserCheckMenuItem( handle, id, flags ); } +NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + HMENU handle = get_handle( &args ); + UINT item = get_ulong( &args ); + RECT *rect = get_ptr( &args ); + + return NtUserGetMenuItemRect( hwnd, handle, item, rect ); +} + NTSTATUS WINAPI wow64_NtUserSetMenuContextHelpId( UINT *args ) { HMENU menu = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 7084dec19eb..47b6900619e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -492,6 +492,7 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ); BOOL WINAPI NtUserGetKeyboardLayoutName( WCHAR *name ); BOOL WINAPI NtUserGetKeyboardState( BYTE *state ); BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *alpha, DWORD *flags ); +BOOL WINAPI NtUserGetMenuItemRect( HWND hwnd, HMENU menu, UINT item, RECT *rect ); BOOL WINAPI NtUserGetMessage( MSG *msg, HWND hwnd, UINT first, UINT last ); int WINAPI NtUserGetMouseMovePointsEx( UINT size, MOUSEMOVEPOINT *ptin, MOUSEMOVEPOINT *ptout, int count, DWORD resolution );

1 0

Jacek Caban : win32u: Move GetMenuInfo implementation from user32.
by Alexandre Julliard April 20, 2022

April 20, 2022

Module: wine Branch: master Commit: 782220626fa7148d0d7421a5f7e632083a4b89f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=782220626fa7148d0d7421a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 20 15:58:00 2022 +0200 win32u: Move GetMenuInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 35 +++-------------------------------- dlls/win32u/menu.c | 23 +++++++++++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 7 +++++++ 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 2585f92f97d..b1f038938f6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5124,40 +5124,11 @@ BOOL WINAPI SetMenuInfo (HMENU hMenu, LPCMENUINFO lpmi) } /********************************************************************** - * GetMenuInfo (USER32.@) - * - * NOTES - * win98/NT5.0 - * + * GetMenuInfo (USER32.@) */ -BOOL WINAPI GetMenuInfo (HMENU hMenu, LPMENUINFO lpmi) +BOOL WINAPI GetMenuInfo( HMENU menu, MENUINFO *info ) { - POPUPMENU *menu; - - TRACE("(%p %p)\n", hMenu, lpmi); - - if (lpmi && (lpmi->cbSize == sizeof(MENUINFO)) && (menu = grab_menu_ptr(hMenu))) - { - if (lpmi->fMask & MIM_BACKGROUND) - lpmi->hbrBack = menu->hbrBack; - - if (lpmi->fMask & MIM_HELPID) - lpmi->dwContextHelpID = menu->dwContextHelpID; - - if (lpmi->fMask & MIM_MAXHEIGHT) - lpmi->cyMax = menu->cyMax; - - if (lpmi->fMask & MIM_MENUDATA) - lpmi->dwMenuData = menu->dwMenuData; - - if (lpmi->fMask & MIM_STYLE) - lpmi->dwStyle = menu->dwStyle; - - release_menu_ptr(menu); - return TRUE; - } - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; + return NtUserGetMenuInfo( menu, info ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index afe4c148775..fd4e1f74039 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -451,6 +451,29 @@ BOOL WINAPI NtUserGetMenuItemRect( HWND hwnd, HMENU handle, UINT item, RECT *rec return TRUE; } +/* see GetMenuInfo */ +BOOL get_menu_info( HMENU handle, MENUINFO *info ) +{ + POPUPMENU *menu; + + TRACE( "(%p %p)\n", handle, info ); + + if (!info || info->cbSize != sizeof(MENUINFO) || !(menu = grab_menu_ptr( handle ))) + { + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (info->fMask & MIM_BACKGROUND) info->hbrBack = menu->hbrBack; + if (info->fMask & MIM_HELPID) info->dwContextHelpID = menu->dwContextHelpID; + if (info->fMask & MIM_MAXHEIGHT) info->cyMax = menu->cyMax; + if (info->fMask & MIM_MENUDATA) info->dwMenuData = menu->dwMenuData; + if (info->fMask & MIM_STYLE) info->dwStyle = menu->dwStyle; + + release_menu_ptr(menu); + return TRUE; +} + /********************************************************************** * NtUserSetMenuContextHelpId (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 32da544c157..49f3f716b2d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4762,6 +4762,9 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code { switch(code) { + case NtUserCallTwoParam_GetMenuInfo: + return get_menu_info( UlongToHandle(arg1), (MENUINFO *)arg2 ); + case NtUserCallTwoParam_GetMonitorInfo: return get_monitor_info( UlongToHandle(arg1), (MONITORINFO *)arg2 ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index f3a751f1836..2299330be0d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -359,6 +359,7 @@ extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN; extern BOOL draw_menu_bar( HWND hwnd ) DECLSPEC_HIDDEN; extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 8420784a5a0..bab4a0dc78c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -745,6 +745,7 @@ static inline UINT NtUserRealizePalette( HDC hdc ) /* NtUserCallTwoParam codes, not compatible with Windows */ enum { + NtUserCallTwoParam_GetMenuInfo, NtUserCallTwoParam_GetMonitorInfo, NtUserCallTwoParam_GetSystemMetricsForDpi, NtUserCallTwoParam_MonitorFromRect, @@ -756,6 +757,12 @@ enum NtUserGetHandlePtr, }; +static inline BOOL NtUserGetMenuInfo( HMENU menu, MENUINFO *info ) +{ + return NtUserCallTwoParam( HandleToUlong(menu), (ULONG_PTR)info, + NtUserCallTwoParam_GetMenuInfo ); +} + static inline BOOL NtUserGetMonitorInfo( HMONITOR monitor, MONITORINFO *info ) { return NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info,

1 0