November 2021 - Wine-Commits

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

Nov. 18, 2021

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: Move SetProperty implementation to the generic device.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

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: Stub support for the DIPROP_CALIBRATIONMODE property.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

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 Nov. 18, 2021

Nov. 18, 2021

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 : widl: Get rid of PowerPC support.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: c70ed78a364908b8cf54c85fcf0eb0824b3fae9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70ed78a364908b8cf54c85f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 21:32:51 2021 +0100 widl: Get rid of PowerPC support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 17 +---------------- tools/widl/widl.h | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1e473eb9cb7..4e60358fbba 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -96,10 +96,6 @@ static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSIO enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(__powerpc64__) -enum target_cpu target_cpu = CPU_POWERPC64; -#elif defined(__powerpc__) -enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) enum target_cpu target_cpu = CPU_ARM; #elif defined(__aarch64__) @@ -227,9 +223,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, - { "powerpc64", CPU_POWERPC64 }, - { "powerpc64le", CPU_POWERPC64 }, { "arm", CPU_ARM }, { "armv5", CPU_ARM }, { "armv6", CPU_ARM }, @@ -855,15 +848,7 @@ int main(int argc,char *argv[]) break; case CPU_ARM64: if (pointer_size == 4) target_cpu = CPU_ARM; - pointer_size = 8; - break; - case CPU_POWERPC64: - if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); - pointer_size = 8; - break; - default: - if (pointer_size == 8) error( "Cannot build 64-bit code for this CPU\n" ); - pointer_size = 4; + else pointer_size = 8; break; } diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 38ffc477115..84e9206d390 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -77,7 +77,7 @@ extern int char_number; enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_LAST = CPU_POWERPC64 + CPU_x86, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 }; extern enum target_cpu target_cpu;

1 0

Alexandre Julliard : tools: Move target CPU and platform handling to the common tools.h header.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: d969d02e21eb9f128d21a9209f62ac6dfbae236f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d969d02e21eb9f128d21a920… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 21:02:12 2021 +0100 tools: Move target CPU and platform handling to the common tools.h header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/tools.h | 228 ++++++++++++++++++++++++++++++++++++++++++++ tools/widl/widl.c | 121 ++---------------------- tools/widl/widl.h | 7 -- tools/winebuild/build.h | 30 ++---- tools/winebuild/import.c | 34 +++---- tools/winebuild/main.c | 109 ++------------------- tools/winebuild/parser.c | 6 +- tools/winebuild/res32.c | 4 +- tools/winebuild/spec32.c | 30 +++--- tools/winebuild/utils.c | 105 ++++++--------------- tools/winegcc/utils.c | 10 +- tools/winegcc/utils.h | 18 +--- tools/winegcc/winegcc.c | 240 ++++++++++------------------------------------- 13 files changed, 377 insertions(+), 565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d969d02e21eb9f128d21…

1 0

Alexandre Julliard : winegcc: Support an explicit --fake-module option.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: 9ac2eecbbaad305a5b167abffae9fdf4bcc55c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac2eecbbaad305a5b167abf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 18 19:47:40 2021 +0100 winegcc: Support an explicit --fake-module option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f82323d2094..e8457e46643 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -179,6 +179,7 @@ struct options int force_pointer_size; int large_address_aware; int wine_builtin; + int fake_module; int unwind_tables; int strip; int pic; @@ -1002,7 +1003,6 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, struct strarray spec_args = get_winebuild_args( opts ); struct strarray tool; const char *spec_o_name, *output_name; - int fake_module = strendswith(output_file, ".fake"); /* get the filename from the path */ output_name = get_basename( output_file ); @@ -1020,7 +1020,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC"); strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); - if (fake_module) + if (opts->fake_module) { strarray_add(&spec_args, "--fake-module"); strarray_add(&spec_args, "-o"); @@ -1101,7 +1101,6 @@ static void build(struct options* opts) const char *output_name, *spec_file, *lang; int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; - int fake_module = 0; int is_pe = is_pe_target( opts ); unsigned int j; @@ -1128,7 +1127,7 @@ static void build(struct options* opts) if (opts->shared || is_pe || strendswith(output_file, ".so")) generate_app_loader = 0; - if (strendswith(output_file, ".fake")) fake_module = 1; + if (strendswith(output_file, ".fake")) opts->fake_module = 1; /* normalize the filename a bit: strip .so, ensure it has proper ext */ if (!strchr(get_basename( output_file ), '.')) @@ -1250,7 +1249,7 @@ static void build(struct options* opts) if (spec_file || !opts->unix_lib) spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); - if (fake_module) return; /* nothing else to do */ + if (opts->fake_module) return; /* nothing else to do */ /* link everything together now */ link_args = get_link_args( opts, output_name ); @@ -1880,9 +1879,13 @@ int main(int argc, char **argv) } else if (strncmp("-Wb,", opts.args.str[i], 4) == 0) { - strarray_addall( &opts.winebuild_args, - strarray_fromstring( opts.args.str[i] + 4, ",") ); - /* don't pass it to the compiler, it generates errors */ + unsigned int j; + struct strarray Wb = strarray_fromstring(opts.args.str[i] + 4, ","); + for (j = 0; j < Wb.count; j++) + { + if (!strcmp(Wb.str[j], "--fake-module")) opts.fake_module = 1; + else strarray_add( &opts.winebuild_args, Wb.str[j] ); + } raw_compiler_arg = raw_linker_arg = 0; } break; @@ -1958,7 +1961,7 @@ int main(int argc, char **argv) if (!opts.wine_objdir && is_pe_target( &opts )) opts.use_msvcrt = 1; - if (opts.files.count == 0) forward(&opts); + if (opts.files.count == 0 && !opts.fake_module) forward(&opts); else if (linking) build(&opts); else compile(&opts, lang);

