November 2021 - Wine-commits

Rémi Bernon : dinput: Move HID joystick extra caps to struct dinput_device.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 1ae1744cb271bbcab87265ad9a4d2090f973fcf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae1744cb271bbcab87265ad… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:12 2021 +0100 dinput: Move HID joystick extra caps to struct dinput_device. As object properties. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 + dlls/dinput/device_private.h | 12 +++++ dlls/dinput/joystick_hid.c | 119 +++++++++++++++++++------------------------ 3 files changed, 66 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ae1744cb271bbcab872…

1 0

Rémi Bernon : dinput: Reset axis and pov values on object property change.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: c918234f7125692fee4f559391e31d116339b71e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c918234f7125692fee4f5593… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:13 2021 +0100 dinput: Reset axis and pov values on object property change. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/dinput/joystick_hid.c | 9 +-------- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a3dde86f8be..c4d40e1278b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -27,6 +27,7 @@ #include <stdarg.h> #include <string.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -1037,6 +1038,39 @@ static BOOL CALLBACK set_object_property( const DIDEVICEOBJECTINSTANCEW *instanc return DIENUM_CONTINUE; } +static BOOL CALLBACK reset_object_value( const DIDEVICEOBJECTINSTANCEW *instance, void *context ) +{ + struct dinput_device *impl = context; + struct object_properties *properties; + LONG tmp = -1; + + if (!impl->object_properties) return DIENUM_STOP; + properties = impl->object_properties + instance->dwOfs / sizeof(LONG); + + if (instance->dwType & DIDFT_AXIS) + { + if (!properties->range_min) tmp = properties->range_max / 2; + else tmp = round( (properties->range_min + properties->range_max) / 2.0 ); + } + + *(LONG *)(impl->device_state + instance->dwOfs) = tmp; + return DIENUM_CONTINUE; +} + +static void reset_device_state( IDirectInputDevice8W *iface ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + DIPROPHEADER filter = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }; + + impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS | DIDFT_POV, reset_object_value, impl ); +} + static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, const GUID *guid, const DIPROPHEADER *header ) { @@ -1065,6 +1099,7 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co if (value->lMin > value->lMax) return DIERR_INVALIDPARAM; hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; + reset_device_state( iface ); return DI_OK; } case (DWORD_PTR)DIPROP_DEADZONE: @@ -1075,6 +1110,7 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co if (value->dwData > 10000) return DIERR_INVALIDPARAM; hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); if (FAILED(hr)) return hr; + reset_device_state( iface ); return DI_OK; } case (DWORD_PTR)DIPROP_AUTOCENTER: @@ -1922,6 +1958,9 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, obj_format->dwFlags = instance->dwFlags; } + if (impl->object_properties && (instance->dwType & (DIDFT_AXIS | DIDFT_POV))) + reset_object_value( instance, impl ); + format->dwNumObjs++; return DIENUM_CONTINUE; } diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 81b54ffe7a3..b252b9a13c9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -789,17 +789,10 @@ static void set_extra_caps_range( struct hid_joystick *impl, const DIDEVICEOBJEC properties->range_min = min; properties->range_max = max; - if (instance->dwType & DIDFT_AXIS) - { - if (!properties->range_min) tmp = properties->range_max / 2; - else tmp = round( (properties->range_min + properties->range_max) / 2.0 ); - *(LONG *)(impl->base.device_state + instance->dwOfs) = tmp; - } - else if (instance->dwType & DIDFT_POV) + if (instance->dwType & DIDFT_POV) { tmp = properties->logical_max - properties->logical_min; if (tmp > 0) properties->range_max -= max / (tmp + 1); - *(LONG *)(impl->base.device_state + instance->dwOfs) = -1; } }

1 0

