wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Francois Gouget : testbot/web: Tweak the Login and ResetPassword GetInputType() formatting.
by Alexandre Julliard 22 Apr '22

22 Apr '22

Module: tools Branch: master Commit: 3c23a41ff24936fbe32eac56cac5b954615f4e42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c23a41ff24936fbe32eac5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 22 00:02:56 2022 +0200 testbot/web: Tweak the Login and ResetPassword GetInputType() formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Login.pl | 9 +++------ testbot/web/ResetPassword.pl | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 837617d..7b9a6ff 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -65,12 +65,9 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetName() eq "Password") - { - return "password"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); + my $PropertyName = $PropertyDescriptor->GetName(); + return $PropertyName eq "Password" ? "password" : + $self->SUPER::GetInputType($PropertyDescriptor); } sub GenerateFields($) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 4f672ea..081e27f 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -63,12 +63,9 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if (substr($PropertyDescriptor->GetName(), 0, 8) eq "Password") - { - return "password"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); + my $PropertyName = substr($PropertyDescriptor->GetName(), 0, 8); + return $PropertyName eq "Password" ? "password" : + $self->SUPER::GetInputType($PropertyDescriptor); } sub GetActions($)

1 0

Rémi Bernon : dinput/tests: Add more IForceFeedbackMotor and IAsyncOperation_boolean tests.
by Alexandre Julliard 21 Apr '22

21 Apr '22

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

Rémi Bernon : dinput/tests: Queue IRP when the expect ret_status is STATUS_PENDING.
by Alexandre Julliard 21 Apr '22

21 Apr '22

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 some IRawGameController_get_ForceFeedbackMotors tests.
by Alexandre Julliard 21 Apr '22

21 Apr '22

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

Rémi Bernon : dinput/tests: Add tests for joystick with many axes and units.
by Alexandre Julliard 21 Apr '22

21 Apr '22

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

Biswapriyo Nath : include: Add Windows.Gaming.Input.FlightStick runtimeclass declaration.
by Alexandre Julliard 21 Apr '22

21 Apr '22

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

Mohamad Al-Jaf : include: Add CMSMPEGDecoderMFT coclass.
by Alexandre Julliard 21 Apr '22

21 Apr '22

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

Zebediah Figura : ddraw/tests: Use winetest_push_context() in test_viewport().
by Alexandre Julliard 21 Apr '22

21 Apr '22

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