1 0

Alexandre Julliard : makefiles: Split the module generation into several helper functions.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: 6944dc51891637b39c02ec22fa35988c41e584da URL: https://source.winehq.org/git/wine.git/?a=commit;h=6944dc51891637b39c02ec22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 18 19:21:12 2021 +0100 makefiles: Split the module generation into several helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 147 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 95 insertions(+), 52 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1455d90d897..e757efdb121 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3219,12 +3219,9 @@ static void output_module( struct makefile *make ) strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); - strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), strmake( "p%s/%s%s", so_dir, make->module, dll_ext )); - add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d%s/%s", pe_dir, make->module )); - output( "%s%s %s.fake:", module_path, dll_ext, module_path ); + output( "%s%s:", module_path, dll_ext ); } else { @@ -3258,56 +3255,55 @@ static void output_module( struct makefile *make ) output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" ); - if (make->unixlib) + if (spec_file) + output_man_pages( make ); + else if (*dll_ext && !make->is_win16 && strendswith( make->module, ".exe" )) { - struct strarray unix_libs = empty_strarray; - struct strarray unix_deps = empty_strarray; - - if (!make->native_unix_lib) - { - struct strarray unix_imports = empty_strarray; + char *binary = replace_extension( make->module, ".exe", "" ); + add_install_rule( make, binary, "wineapploader", strmake( "t$(bindir)/%s", binary )); + } +} - strarray_add( &unix_imports, "ntdll" ); - strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); - strarray_add( &unix_imports, "winecrt0" ); - if (spec_file) strarray_add( &unix_deps, spec_file ); - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); - } +/******************************************************************* + * output_fake_module + */ +static void output_fake_module( struct makefile *make ) +{ + char *spec_file = NULL; - strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_add( &make->all_targets, make->unixlib ); - add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib )); - output( "%s:", obj_dir_path( make, make->unixlib )); - output_filenames_obj_dir( make, make->unixobj_files ); - output_filenames( unix_deps ); + strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); + add_install_rule( make, make->module, strmake( "%s.fake", make->module ), + strmake( "d%s/%s", pe_dir, make->module )); - if (make->native_unix_lib) - { - output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); - } - else - { - output_filename( tools_path( make, "winebuild" )); - output_filename( tools_path( make, "winegcc" )); - output( "\n" ); - output_winegcc_command( make, 0 ); - output_filename( "-munix" ); - output_filename( "-shared" ); - if (spec_file) output_filename( spec_file ); - } - output_filenames_obj_dir( make, make->unixobj_files ); - output_filenames( unix_libs ); - output_filename( "$(LDFLAGS)" ); - output( "\n" ); + output( "%s.fake:", obj_dir_path( make, make->module )); + if (spec_file) output_filename( spec_file ); + output_filenames_obj_dir( make, make->res_files ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); + output( "\n" ); + output_winegcc_command( make, make->is_cross ); + output_filename( "-Wb,--fake-module" ); + if (spec_file) + { + output_filename( "-shared" ); + output_filename( spec_file ); } + output_filenames( make->extradllflags ); + output_filenames_obj_dir( make, make->res_files ); + output( "\n" ); +} - if (spec_file && make->importlib) - { - char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); + +/******************************************************************* + * output_import_lib + */ +static void output_import_lib( struct makefile *make ) +{ + char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); if (!*dll_ext && needs_delay_lib( make )) @@ -3357,14 +3353,55 @@ static void output_module( struct makefile *make ) if (needs_implib_symlink( make )) strarray_addall( &top_makefile->clean_files, output_importlib_symlinks( make )); } +/******************************************************************* + * output_unix_lib + */ +static void output_unix_lib( struct makefile *make ) +{ + struct strarray unix_libs = empty_strarray; + struct strarray unix_deps = empty_strarray; + char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - if (spec_file) - output_man_pages( make ); - else if (*dll_ext && !make->is_win16 && strendswith( make->module, ".exe" )) + if (!make->native_unix_lib) { - char *binary = replace_extension( make->module, ".exe", "" ); - add_install_rule( make, binary, "wineapploader", strmake( "t$(bindir)/%s", binary )); + struct strarray unix_imports = empty_strarray; + + strarray_add( &unix_imports, "ntdll" ); + strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); + strarray_add( &unix_imports, "winecrt0" ); + if (spec_file) strarray_add( &unix_deps, spec_file ); + + strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); } + + strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); + + strarray_add( &make->all_targets, make->unixlib ); + add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib )); + output( "%s:", obj_dir_path( make, make->unixlib )); + output_filenames_obj_dir( make, make->unixobj_files ); + output_filenames( unix_deps ); + + if (make->native_unix_lib) + { + output( "\n" ); + output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); + output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); + } + else + { + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); + output( "\n" ); + output_winegcc_command( make, 0 ); + output_filename( "-munix" ); + output_filename( "-shared" ); + if (spec_file) output_filename( spec_file ); + } + output_filenames_obj_dir( make, make->unixobj_files ); + output_filenames( unix_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); } @@ -3724,7 +3761,13 @@ static void output_sources( struct makefile *make ) } if (make->staticlib) output_static_lib( make ); - else if (make->module) output_module( make ); + else if (make->module) + { + output_module( make ); + if (*dll_ext && !make->is_cross) output_fake_module( make ); + if (make->unixlib) output_unix_lib( make ); + if (make->importlib) output_import_lib( make ); + } else if (make->testdll) output_test_module( make ); else if (make->sharedlib) output_shared_lib( make ); else if (make->programs.count) output_programs( make );