Rémi Bernon : dinput: Guard (Get|Set)Property logic within the device CS.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 99783e8c8b88f76dfde3f16cc2efec384bf2a500 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99783e8c8b88f76dfde3f16c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:14 2021 +0100 dinput: Guard (Get|Set)Property logic within the device CS. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 111 +++++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 52 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c4d40e1278b..9bf52cad2ec 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -911,7 +911,7 @@ static BOOL CALLBACK find_object( const DIDEVICEOBJECTINSTANCEW *instance, void return DIENUM_STOP; } -static HRESULT WINAPI dinput_device_GetProperty( IDirectInputDevice8W *iface, const GUID *guid, DIPROPHEADER *header ) +static HRESULT dinput_device_get_property( IDirectInputDevice8W *iface, const GUID *guid, DIPROPHEADER *header ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); DWORD object_mask = DIDFT_AXIS | DIDFT_BUTTON | DIDFT_POV; @@ -919,12 +919,6 @@ static HRESULT WINAPI dinput_device_GetProperty( IDirectInputDevice8W *iface, co DIPROPHEADER filter; HRESULT hr; - TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); - - if (!header) return DIERR_INVALIDPARAM; - if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; - if (!IS_DIPROP( guid )) return DI_OK; - filter = *header; if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; @@ -1023,6 +1017,24 @@ static HRESULT WINAPI dinput_device_GetProperty( IDirectInputDevice8W *iface, co return DI_OK; } +static HRESULT WINAPI dinput_device_GetProperty( IDirectInputDevice8W *iface, const GUID *guid, DIPROPHEADER *header ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr; + + TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + EnterCriticalSection( &impl->crit ); + hr = dinput_device_get_property( iface, guid, header ); + LeaveCriticalSection( &impl->crit ); + + return hr; +} + struct set_object_property_params { IDirectInputDevice8W *iface; @@ -1071,8 +1083,8 @@ static void reset_device_state( IDirectInputDevice8W *iface ) impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS | DIDFT_POV, reset_object_value, impl ); } -static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, const GUID *guid, - const DIPROPHEADER *header ) +static HRESULT WINAPI dinput_device_set_property( IDirectInputDevice8W *iface, const GUID *guid, + const DIPROPHEADER *header ) { struct set_object_property_params params = {.iface = iface, .header = header, .property = LOWORD( guid )}; struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); @@ -1081,12 +1093,6 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co DIPROPHEADER filter; HRESULT hr; - TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); - - if (!header) return DIERR_INVALIDPARAM; - if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; - if (!IS_DIPROP( guid )) return DI_OK; - filter = *header; if (FAILED(hr = enum_object_filter_init( impl, &filter ))) return hr; @@ -1118,18 +1124,13 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (header->dwHow != DIPH_DEVICE) return DIERR_UNSUPPORTED; - EnterCriticalSection( &impl->crit ); - if (impl->acquired) hr = DIERR_ACQUIRED; - else if (value->dwData > DIPROPAUTOCENTER_ON) hr = DIERR_INVALIDPARAM; - else if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) hr = DIERR_UNSUPPORTED; - else - { - FIXME( "DIPROP_AUTOCENTER stub!\n" ); - impl->autocenter = value->dwData; - hr = DI_OK; - } - LeaveCriticalSection( &impl->crit ); - return hr; + if (impl->acquired) return DIERR_ACQUIRED; + if (value->dwData > DIPROPAUTOCENTER_ON) return DIERR_INVALIDPARAM; + if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; + + FIXME( "DIPROP_AUTOCENTER stub!\n" ); + impl->autocenter = value->dwData; + return DI_OK; } case (DWORD_PTR)DIPROP_FFGAIN: { @@ -1138,12 +1139,9 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co if (!impl->vtbl->send_device_gain) return DIERR_UNSUPPORTED; if (header->dwHow != DIPH_DEVICE) return DIERR_UNSUPPORTED; if (value->dwData > 10000) return DIERR_INVALIDPARAM; - EnterCriticalSection( &impl->crit ); impl->device_gain = value->dwData; - if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) hr = DI_OK; - else hr = impl->vtbl->send_device_gain( iface, impl->device_gain ); - LeaveCriticalSection( &impl->crit ); - return hr; + if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) return DI_OK; + return impl->vtbl->send_device_gain( iface, impl->device_gain ); } case (DWORD_PTR)DIPROP_FFLOAD: case (DWORD_PTR)DIPROP_GRANULARITY: @@ -1163,41 +1161,31 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; if (header->dwHow != DIPH_DEVICE) return DIERR_UNSUPPORTED; if (header->dwHow == DIPH_DEVICE && header->dwObj) return DIERR_INVALIDPARAM; + if (impl->acquired) return DIERR_ACQUIRED; TRACE( "Axis mode: %s\n", value->dwData == DIPROPAXISMODE_ABS ? "absolute" : "relative" ); - EnterCriticalSection( &impl->crit ); - if (impl->acquired) hr = DIERR_ACQUIRED; - else if (!impl->user_format) hr = DI_OK; - else + if (impl->user_format) { impl->user_format->dwFlags &= ~DIDFT_AXIS; impl->user_format->dwFlags |= value->dwData == DIPROPAXISMODE_ABS ? DIDF_ABSAXIS : DIDF_RELAXIS; - hr = DI_OK; } - LeaveCriticalSection( &impl->crit ); - return hr; + return DI_OK; } case (DWORD_PTR)DIPROP_BUFFERSIZE: { const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; + if (impl->acquired) return DIERR_ACQUIRED; TRACE( "buffersize = %d\n", value->dwData ); - EnterCriticalSection( &impl->crit ); - if (impl->acquired) hr = DIERR_ACQUIRED; - else - { - impl->buffersize = value->dwData; - impl->queue_len = min( impl->buffersize, 1024 ); - free( impl->data_queue ); + impl->buffersize = value->dwData; + impl->queue_len = min( impl->buffersize, 1024 ); + free( impl->data_queue ); - impl->data_queue = impl->queue_len ? malloc( impl->queue_len * sizeof(DIDEVICEOBJECTDATA) ) : NULL; - impl->queue_head = impl->queue_tail = impl->overflow = 0; - hr = DI_OK; - } - LeaveCriticalSection( &impl->crit ); - return hr; + impl->data_queue = impl->queue_len ? malloc( impl->queue_len * sizeof(DIDEVICEOBJECTDATA) ) : NULL; + impl->queue_head = impl->queue_tail = impl->overflow = 0; + return DI_OK; } case (DWORD_PTR)DIPROP_APPDATA: { @@ -1220,6 +1208,25 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co return DI_OK; } +static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, const GUID *guid, + const DIPROPHEADER *header ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr; + + TRACE( "iface %p, guid %s, header %p\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (header->dwHeaderSize != sizeof(DIPROPHEADER)) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + EnterCriticalSection( &impl->crit ); + hr = dinput_device_set_property( iface, guid, header ); + LeaveCriticalSection( &impl->crit ); + + return hr; +} + static void dinput_device_set_username( struct dinput_device *impl, const DIPROPSTRING *value ) { struct DevicePlayer *device_player;

1 0

Rémi Bernon : dinput: Factor (Get|Set)Property checks together.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 801bc147f0e76c00a2cbe23ff6309b45d255f897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=801bc147f0e76c00a2cbe23f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:15 2021 +0100 dinput: Factor (Get|Set)Property checks together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 189 +++++++++++++++++++++++++++++++---------------- dlls/dinput8/tests/hid.c | 3 - 2 files changed, 125 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=801bc147f0e76c00a2cb…

1 0

Rémi Bernon : dinput: Move SetProperty implementation to the generic device.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 3834eaf9bd44fb692d844041f90b85ec342dadd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3834eaf9bd44fb692d844041… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:16 2021 +0100 dinput: Move SetProperty implementation to the generic device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 31 ++++++++++++++++++++-- dlls/dinput/device_private.h | 2 -- dlls/dinput/joystick_hid.c | 63 ++++++++------------------------------------ dlls/dinput/keyboard.c | 7 ----- dlls/dinput/mouse.c | 7 ----- 5 files changed, 40 insertions(+), 70 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ee47ff60e4f..2367023175c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1143,8 +1143,35 @@ static BOOL CALLBACK set_object_property( const DIDEVICEOBJECTINSTANCEW *instanc { struct set_object_property_params *params = context; struct dinput_device *impl = impl_from_IDirectInputDevice8W( params->iface ); - impl->vtbl->set_property( params->iface, params->property, params->header, instance ); - return DIENUM_CONTINUE; + struct object_properties *properties = NULL; + + if (!impl->object_properties) return DIENUM_STOP; + properties = impl->object_properties + instance->dwOfs / sizeof(LONG); + + switch (params->property) + { + case (DWORD_PTR)DIPROP_RANGE: + { + const DIPROPRANGE *value = (const DIPROPRANGE *)params->header; + properties->range_min = value->lMin; + properties->range_max = value->lMax; + return DIENUM_CONTINUE; + } + case (DWORD_PTR)DIPROP_DEADZONE: + { + const DIPROPDWORD *value = (const DIPROPDWORD *)params->header; + properties->deadzone = value->dwData; + return DIENUM_CONTINUE; + } + case (DWORD_PTR)DIPROP_SATURATION: + { + const DIPROPDWORD *value = (const DIPROPDWORD *)params->header; + properties->saturation = value->dwData; + return DIENUM_CONTINUE; + } + } + + return DIENUM_STOP; } static BOOL CALLBACK reset_object_value( const DIDEVICEOBJECTINSTANCEW *instance, void *context ) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 3e2942f71ef..6d24e66bb54 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -45,8 +45,6 @@ struct dinput_device_vtbl LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ); HRESULT (*get_property)( IDirectInputDevice8W *iface, DWORD property, DIPROPHEADER *header, DIDEVICEOBJECTINSTANCEW *instance ); - HRESULT (*set_property)( IDirectInputDevice8W *iface, DWORD property, const DIPROPHEADER *header, - const DIDEVICEOBJECTINSTANCEW *instance ); HRESULT (*get_effect_info)( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, const GUID *guid ); HRESULT (*create_effect)( IDirectInputDevice8W *iface, IDirectInputEffect **out ); HRESULT (*send_force_feedback_command)( IDirectInputDevice8W *iface, DWORD command, BOOL unacquire ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index b252b9a13c9..56e4c38c31a 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -780,22 +780,6 @@ static HRESULT hid_joystick_get_property( IDirectInputDevice8W *iface, DWORD pro return DIERR_UNSUPPORTED; } -static void set_extra_caps_range( struct hid_joystick *impl, const DIDEVICEOBJECTINSTANCEW *instance, - LONG min, LONG max ) -{ - struct object_properties *properties = impl->base.object_properties + instance->dwOfs / sizeof(LONG); - LONG tmp; - - properties->range_min = min; - properties->range_max = max; - - if (instance->dwType & DIDFT_POV) - { - tmp = properties->logical_max - properties->logical_min; - if (tmp > 0) properties->range_max -= max / (tmp + 1); - } -} - static HRESULT hid_joystick_send_device_gain( IDirectInputDevice8W *iface, LONG device_gain ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -817,39 +801,6 @@ static HRESULT hid_joystick_send_device_gain( IDirectInputDevice8W *iface, LONG return DI_OK; } -static HRESULT hid_joystick_set_property( IDirectInputDevice8W *iface, DWORD property, - const DIPROPHEADER *header, const DIDEVICEOBJECTINSTANCEW *instance ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - struct object_properties *properties = NULL; - - if (instance) properties = impl->base.object_properties + instance->dwOfs / sizeof(LONG); - - switch (property) - { - case (DWORD_PTR)DIPROP_RANGE: - { - const DIPROPRANGE *value = (const DIPROPRANGE *)header; - set_extra_caps_range( impl, instance, value->lMin, value->lMax ); - return DI_OK; - } - case (DWORD_PTR)DIPROP_DEADZONE: - { - const DIPROPDWORD *value = (const DIPROPDWORD *)header; - properties->deadzone = value->dwData; - return DI_OK; - } - case (DWORD_PTR)DIPROP_SATURATION: - { - const DIPROPDWORD *value = (const DIPROPDWORD *)header; - properties->saturation = value->dwData; - return DI_OK; - } - } - - return DIERR_UNSUPPORTED; -} - static HRESULT hid_joystick_acquire( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -1301,7 +1252,6 @@ static const struct dinput_device_vtbl hid_joystick_vtbl = hid_joystick_unacquire, hid_joystick_enum_objects, hid_joystick_get_property, - hid_joystick_set_property, hid_joystick_get_effect_info, hid_joystick_create_effect, hid_joystick_send_force_feedback_command, @@ -1561,11 +1511,20 @@ static BOOL init_object_properties( struct hid_joystick *impl, struct hid_value_ DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct object_properties *properties = impl->base.object_properties + instance->dwOfs / sizeof(LONG); - LONG range_max = (instance->dwType & DIDFT_AXIS) ? 65535 : 36000; + LONG tmp; + properties->bit_size = caps->bit_size; properties->logical_min = caps->logical_min; properties->logical_max = caps->logical_max; - set_extra_caps_range( impl, instance, 0, range_max ); + + if (instance->dwType & DIDFT_AXIS) properties->range_max = 65535; + else + { + properties->range_max = 36000; + tmp = caps->logical_max - caps->logical_min; + if (tmp > 0) properties->range_max -= 36000 / (tmp + 1); + } + properties->saturation = 10000; return DIENUM_CONTINUE; } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 916a1d43233..2afb744d520 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -274,12 +274,6 @@ static HRESULT keyboard_get_property( IDirectInputDevice8W *iface, DWORD propert return DIERR_UNSUPPORTED; } -static HRESULT keyboard_set_property( IDirectInputDevice8W *iface, DWORD property, - const DIPROPHEADER *header, const DIDEVICEOBJECTINSTANCEW *instance ) -{ - return DIERR_UNSUPPORTED; -} - static const struct dinput_device_vtbl keyboard_vtbl = { NULL, @@ -289,7 +283,6 @@ static const struct dinput_device_vtbl keyboard_vtbl = keyboard_unacquire, keyboard_enum_objects, keyboard_get_property, - keyboard_set_property, NULL, NULL, NULL, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 313ac070c86..94cca61a0d0 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -576,12 +576,6 @@ static HRESULT mouse_get_property( IDirectInputDevice8W *iface, DWORD property, return DIERR_UNSUPPORTED; } -static HRESULT mouse_set_property( IDirectInputDevice8W *iface, DWORD property, - const DIPROPHEADER *header, const DIDEVICEOBJECTINSTANCEW *instance ) -{ - return DIERR_UNSUPPORTED; -} - static const struct dinput_device_vtbl mouse_vtbl = { NULL, @@ -591,7 +585,6 @@ static const struct dinput_device_vtbl mouse_vtbl = mouse_unacquire, mouse_enum_objects, mouse_get_property, - mouse_set_property, NULL, NULL, NULL,

1 0

Rémi Bernon : dinput: Move GetProperty implementation for objects to generic device.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 0c9cac9547c4417b9c703c4be78836ff422017c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9cac9547c4417b9c703c4b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:17 2021 +0100 dinput: Move GetProperty implementation for objects to generic device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 100 ++++++++++++++++++++++++++++++++++++++----- dlls/dinput/device_private.h | 3 +- dlls/dinput/joystick_hid.c | 30 +------------ dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 25 +---------- dlls/dinput8/tests/hid.c | 2 - 6 files changed, 95 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c9cac9547c4417b9c70…

1 0

Rémi Bernon : dinput: Stub support for the DIPROP_CALIBRATIONMODE property.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: e8d961b5c74ba3a57f33af696ad38f3317ac0ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d961b5c74ba3a57f33af69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:18 2021 +0100 dinput: Stub support for the DIPROP_CALIBRATIONMODE property. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 26 ++++++++++++++++++++++++++ dlls/dinput8/tests/hid.c | 11 ----------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ed2ae551e3e..f70b7e549c0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -920,6 +920,7 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con case (DWORD_PTR)DIPROP_AUTOCENTER: case (DWORD_PTR)DIPROP_AXISMODE: case (DWORD_PTR)DIPROP_BUFFERSIZE: + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_FFGAIN: case (DWORD_PTR)DIPROP_FFLOAD: @@ -966,6 +967,7 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_SATURATION: case (DWORD_PTR)DIPROP_GRANULARITY: + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: if (header->dwHow == DIPH_DEVICE && !set) return DIERR_UNSUPPORTED; break; @@ -1015,6 +1017,7 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con } case (DWORD_PTR)DIPROP_AUTOCENTER: case (DWORD_PTR)DIPROP_AXISMODE: + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (value->dwData > 1) return DIERR_INVALIDPARAM; @@ -1038,6 +1041,7 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_SATURATION: + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: if (!impl->object_properties) return DIERR_UNSUPPORTED; break; @@ -1102,6 +1106,12 @@ static BOOL CALLBACK get_object_property( const DIDEVICEOBJECTINSTANCEW *instanc value->dwData = properties->saturation; return DIENUM_STOP; } + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: + { + DIPROPDWORD *value = (DIPROPDWORD *)params->header; + value->dwData = properties->calibration_mode; + return DI_OK; + } case (DWORD_PTR)DIPROP_GRANULARITY: { DIPROPDWORD *value = (DIPROPDWORD *)params->header; @@ -1145,6 +1155,7 @@ static HRESULT dinput_device_get_property( IDirectInputDevice8W *iface, const GU case (DWORD_PTR)DIPROP_SATURATION: case (DWORD_PTR)DIPROP_GRANULARITY: case (DWORD_PTR)DIPROP_KEYNAME: + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: hr = impl->vtbl->enum_objects( iface, &filter, object_mask, get_object_property, &params ); if (FAILED(hr)) return hr; if (hr == DIENUM_CONTINUE) return DIERR_NOTFOUND; @@ -1249,6 +1260,12 @@ static BOOL CALLBACK set_object_property( const DIDEVICEOBJECTINSTANCEW *instanc properties->saturation = value->dwData; return DIENUM_CONTINUE; } + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: + { + const DIPROPDWORD *value = (const DIPROPDWORD *)params->header; + properties->calibration_mode = value->dwData; + return DIENUM_CONTINUE; + } } return DIENUM_STOP; @@ -1312,6 +1329,15 @@ static HRESULT WINAPI dinput_device_set_property( IDirectInputDevice8W *iface, c reset_device_state( iface ); return DI_OK; } + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: + { + const DIPROPDWORD *value = (const DIPROPDWORD *)header; + if (value->dwData > DIPROPCALIBRATIONMODE_RAW) return DIERR_INVALIDPARAM; + hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, set_object_property, &params ); + if (FAILED(hr)) return hr; + reset_device_state( iface ); + return DI_OK; + } case (DWORD_PTR)DIPROP_AUTOCENTER: { const DIPROPDWORD *value = (const DIPROPDWORD *)header; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index b3f696e09ee..3beabc4b03b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4215,9 +4215,7 @@ static void test_simple_joystick(void) ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_CALIBRATIONMODE returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == DIPROPCALIBRATIONMODE_COOKED, "got %u expected %u\n", prop_dword.dwData, DIPROPCALIBRATIONMODE_COOKED ); prop_string.diph.dwHow = DIPH_BYUSAGE; @@ -4927,7 +4925,6 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_SATURATION returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); - todo_wine ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_CALIBRATIONMODE returned %#x\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); @@ -4937,7 +4934,6 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "SetProperty DIPROP_SATURATION returned %#x\n", hr ); prop_dword.dwData = DIPROPCALIBRATIONMODE_COOKED; hr = IDirectInputDevice8_SetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_CALIBRATIONMODE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); @@ -5025,13 +5021,10 @@ static void test_simple_joystick(void) prop_dword.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_dword.dwData = DIPROPCALIBRATIONMODE_RAW; hr = IDirectInputDevice8_SetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_CALIBRATIONMODE returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_CALIBRATIONMODE returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == DIPROPCALIBRATIONMODE_RAW, "got %u expected %u\n", prop_dword.dwData, DIPROPCALIBRATIONMODE_RAW ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); @@ -5039,23 +5032,19 @@ static void test_simple_joystick(void) winetest_push_context( "state[%d]", i ); todo_wine ok( state.lX == 15, "got lX %d, expected %d\n" , state.lX, 15 ); - todo_wine check_member( state, expect_state_abs[0], "%d", lY ); check_member( state, expect_state_abs[0], "%d", lZ ); check_member( state, expect_state_abs[0], "%d", lRx ); - todo_wine check_member( state, expect_state_abs[0], "%d", rgdwPOV[0] ); check_member( state, expect_state_abs[0], "%d", rgdwPOV[1] ); winetest_pop_context(); prop_dword.dwData = DIPROPCALIBRATIONMODE_COOKED; hr = IDirectInputDevice8_SetProperty( device, DIPROP_CALIBRATIONMODE, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_CALIBRATIONMODE returned %#x\n", hr ); send_hid_input( file, &injected_input[ARRAY_SIZE(injected_input) - 1], sizeof(*injected_input) ); res = WaitForSingleObject( event, 100 ); - todo_wine ok( res == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); hr = IDirectInputDevice8_Unacquire( device );

1 0

Ivo Ivanov : dinput: Add support for DIPROP_(PHYSICAL|LOGICAL)RANGE properties.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: b793fb54573166f33d0304ec4b542a4b272ac357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b793fb54573166f33d0304ec… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Nov 18 09:53:19 2021 +0100 dinput: Add support for DIPROP_(PHYSICAL|LOGICAL)RANGE properties. Fixes apps like WheelCheck, which rely on some of these properties (DIPROP_PHYSICALRANGE) to correctly calculate the top center of the wheel against their permitted range. In particular the constant force test now works just like in Windows, directing the wheel to the upper center and resisting any movement to the left or right. Before that it would pull the steering wheel hard to the left. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 27 +++++++++++++++++++++++++++ dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick_hid.c | 2 ++ dlls/dinput8/tests/hid.c | 8 -------- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f70b7e549c0..6240d640e0d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -936,6 +936,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con if (header->dwSize != sizeof(DIPROPPOINTER)) return DIERR_INVALIDPARAM; break; + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + case (DWORD_PTR)DIPROP_LOGICALRANGE: case (DWORD_PTR)DIPROP_RANGE: if (header->dwSize != sizeof(DIPROPRANGE)) return DIERR_INVALIDPARAM; break; @@ -963,6 +965,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con if (header->dwObj) return DIERR_INVALIDPARAM; break; + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + case (DWORD_PTR)DIPROP_LOGICALRANGE: case (DWORD_PTR)DIPROP_RANGE: case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_SATURATION: @@ -988,6 +992,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con case (DWORD_PTR)DIPROP_AUTOCENTER: case (DWORD_PTR)DIPROP_AXISMODE: case (DWORD_PTR)DIPROP_BUFFERSIZE: + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + case (DWORD_PTR)DIPROP_LOGICALRANGE: if (impl->acquired) return DIERR_ACQUIRED; break; case (DWORD_PTR)DIPROP_FFLOAD: @@ -1023,6 +1029,9 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con if (value->dwData > 1) return DIERR_INVALIDPARAM; break; } + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + case (DWORD_PTR)DIPROP_LOGICALRANGE: + return DIERR_UNSUPPORTED; } } else @@ -1039,6 +1048,8 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con if (impl->caps.dwAxes && !(impl->caps.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; break; + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + case (DWORD_PTR)DIPROP_LOGICALRANGE: case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_SATURATION: case (DWORD_PTR)DIPROP_CALIBRATIONMODE: @@ -1087,6 +1098,20 @@ static BOOL CALLBACK get_object_property( const DIDEVICEOBJECTINSTANCEW *instanc switch (params->property) { + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + { + DIPROPRANGE *value = (DIPROPRANGE *)params->header; + value->lMin = properties->physical_min; + value->lMax = properties->physical_max; + return DI_OK; + } + case (DWORD_PTR)DIPROP_LOGICALRANGE: + { + DIPROPRANGE *value = (DIPROPRANGE *)params->header; + value->lMin = properties->logical_min; + value->lMax = properties->logical_max; + return DI_OK; + } case (DWORD_PTR)DIPROP_RANGE: { DIPROPRANGE *value = (DIPROPRANGE *)params->header; @@ -1151,6 +1176,8 @@ static HRESULT dinput_device_get_property( IDirectInputDevice8W *iface, const GU return impl->vtbl->get_property( iface, LOWORD( guid ), header, NULL ); case (DWORD_PTR)DIPROP_RANGE: + case (DWORD_PTR)DIPROP_PHYSICALRANGE: + case (DWORD_PTR)DIPROP_LOGICALRANGE: case (DWORD_PTR)DIPROP_DEADZONE: case (DWORD_PTR)DIPROP_SATURATION: case (DWORD_PTR)DIPROP_GRANULARITY: diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index c12cc92bc70..e2cae26aea2 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -58,6 +58,8 @@ struct dinput_device_vtbl struct object_properties { LONG bit_size; + LONG physical_min; + LONG physical_max; LONG logical_min; LONG logical_max; LONG range_min; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 2ad3462ca42..70c761267f7 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1486,6 +1486,8 @@ static BOOL init_object_properties( struct hid_joystick *impl, struct hid_value_ LONG tmp; properties->bit_size = caps->bit_size; + properties->physical_min = caps->physical_min; + properties->physical_max = caps->physical_max; properties->logical_min = caps->logical_min; properties->logical_max = caps->logical_max; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 3beabc4b03b..9e21ccdb713 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4253,18 +4253,12 @@ static void test_simple_joystick(void) ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); - todo_wine ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - todo_wine ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); - todo_wine ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - todo_wine ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); prop_pointer.diph.dwHow = DIPH_BYUSAGE; @@ -4810,10 +4804,8 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "SetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - todo_wine ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - todo_wine ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device );

1 0

Alexandre Julliard : winegcc: Get rid of PowerPC support.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 8cd36798489692d1e79f8d0ec67d1b8e2d82c85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd36798489692d1e79f8d0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 21:32:34 2021 +0100 winegcc: Get rid of PowerPC support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 552659e75c3..88bf6ae57d2 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -34,7 +34,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_ARM, CPU_ARM64 }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 940eaeb5279..c27ccf7357e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -171,7 +171,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, { "armv5", CPU_ARM }, { "armv6", CPU_ARM }, @@ -251,8 +250,6 @@ struct options static const enum target_cpu build_cpu = CPU_x86; #elif defined(__x86_64__) static const enum target_cpu build_cpu = CPU_x86_64; -#elif defined(__powerpc__) -static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__) static const enum target_cpu build_cpu = CPU_ARM; #elif defined(__aarch64__) @@ -474,11 +471,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, opts->unix_lib ? "-dynamiclib" : "-bundle" ); strarray_add( &flags, "-multiply_defined" ); strarray_add( &flags, "suppress" ); - if (opts->target_cpu == CPU_POWERPC) - { - strarray_add( &flags, "-read_only_relocs" ); - strarray_add( &flags, "warning" ); - } if (opts->image_base) { strarray_add( &flags, "-image_base" ); @@ -618,7 +610,6 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) case CPU_x86_64: return "/x86_64-linux-gnu"; case CPU_ARM: return "/arm-linux-gnueabi"; case CPU_ARM64: return "/aarch64-linux-gnu"; - case CPU_POWERPC: return "/powerpc-linux-gnu"; default: assert(0); return NULL; @@ -852,11 +843,6 @@ static void compile(struct options* opts, const char* lang) strarray_add(&comp_args, "-D__cdecl=__stdcall"); strarray_add(&comp_args, "-D__fastcall=__stdcall"); break; - case CPU_POWERPC: - strarray_add(&comp_args, "-D__stdcall="); - strarray_add(&comp_args, "-D__cdecl="); - strarray_add(&comp_args, "-D__fastcall="); - break; } strarray_add(&comp_args, "-D_stdcall=__stdcall"); strarray_add(&comp_args, "-D_cdecl=__cdecl");

1 0

Alexandre Julliard : winebuild: Get rid of PowerPC support.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 61e210f1967a4237d07f5c791433b99f49e78113 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61e210f1967a4237d07f5c79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 21:32:45 2021 +0100 winebuild: Get rid of PowerPC support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 105 +---------------------------------------------- tools/winebuild/main.c | 2 - tools/winebuild/parser.c | 5 --- tools/winebuild/spec32.c | 7 ---- tools/winebuild/utils.c | 26 ++---------- 6 files changed, 5 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61e210f1967a4237d07f…

1 0