November 2021 - Wine-Commits

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

Nov. 18, 2021

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

Nov. 18, 2021

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

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

Nov. 18, 2021

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

Henri Verbeet : ntdll: Only add a module dependency if import_dll() returned a modref.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: deff68bb728a58965fc69bd8a7d3759d6073b6a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=deff68bb728a58965fc69bd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 18:52:20 2021 +0100 ntdll: Only add a module dependency if import_dll() returned a modref. In particular, if import_dll() skips an unused import, it will return TRUE, but set *pwm to NULL. This fixes a regression in 3DMark03 version 3.4.0, introduced by commit 0dd37b02f99f5090dd855343fcd8a99496047f3e. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..a754579bf54 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1282,7 +1282,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) imp = NULL; status = STATUS_DLL_NOT_FOUND; } - else if (!is_import_dll_system( &wm->ldr, &imports[i] )) + else if (imp && !is_import_dll_system( &wm->ldr, &imports[i] )) { add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after ); }

1 0

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

Nov. 18, 2021

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: Factor (Get|Set)Property checks together.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

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 : dinput8/tests: Add some more (Get|Set)Property tests.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: dee684fbca401c15e37b50424f06ab6d577c4516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee684fbca401c15e37b5042… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 18 09:53:11 2021 +0100 dinput8/tests: Add some more (Get|Set)Property tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 21 ++++++++ dlls/dinput8/tests/hid.c | 114 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 134 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dee684fbca401c15e37b…

1 0

Zebediah Figura : ntdll: Reimplement Win32 futexes on top of thread-ID alerts.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: 6bdb914a25ab31399e68943dc30a6d77a879f8ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdb914a25ab31399e68943d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:54 2021 -0600 ntdll: Reimplement Win32 futexes on top of thread-ID alerts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 3 - dlls/ntdll/unix/sync.c | 162 ------------------------------------------- dlls/ntdll/unixlib.h | 6 +- 4 files changed, 173 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bdb914a25ab31399e68…

1 0

Ivo Ivanov : include: Declare DIPROP_(PHYSICAL|LOGICAL)RANGE properties.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: 67ae62e2263694b93fc01cc9799878dd80766420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ae62e2263694b93fc01cc9… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Nov 18 09:53:10 2021 +0100 include: Declare DIPROP_(PHYSICAL|LOGICAL)RANGE properties. 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> --- include/dinput.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index a073054b388..71cc55aece5 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -917,6 +917,9 @@ typedef const DIPROPPOINTER *LPCDIPROPPOINTER; #define DIPROP_PRODUCTNAME MAKEDIPROP(14) #define DIPROP_JOYSTICKID MAKEDIPROP(15) +#define DIPROP_PHYSICALRANGE MAKEDIPROP(18) +#define DIPROP_LOGICALRANGE MAKEDIPROP(19) + #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_CPOINTS MAKEDIPROP(21) #define DIPROP_APPDATA MAKEDIPROP(22)

1 0

Zebediah Figura : ntdll: Implement thread-ID alerts using Mach semaphores on Mac.
by Alexandre Julliard Nov. 18, 2021

Nov. 18, 2021

Module: wine Branch: master Commit: 842ecb45f433d458220eaefa6bedb3e3ed635deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=842ecb45f433d458220eaefa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:53 2021 -0600 ntdll: Implement thread-ID alerts using Mach semaphores on Mac. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 59fe6bea8f5..cdc63c8a6ef 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2341,10 +2341,14 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { +#ifdef __APPLE__ + semaphore_t sem; +#else HANDLE event; #ifdef __linux__ int futex; #endif +#endif }; #define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) @@ -2379,6 +2383,17 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; +#ifdef __APPLE__ + if (!entry->sem) + { + semaphore_t sem; + + if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) + return NULL; + if (InterlockedCompareExchange( (int *)&entry->sem, sem, NULL )) + semaphore_destroy( mach_task_self(), sem ); + } +#else #ifdef __linux__ if (use_futexes()) return entry; @@ -2393,6 +2408,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) NtClose( event ); } +#endif return entry; } @@ -2409,6 +2425,10 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; +#ifdef __APPLE__ + semaphore_signal( entry->sem ); + return STATUS_SUCCESS; +#else #ifdef __linux__ if (use_futexes()) { @@ -2420,10 +2440,11 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) #endif return NtSetEvent( entry->event, NULL ); +#endif } -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2446,6 +2467,57 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif +#ifdef __APPLE__ + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + semaphore_t sem; + ULONGLONG end; + kern_return_t ret; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + sem = entry->sem; + + if (timeout) + { + if (timeout->QuadPart == TIMEOUT_INFINITE) + timeout = NULL; + else + end = get_absolute_timeout( timeout ); + } + + for (;;) + { + if (timeout) + { + LONGLONG timeleft = update_timeout( end ); + mach_timespec_t timespec; + + timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + ret = semaphore_timedwait( sem, timespec ); + } + else + ret = semaphore_wait( sem ); + + switch (ret) + { + case KERN_SUCCESS: return STATUS_ALERTED; + case KERN_ABORTED: continue; + case KERN_OPERATION_TIMED_OUT: return STATUS_TIMEOUT; + default: return STATUS_INVALID_HANDLE; + } + } +} + +#else + /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) */ @@ -2498,6 +2570,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG return status; } +#endif #ifdef __linux__

1 0