Nikolay Sivov : ddraw: Improve tracing format for unsigned fields.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 738c1c01b6b63d472c517c074014225b72084285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=738c1c01b6b63d472c517c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 20:44:49 2022 +0300 ddraw: Improve tracing format for unsigned fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/executebuffer.c | 16 ++++++++-------- dlls/ddraw/material.c | 2 +- dlls/ddraw/utils.c | 12 ++++++------ dlls/ddraw/viewport.c | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 10086a1bae7..f6770e59fb6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2496,7 +2496,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, callback_sd.u1.lPitch = (callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount / 8) * mode.width; callback_sd.u1.lPitch = (callback_sd.u1.lPitch + 3) & ~3; - TRACE("Enumerating %ldx%ldx%ld @%ld\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount, + TRACE("Enumerating %lux%lux%lu @%lu\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount, callback_sd.u2.dwRefreshRate); if(cb(&callback_sd, Context) == DDENUMRET_CANCEL) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0795d0e3552..27b650036cf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1350,7 +1350,7 @@ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIX *D3DMatHandle = h + 1; - TRACE(" returning matrix handle %lx\n", *D3DMatHandle); + TRACE(" returning matrix handle %#lx\n", *D3DMatHandle); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index a6c367bd8ef..2f4c121789d 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -31,17 +31,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); *****************************************************************************/ static void _dump_executedata(const D3DEXECUTEDATA *lpData) { - TRACE("dwSize : %ld\n", lpData->dwSize); - TRACE("Vertex Offset : %ld Count : %ld\n", lpData->dwVertexOffset, lpData->dwVertexCount); - TRACE("Instruction Offset : %ld Length : %ld\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); - TRACE("HVertex Offset : %ld\n", lpData->dwHVertexOffset); + TRACE("dwSize : %lu\n", lpData->dwSize); + TRACE("Vertex Offset : %lu Count : %lu\n", lpData->dwVertexOffset, lpData->dwVertexCount); + TRACE("Instruction Offset : %lu Length : %lu\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); + TRACE("HVertex Offset : %lu\n", lpData->dwHVertexOffset); } static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { - TRACE("dwSize : %ld\n", lpDesc->dwSize); - TRACE("dwFlags : %lx\n", lpDesc->dwFlags); - TRACE("dwCaps : %lx\n", lpDesc->dwCaps); - TRACE("dwBufferSize : %ld\n", lpDesc->dwBufferSize); + TRACE("dwSize : %lu\n", lpDesc->dwSize); + TRACE("dwFlags : %#lx\n", lpDesc->dwFlags); + TRACE("dwCaps : %#lx\n", lpDesc->dwCaps); + TRACE("dwBufferSize : %lu\n", lpDesc->dwBufferSize); TRACE("lpData : %p\n", lpDesc->lpData); } diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 755c9923597..5bf2fcc7f9b 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static void dump_material(const D3DMATERIAL *mat) { - TRACE(" dwSize : %ld\n", mat->dwSize); + TRACE(" dwSize : %lu\n", mat->dwSize); } static inline struct d3d_material *impl_from_IDirect3DMaterial(IDirect3DMaterial *iface) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 663f97760ef..c2794824e9e 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -469,7 +469,7 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix return WINED3DFMT_L8_UNORM; default: - WARN("Unknown luminance-only bit depth 0x%lx.\n", DDPixelFormat->u1.dwLuminanceBitCount); + WARN("Unknown luminance-only bit depth %lu.\n", DDPixelFormat->u1.dwLuminanceBitCount); return WINED3DFMT_UNKNOWN; } } @@ -1138,7 +1138,7 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) FE(DDSVCAPS_STEREOSEQUENTIAL), }; - TRACE(" - dwSize : %ld\n", lpcaps->dwSize); + TRACE(" - dwSize : %lu\n", lpcaps->dwSize); TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, ARRAY_SIZE(flags1)); TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, ARRAY_SIZE(flags2)); TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, ARRAY_SIZE(flags3)); @@ -1147,10 +1147,10 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, ARRAY_SIZE(flags6)); TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, ARRAY_SIZE(flags7)); TRACE("...\n"); - TRACE(" - dwNumFourCCCodes : %ld\n", lpcaps->dwNumFourCCCodes); - TRACE(" - dwCurrVisibleOverlays : %ld\n", lpcaps->dwCurrVisibleOverlays); - TRACE(" - dwMinOverlayStretch : %ld\n", lpcaps->dwMinOverlayStretch); - TRACE(" - dwMaxOverlayStretch : %ld\n", lpcaps->dwMaxOverlayStretch); + TRACE(" - dwNumFourCCCodes : %lu\n", lpcaps->dwNumFourCCCodes); + TRACE(" - dwCurrVisibleOverlays : %lu\n", lpcaps->dwCurrVisibleOverlays); + TRACE(" - dwMinOverlayStretch : %lu\n", lpcaps->dwMinOverlayStretch); + TRACE(" - dwMaxOverlayStretch : %lu\n", lpcaps->dwMaxOverlayStretch); TRACE("...\n"); TRACE(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); } diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 77b85118a4a..83c88f48691 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -181,9 +181,9 @@ void viewport_free_active_light_index(struct d3d_light *light) *****************************************************************************/ static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp) { - TRACE(" - dwSize = %ld dwX = %ld dwY = %ld\n", + TRACE(" - dwSize = %lu dwX = %lu dwY = %lu\n", lpvp->dwSize, lpvp->dwX, lpvp->dwY); - TRACE(" - dwWidth = %ld dwHeight = %ld\n", + TRACE(" - dwWidth = %lu dwHeight = %lu\n", lpvp->dwWidth, lpvp->dwHeight); TRACE(" - dvScaleX = %f dvScaleY = %f\n", lpvp->dvScaleX, lpvp->dvScaleY); @@ -195,9 +195,9 @@ static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp) static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp) { - TRACE(" - dwSize = %ld dwX = %ld dwY = %ld\n", + TRACE(" - dwSize = %lu dwX = %lu dwY = %lu\n", lpvp->dwSize, lpvp->dwX, lpvp->dwY); - TRACE(" - dwWidth = %ld dwHeight = %ld\n", + TRACE(" - dwWidth = %lu dwHeight = %lu\n", lpvp->dwWidth, lpvp->dwHeight); TRACE(" - dvClipX = %f dvClipY = %f\n", lpvp->dvClipX, lpvp->dvClipY);

1 0

Huw Davies : winepulse: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 186e4ac533e2155f12a81cde5472d3fdda50a0b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=186e4ac533e2155f12a81cde… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 21 15:51:58 2022 +0100 winepulse: Implement Wow64 entry points in the Unix library. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 383 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 383 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=186e4ac533e2155f12a8…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022