1 0

Brendan Shanks : winemac.drv: Remove workarounds for Mac OS X 10.6 and earlier.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: 32fb017d4a22be38ca271bf387e466e958601355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32fb017d4a22be38ca271bf3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Nov 18 13:05:04 2021 -0800 winemac.drv: Remove workarounds for Mac OS X 10.6 and earlier. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 15 +++++------ dlls/winemac.drv/cocoa_window.m | 59 ++++++++++++----------------------------- dlls/winemac.drv/opengl.c | 20 -------------- 3 files changed, 23 insertions(+), 71 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c4c745ff732..1bb752d20b7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -299,15 +299,12 @@ static NSString* WineLocalizedString(unsigned int stringID) [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ZOOM) action:@selector(performZoom:) keyEquivalent:@""]; - if ([NSWindow instancesRespondToSelector:@selector(toggleFullScreen:)]) - { - item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) - action:@selector(toggleFullScreen:) - keyEquivalent:@"f"]; - [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | - NSEventModifierFlagOption | - NSEventModifierFlagControl]; - } + item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) + action:@selector(toggleFullScreen:) + keyEquivalent:@"f"]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | + NSEventModifierFlagOption | + NSEventModifierFlagControl]; [submenu addItem:[NSMenuItem separatorItem]]; [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_BRING_ALL_TO_FRONT) action:@selector(arrangeInFront:) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 812b46bee2c..d0672b7fb06 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -36,20 +36,6 @@ #import "cocoa_opengl.h" -#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 -enum { - NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, - NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8, - NSWindowFullScreenButton = 7, - NSWindowStyleMaskFullScreen = 1 << 14, -}; - -(a)interface NSWindow (WineFullScreenExtensions) - - (void) toggleFullScreen:(id)sender; -(a)end -#endif - - #if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */ enum { @@ -1091,11 +1077,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; if (style & NSWindowStyleMaskResizable) [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; - if ([self respondsToSelector:@selector(toggleFullScreen:)]) - { - if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) - [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; - } + if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) + [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; if ([self preventResizing]) { @@ -1115,24 +1098,21 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior { - if ([self respondsToSelector:@selector(toggleFullScreen:)]) - { - NSUInteger style = [self styleMask]; + NSUInteger style = [self styleMask]; - if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && - !(self.parentWindow || self.latentParentWindow)) - { - behavior |= NSWindowCollectionBehaviorFullScreenPrimary; - behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; - } - else - { - behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; - behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; - if (style & NSWindowStyleMaskFullScreen) - [super toggleFullScreen:nil]; - } + if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && + style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && + !(self.parentWindow || self.latentParentWindow)) + { + behavior |= NSWindowCollectionBehaviorFullScreenPrimary; + behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; + } + else + { + behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; + behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; + if (style & NSWindowStyleMaskFullScreen) + [super toggleFullScreen:nil]; } if (behavior != [self collectionBehavior]) @@ -2480,12 +2460,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi for (i = 0; i < sizeof(buttons) / sizeof(buttons[0]); i++) { - NSButton* button; - - if (buttons[i] == NSWindowFullScreenButton && ![self respondsToSelector:@selector(toggleFullScreen:)]) - continue; - - button = [self standardWindowButton:buttons[i]]; + NSButton* button = [self standardWindowButton:buttons[i]]; if ([button hitTest:[button.superview convertPoint:event.locationInWindow fromView:nil]]) { hitButton = YES; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 9f02e93d376..33132de7415 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1248,7 +1248,6 @@ static BOOL init_gl_info(void) kCGLPFADisplayMask, displayMask, 0 }; -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 CGLPixelFormatAttribute core_attribs[] = { kCGLPFADisplayMask, displayMask, @@ -1256,7 +1255,6 @@ static BOOL init_gl_info(void) kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core, 0 }; -#endif CGLPixelFormatObj pix; GLint virtualScreens; CGLError err; @@ -1308,7 +1306,6 @@ static BOOL init_gl_info(void) CGLSetCurrentContext(old_context); CGLReleaseContext(context); -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 err = CGLChoosePixelFormat(core_attribs, &pix, &virtualScreens); if (err != kCGLNoError || !pix) { @@ -1340,7 +1337,6 @@ static BOOL init_gl_info(void) sscanf(str, "%u.%u", &gl_info.max_major, &gl_info.max_minor); CGLSetCurrentContext(old_context); CGLReleaseContext(context); -#endif return TRUE; } @@ -1397,14 +1393,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns CGLError err; BOOL core = major >= 3; -#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 - if (core) - { - WARN("OS X version >= 10.7 is required to be able to create core contexts\n"); - return FALSE; - } -#endif - pf = get_pixel_format(context->format, TRUE /* non-displayable */); if (!pf) { @@ -1480,7 +1468,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns if (pf->backing_store) attribs[n++] = kCGLPFABackingStore; -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 if (core) { attribs[n++] = kCGLPFAOpenGLProfile; @@ -1493,7 +1480,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns attribs[n++] = (int)kCGLOGLPVersion_3_2_Core; #endif } -#endif attribs[n] = 0; @@ -1856,12 +1842,8 @@ static CGLPixelFormatObj create_pixel_format_for_renderer(CGLRendererInfoObj ren if (core) { -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 attrs[3] = kCGLPFAOpenGLProfile; attrs[4] = (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core; -#else - return NULL; -#endif } if (!get_renderer_property(renderer_info, renderer, kCGLRPRendererID, &renderer_id)) @@ -2157,12 +2139,10 @@ static BOOL query_renderer_integer(CGLRendererInfoObj renderer_info, GLint rende } case WGL_RENDERER_VIDEO_MEMORY_WINE: -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 err = CGLDescribeRenderer(renderer_info, renderer, kCGLRPVideoMemoryMegabytes, (GLint*)value); if (err != kCGLNoError && err != kCGLBadProperty) WARN("CGLDescribeRenderer(kCGLRPVideoMemoryMegabytes) failed: %d %s\n", err, CGLErrorString(err)); if (err != kCGLNoError) -#endif { if (get_renderer_property(renderer_info, renderer, kCGLRPVideoMemory, (GLint*)value)) *value /= 1024 * 1024;

1 0

Alexandre Julliard : winebuild: Get rid of PowerPC support.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

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