- Wine-Commits - list.winehq.org

Yuxuan Shui : dmime: Parse MIDI headers.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: d93275c6ca1a2943444d3c32f3e6373699e664ac URL: https://gitlab.winehq.org/wine/wine/-/commit/d93275c6ca1a2943444d3c32f3e637… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Feb 7 14:16:27 2024 +0000 dmime: Parse MIDI headers. --- dlls/dmime/Makefile.in | 1 + dlls/dmime/dmime_private.h | 7 +++ dlls/dmime/midi.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/segment.c | 16 ++++++- 4 files changed, 128 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index cf041ef2b27..f8f622f8f3d 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -10,6 +10,7 @@ SOURCES = \ graph.c \ lyricstrack.c \ markertrack.c \ + midi.c \ paramcontroltrack.c \ performance.c \ segment.c \ diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 96ccd5daf8b..cdf0810381d 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -48,6 +48,7 @@ * Interfaces */ typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; +struct midi_parser; /***************************************************************************** * ClassFactory @@ -69,6 +70,12 @@ extern HRESULT create_dmtempotrack(REFIID riid, void **ret_iface); extern HRESULT create_dmtimesigtrack(REFIID riid, void **ret_iface); extern HRESULT create_dmwavetrack(REFIID riid, void **ret_iface); +/* Create a new MIDI file parser. Note the stream might still be modified even + * when this function fails. */ +extern HRESULT midi_parser_new(IStream *stream, struct midi_parser **out_parser); +extern HRESULT midi_parser_next_track(struct midi_parser *parser, IDirectMusicTrack **out_track, MUSIC_TIME *out_length); +extern void midi_parser_destroy(struct midi_parser *parser); + extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerformance8*); extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c new file mode 100644 index 00000000000..a7e57947c6f --- /dev/null +++ b/dlls/dmime/midi.c @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2024 Yuxuan Shui for CodeWeavers + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "dmime_private.h" +#include "winternl.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dmime); + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) +#endif + +struct midi_parser +{ + IStream *stream; +}; + +HRESULT midi_parser_next_track(struct midi_parser *parser, IDirectMusicTrack **out_track, MUSIC_TIME *out_length) +{ + TRACE("(%p, %p, %p): stub\n", parser, out_track, out_length); + return S_FALSE; +} + +HRESULT midi_parser_new(IStream *stream, struct midi_parser **out_parser) +{ + LARGE_INTEGER offset; + DWORD length; + HRESULT hr; + WORD format, number_of_tracks, division; + struct midi_parser *parser; + + *out_parser = NULL; + + /* Skip over the 'MThd' magic number. */ + offset.QuadPart = 4; + if (FAILED(hr = IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL))) return hr; + + if (FAILED(hr = IStream_Read(stream, &length, sizeof(length), NULL))) return hr; + length = GET_BE_DWORD(length); + if (length != 6) + { + WARN("Invalid MIDI header length %lu\n", length); + return DMUS_E_UNSUPPORTED_STREAM; + } + + if (FAILED(hr = IStream_Read(stream, &format, sizeof(format), NULL))) return hr; + format = GET_BE_WORD(format); + if (format > 2) + { + WARN("Invalid MIDI format %u\n", format); + return DMUS_E_UNSUPPORTED_STREAM; + } + if (format == 2) + { + FIXME("MIDI format 2 not implemented yet\n"); + return DMUS_E_UNSUPPORTED_STREAM; + } + + if (FAILED(hr = IStream_Read(stream, &number_of_tracks, sizeof(number_of_tracks), NULL))) + return hr; + + number_of_tracks = GET_BE_WORD(number_of_tracks); + if (FAILED(hr = IStream_Read(stream, &division, sizeof(division), NULL))) return hr; + division = GET_BE_WORD(division); + if (division & 0x8000) + { + WARN("SMPTE time division not implemented yet\n"); + return DMUS_E_UNSUPPORTED_STREAM; + } + + TRACE("MIDI format %u, %u tracks, division %u\n", format, number_of_tracks, division); + + parser = calloc(1, sizeof(struct midi_parser)); + if (!parser) return E_OUTOFMEMORY; + parser->stream = stream; + IStream_AddRef(stream); + *out_parser = parser; + + return hr; +} + +void midi_parser_destroy(struct midi_parser *parser) +{ + IStream_Release(parser->stream); + free(parser); +} diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b208f89148c..82e06f4537d 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -791,7 +791,10 @@ static inline struct segment *impl_from_IPersistStream(IPersistStream *iface) static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream *stream) { struct segment *This = impl_from_IPersistStream(iface); + IDirectMusicTrack *track; + MUSIC_TIME length; struct chunk_entry chunk = {0}; + struct midi_parser *midi_parser; HRESULT hr; TRACE("(%p, %p): Loading\n", This, stream); @@ -807,7 +810,18 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream break; case mmioFOURCC('M','T','h','d'): - FIXME("MIDI file loading not supported\n"); + hr = midi_parser_new(stream, &midi_parser); + if (FAILED(hr)) break; + This->header.mtLength = 0; + while ((hr = midi_parser_next_track(midi_parser, &track, &length)) == S_OK) + { + hr = segment_append_track(This, track, 1, 0); + IDirectMusicTrack_Release(track); + if (FAILED(hr)) break; + if (length > This->header.mtLength) + This->header.mtLength = length; + } + midi_parser_destroy(midi_parser); break; case MAKE_IDTYPE(FOURCC_RIFF, mmioFOURCC('W','A','V','E')):

1 0

Brendan Shanks : ntdll: Assume process-private futexes are always present on Linux.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 455086e2958f9118ed7a1f9f52cc90964b8c7dd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/455086e2958f9118ed7a1f9f52cc90… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 1 09:39:14 2024 -0800 ntdll: Assume process-private futexes are always present on Linux. --- README.md | 2 +- dlls/ntdll/unix/sync.c | 59 ++++++++++++++------------------------------------ 2 files changed, 17 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 888e95895e2..8a804b30dfc 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ especially the wealth of information found at https://www.winehq.org. To compile and run Wine, you must have one of the following: -- Linux version 2.0.36 or later +- Linux version 2.6.22 or later - FreeBSD 12.4 or later - Solaris x86 9 or later - NetBSD-current diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index bfbcaf4a851..1df2ea6e9d2 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -103,10 +103,7 @@ static inline ULONGLONG monotonic_counter(void) #ifdef __linux__ -#define FUTEX_WAIT 0 -#define FUTEX_WAKE 1 - -static int futex_private = 128; +#include <linux/futex.h> static inline int futex_wait( const LONG *addr, int val, struct timespec *timeout ) { @@ -118,32 +115,15 @@ static inline int futex_wait( const LONG *addr, int val, struct timespec *timeou long tv_nsec; } timeout32 = { timeout->tv_sec, timeout->tv_nsec }; - return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, &timeout32, 0, 0 ); + return syscall( __NR_futex, addr, FUTEX_WAIT_PRIVATE, val, &timeout32, 0, 0 ); } #endif - return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, timeout, 0, 0 ); + return syscall( __NR_futex, addr, FUTEX_WAIT_PRIVATE, val, timeout, 0, 0 ); } static inline int futex_wake( const LONG *addr, int val ) { - return syscall( __NR_futex, addr, FUTEX_WAKE | futex_private, val, NULL, 0, 0 ); -} - -static inline int use_futexes(void) -{ - static LONG supported = -1; - - if (supported == -1) - { - futex_wait( &supported, 10, NULL ); - if (errno == ENOSYS) - { - futex_private = 0; - futex_wait( &supported, 10, NULL ); - } - supported = (errno != ENOSYS); - } - return supported; + return syscall( __NR_futex, addr, FUTEX_WAKE_PRIVATE, val, NULL, 0, 0 ); } #endif @@ -2356,11 +2336,10 @@ union tid_alert_entry { #ifdef HAVE_KQUEUE int kq; +#elif defined(__linux__) + LONG futex; #else HANDLE event; -#ifdef __linux__ - LONG futex; -#endif #endif }; @@ -2426,12 +2405,9 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (InterlockedCompareExchange( (LONG *)&entry->kq, kq, 0 )) close( kq ); } +#elif defined(__linux__) + return entry; #else -#ifdef __linux__ - if (use_futexes()) - return entry; -#endif - if (!entry->event) { HANDLE event; @@ -2473,17 +2449,14 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) kevent( entry->kq, &signal_event, 1, NULL, 0, NULL ); return STATUS_SUCCESS; } -#else -#ifdef __linux__ - if (use_futexes()) +#elif defined(__linux__) { LONG *futex = &entry->futex; if (!InterlockedExchange( futex, 1 )) futex_wake( futex, 1 ); return STATUS_SUCCESS; } -#endif - +#else return NtSetEvent( entry->event, NULL ); #endif } @@ -2571,14 +2544,12 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) { union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); - NTSTATUS status; TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); if (!entry) return STATUS_INVALID_CID; #ifdef __linux__ - if (use_futexes()) { LONG *futex = &entry->futex; ULONGLONG end; @@ -2610,11 +2581,13 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG } return STATUS_ALERTED; } +#else + { + NTSTATUS status = NtWaitForSingleObject( entry->event, FALSE, timeout ); + if (!status) return STATUS_ALERTED; + return status; + } #endif - - status = NtWaitForSingleObject( entry->event, FALSE, timeout ); - if (!status) return STATUS_ALERTED; - return status; } #endif

1 0

Yuxuan Shui : dmime/tests: Add MIDI loading test.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 4434c17c9420452a6c3221acfc2ba517f81e958c URL: https://gitlab.winehq.org/wine/wine/-/commit/4434c17c9420452a6c3221acfc2ba5… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jan 31 01:31:14 2024 +0000 dmime/tests: Add MIDI loading test. Besides a seq track and a tempo track, Windows also adds a "fake" band track to segments loaded from MIDI files, which handles soundfont loading etc. --- dlls/dmime/tests/bogus.mid | Bin 0 -> 163 bytes dlls/dmime/tests/dmime.c | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/tests/resource.rc | 4 ++++ dlls/dmime/tests/test.mid | Bin 0 -> 163 bytes 4 files changed, 48 insertions(+) diff --git a/dlls/dmime/tests/bogus.mid b/dlls/dmime/tests/bogus.mid new file mode 100644 index 00000000000..5b88aab0f07 Binary files /dev/null and b/dlls/dmime/tests/bogus.mid differ diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 218dc01045d..eaeff2e86bc 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1554,6 +1554,49 @@ static void test_segment(void) while (IDirectMusicSegment_Release(dms)); } +static void test_midi(void) +{ + IDirectMusicSegment8 *segment = NULL; + IDirectMusicTrack *track = NULL; + IDirectMusicLoader8 *loader; + WCHAR test_mid[MAX_PATH], bogus_mid[MAX_PATH]; + HRESULT hr; + + load_resource(L"test.mid", test_mid); + /* This is a MIDI file with wrong track length. */ + load_resource(L"bogus.mid", bogus_mid); + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicLoader8, (void **)&loader); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicLoader8_LoadObjectFromFile(loader, &CLSID_DirectMusicSegment, + &IID_IDirectMusicSegment, test_mid, (void **)&segment); + ok(hr == S_OK, "got %#lx\n", hr); + + /* test.mid has 1 seq track, 1 tempo track, and 1 band track */ + hr = IDirectMusicSegment8_GetTrack(segment, &CLSID_DirectMusicBandTrack, 0xffffffff, 0, &track); + todo_wine ok(hr == S_OK, "unable to get band track from midi file: %#lx\n", hr); + if (track)IDirectMusicTrack_Release(track); + track = NULL; + hr = IDirectMusicSegment8_GetTrack(segment, &CLSID_DirectMusicSeqTrack, 0xffffffff, 0, &track); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + if (track) IDirectMusicTrack_Release(track); + track = NULL; + hr = IDirectMusicSegment8_GetTrack(segment, &CLSID_DirectMusicTempoTrack, 0xffffffff, 0, &track); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + if (track) IDirectMusicTrack_Release(track); + track = NULL; + if (segment) IDirectMusicSegment8_Release(segment); + segment = NULL; + + hr = IDirectMusicLoader8_LoadObjectFromFile(loader, &CLSID_DirectMusicSegment, + &IID_IDirectMusicSegment, bogus_mid, (void **)&segment); + ok(hr == S_OK, "got %#lx\n", hr); + if (segment) IDirectMusicSegment8_Release(segment); + + IDirectMusicLoader8_Release(loader); +} + static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *name, DWORD group) { IDirectMusicTrack *track; @@ -4724,6 +4767,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); + test_midi(); test_gettrack(); test_segment_param(); test_track(); diff --git a/dlls/dmime/tests/resource.rc b/dlls/dmime/tests/resource.rc index d49b647b934..4d8f512af84 100644 --- a/dlls/dmime/tests/resource.rc +++ b/dlls/dmime/tests/resource.rc @@ -21,3 +21,7 @@ /* ffmpeg -f lavfi -i "sine=frequency=600" -t 0.1 -ar 44100 -f wav -acodec pcm_u8 test.wav */ /* @makedep: test.wav */ test.wav RCDATA test.wav +/* @makedep: test.mid */ +test.mid RCDATA test.mid +/* @makedep: bogus.mid */ +bogus.mid RCDATA bogus.mid diff --git a/dlls/dmime/tests/test.mid b/dlls/dmime/tests/test.mid new file mode 100644 index 00000000000..7a46eb85d11 Binary files /dev/null and b/dlls/dmime/tests/test.mid differ

1 0

Alexandre Julliard : ntdll: Implement RtlVirtualUnwind for ARM64EC.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: cb2013e7b40ba796a42b32d2e6a08cee4191b3ec URL: https://gitlab.winehq.org/wine/wine/-/commit/cb2013e7b40ba796a42b32d2e6a08c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 16:04:18 2024 +0100 ntdll: Implement RtlVirtualUnwind for ARM64EC. --- dlls/ntdll/ntdll_misc.h | 5 +++++ dlls/ntdll/signal_arm64ec.c | 17 ++--------------- dlls/ntdll/unwind.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 40273d8944a..dedf0484b55 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -84,6 +84,11 @@ extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG); extern void WINAPI KiUserCallbackDispatcherReturn(void); extern void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ); +#ifdef __arm64ec__ +extern void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ); +extern void context_arm_to_x64( CONTEXT *ctx, const ARM64_NT_CONTEXT *arm_ctx ); +#endif + /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ); extern const char *debugstr_exception_code( DWORD code ); diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 3f1869a644f..ddf37ea6545 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -130,7 +130,7 @@ static UINT fpcsr_to_mxcsr( UINT fpcr, UINT fpsr ) return ret; } -static void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ) +void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ) { ARM64EC_NT_CONTEXT *ec_ctx = (ARM64EC_NT_CONTEXT *)ctx; UINT64 fpcsr; @@ -177,7 +177,7 @@ static void context_x64_to_arm( ARM64_NT_CONTEXT *arm_ctx, const CONTEXT *ctx ) arm_ctx->Fpsr = fpcsr >> 32; } -static void context_arm_to_x64( CONTEXT *ctx, const ARM64_NT_CONTEXT *arm_ctx ) +void context_arm_to_x64( CONTEXT *ctx, const ARM64_NT_CONTEXT *arm_ctx ) { ARM64EC_NT_CONTEXT *ec_ctx = (ARM64EC_NT_CONTEXT *)ctx; @@ -1769,19 +1769,6 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) } -/********************************************************************** - * RtlVirtualUnwind (NTDLL.@) - */ -PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, - RUNTIME_FUNCTION *function, CONTEXT *context, - PVOID *data, ULONG64 *frame_ret, - KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr ) -{ - FIXME( "not implemented\n" ); - return NULL; -} - - /******************************************************************* * RtlUnwindEx (NTDLL.@) */ diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index db95f12ebb2..be99fe67453 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -1751,6 +1751,20 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, unsigned int i, prolog_offset; BOOL mach_frame = FALSE; +#ifdef __arm64ec__ + if (RtlIsEcCode( (void *)pc )) + { + ARM64_NT_CONTEXT arm_context; + void *ret; + + context_x64_to_arm( &arm_context, context ); + ret = RtlVirtualUnwind_arm64( type, base, pc, (ARM64_RUNTIME_FUNCTION *)function, + &arm_context, data, frame_ret, NULL ); + context_arm_to_x64( context, &arm_context ); + return ret; + } +#endif + TRACE( "type %lx rip %I64x rsp %I64x\n", type, pc, context->Rsp ); if (TRACE_ON(unwind)) dump_unwind_info( base, function );

1 0

Alexandre Julliard : ntdll: Move the dynamic unwind tables to unwind.c.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 8602a1c24e887b310339a4b75dafe2fbf810a93c URL: https://gitlab.winehq.org/wine/wine/-/commit/8602a1c24e887b310339a4b75dafe2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 19:03:46 2024 +0100 ntdll: Move the dynamic unwind tables to unwind.c. --- dlls/ntdll/exception.c | 204 -------------------------------------- dlls/ntdll/ntdll_misc.h | 4 - dlls/ntdll/signal_arm.c | 13 --- dlls/ntdll/signal_arm64.c | 13 --- dlls/ntdll/signal_arm64ec.c | 29 ------ dlls/ntdll/signal_x86_64.c | 13 --- dlls/ntdll/unwind.c | 234 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 234 insertions(+), 276 deletions(-)

1 0

Rémi Bernon : mouhid.sys: Request preparsed data and inspect device caps.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: a05b67b7e5e63bbe3eabc4aa1b071869160023c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a05b67b7e5e63bbe3eabc4aa1b0718… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 12:33:18 2024 +0100 mouhid.sys: Request preparsed data and inspect device caps. --- dlls/dinput/tests/device8.c | 1 - dlls/mouhid.sys/Makefile.in | 2 +- dlls/mouhid.sys/main.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index fa5b800b74f..2c44bb4c5c6 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1906,7 +1906,6 @@ static void test_hid_touch_screen(void) .report_id = 1, .report_len = 2, .report_buf = {1,0x02}, - .todo = TRUE, }; RAWINPUTDEVICE rawdevice = {.usUsagePage = HID_USAGE_PAGE_DIGITIZER, .usUsage = HID_USAGE_DIGITIZER_TOUCH_SCREEN}; diff --git a/dlls/mouhid.sys/Makefile.in b/dlls/mouhid.sys/Makefile.in index 0003f6f5494..331486bc104 100644 --- a/dlls/mouhid.sys/Makefile.in +++ b/dlls/mouhid.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = mouhid.sys -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl hidparse EXTRADLLFLAGS = -Wl,--subsystem,native SOURCES = \ diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index af54ffbd70b..f652857f7ac 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -42,6 +42,13 @@ struct device { LONG removed; DEVICE_OBJECT *bus_device; + PHIDP_PREPARSED_DATA preparsed; + + ULONG caps_count; + ULONG contact_max; + HIDP_VALUE_CAPS *id_caps; + HIDP_VALUE_CAPS *x_caps; + HIDP_VALUE_CAPS *y_caps; }; static inline struct device *impl_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) @@ -49,6 +56,21 @@ static inline struct device *impl_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) return (struct device *)device->DeviceExtension; } +static inline LONG sign_extend( ULONG value, const HIDP_VALUE_CAPS *caps ) +{ + UINT sign = 1 << (caps->BitSize - 1); + if (sign <= 1 || caps->LogicalMin >= 0) return value; + return value - ((value & sign) << 1); +} + +static inline LONG scale_value( ULONG value, const HIDP_VALUE_CAPS *caps, LONG min, LONG max ) +{ + LONG tmp = sign_extend( value, caps ); + if (caps->LogicalMin > caps->LogicalMax) return 0; + if (caps->LogicalMin > tmp || caps->LogicalMax < tmp) return 0; + return min + MulDiv( tmp - caps->LogicalMin, max - min, caps->LogicalMax - caps->LogicalMin ); +} + static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -69,6 +91,98 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) return IoCallDriver( impl->bus_device, irp ); } +static NTSTATUS call_hid_device( DEVICE_OBJECT *device, DWORD major, DWORD code, void *in_buf, + DWORD in_len, void *out_buf, DWORD out_len ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + IO_STATUS_BLOCK io; + NTSTATUS status; + KEVENT event; + IRP *irp; + + KeInitializeEvent( &event, NotificationEvent, FALSE ); + irp = IoBuildDeviceIoControlRequest( code, device, in_buf, in_len, out_buf, out_len, + FALSE, &event, &io ); + if (!irp) return STATUS_NO_MEMORY; + + status = IoCallDriver( impl->bus_device, irp ); + if (status == STATUS_PENDING) KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); + return io.Status; +} + +static NTSTATUS initialize_device( DEVICE_OBJECT *device ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + HID_COLLECTION_INFORMATION info; + USHORT usage, count, report_len; + HIDP_VALUE_CAPS value_caps; + char *report_buf; + NTSTATUS status; + HIDP_CAPS caps; + + if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_INFORMATION, + &info, 0, &info, sizeof(info) ))) + return status; + if (!(impl->preparsed = malloc( info.DescriptorSize ))) return STATUS_NO_MEMORY; + if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, + NULL, 0, impl->preparsed, info.DescriptorSize ))) + return status; + + status = HidP_GetCaps( impl->preparsed, &caps ); + if (status != HIDP_STATUS_SUCCESS) return status; + + count = 1; + usage = HID_USAGE_DIGITIZER_CONTACT_COUNT_MAX; + status = HidP_GetSpecificValueCaps( HidP_Feature, HID_USAGE_PAGE_DIGITIZER, 0, usage, + &value_caps, &count, impl->preparsed ); + if (status == HIDP_STATUS_SUCCESS) + { + report_len = caps.FeatureReportByteLength; + if (!(report_buf = malloc( report_len ))) return STATUS_NO_MEMORY; + report_buf[0] = value_caps.ReportID; + + status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_FEATURE, NULL, 0, report_buf, report_len ); + if (!status) status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_DIGITIZER, 0, usage, + &impl->contact_max, impl->preparsed, report_buf, report_len ); + free( report_buf ); + if (status && status != HIDP_STATUS_SUCCESS) return status; + + count = 1; + usage = HID_USAGE_DIGITIZER_CONTACT_COUNT; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_DIGITIZER, 0, usage, + &value_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + + count = caps.NumberLinkCollectionNodes; + usage = HID_USAGE_DIGITIZER_CONTACT_ID; + if (!(impl->id_caps = malloc( sizeof(*impl->id_caps) * caps.NumberLinkCollectionNodes ))) return STATUS_NO_MEMORY; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_DIGITIZER, 0, usage, + impl->id_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + impl->caps_count = count; + + count = impl->caps_count; + usage = HID_USAGE_GENERIC_X; + if (!(impl->x_caps = malloc( sizeof(*impl->x_caps) * impl->caps_count ))) return STATUS_NO_MEMORY; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, usage, + impl->x_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + + count = impl->caps_count; + usage = HID_USAGE_GENERIC_Y; + if (!(impl->y_caps = malloc( sizeof(*impl->y_caps) * impl->caps_count ))) return STATUS_NO_MEMORY; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, usage, + impl->y_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + + return STATUS_SUCCESS; + } + +failed: + ERR( "%#x usage not found, unsupported device\n", usage ); + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS WINAPI set_event_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { if (irp->PendingReturned) KeSetEvent( (KEVENT *)context, IO_NO_INCREMENT, FALSE ); @@ -98,6 +212,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); status = irp->IoStatus.Status; } + if (!status) status = initialize_device( device ); if (status) irp->IoStatus.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -111,6 +226,10 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) IoSkipCurrentIrpStackLocation( irp ); status = IoCallDriver( impl->bus_device, irp ); IoDetachDevice( impl->bus_device ); + free( impl->id_caps ); + free( impl->x_caps ); + free( impl->y_caps ); + free( impl->preparsed ); IoDeleteDevice( device ); return status;

1 0

Rémi Bernon : mouhid.sys: Read reports from the underlying HID device.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 683710fbc7a9e61da15f5896fc4c4ae073d8d803 URL: https://gitlab.winehq.org/wine/wine/-/commit/683710fbc7a9e61da15f5896fc4c4a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:38:46 2024 +0100 mouhid.sys: Read reports from the underlying HID device. --- dlls/mouhid.sys/main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index f652857f7ac..247740301a5 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -44,6 +44,11 @@ struct device DEVICE_OBJECT *bus_device; PHIDP_PREPARSED_DATA preparsed; + FILE_OBJECT dummy_file; + IO_STATUS_BLOCK io; + ULONG report_len; + char *report_buf; + ULONG caps_count; ULONG contact_max; HIDP_VALUE_CAPS *id_caps; @@ -71,6 +76,71 @@ static inline LONG scale_value( ULONG value, const HIDP_VALUE_CAPS *caps, LONG m return min + MulDiv( tmp - caps->LogicalMin, max - min, caps->LogicalMax - caps->LogicalMin ); } +static NTSTATUS WINAPI read_completion( DEVICE_OBJECT *device, IRP *irp, void *context ); + +static NTSTATUS start_device_read( DEVICE_OBJECT *device ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + IO_STACK_LOCATION *stack; + NTSTATUS status; + IRP *irp; + + TRACE( "device %p\n", device ); + + irp = IoBuildAsynchronousFsdRequest( IRP_MJ_READ, device, impl->report_buf, + impl->report_len, NULL, &impl->io ); + if (!irp) return STATUS_NO_MEMORY; + irp->Tail.Overlay.OriginalFileObject = &impl->dummy_file; + stack = IoGetNextIrpStackLocation( irp ); + stack->FileObject = &impl->dummy_file; + + TRACE( "created irp %p\n", irp ); + + IoSetCompletionRoutine( irp, read_completion, device, TRUE, TRUE, TRUE ); + if ((status = IoCallDriver( impl->bus_device, irp )) && status != STATUS_PENDING) return status; + return STATUS_SUCCESS; +} + +static void process_hid_report( struct device *impl, char *report_buf, UINT report_len ) +{ + ULONG contact_count; + NTSTATUS status; + + TRACE( "impl %p, report_buf %p, report_len %u\n", impl, report_buf, report_len ); + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_DIGITIZER, 0, HID_USAGE_DIGITIZER_CONTACT_COUNT, + &contact_count, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return; + if (contact_count > impl->contact_max) + { + WARN( "got %lu contacts, capping to %lu.\n", contact_count, impl->contact_max ); + contact_count = impl->contact_max; + } + + FIXME( "Not implemented\n" ); +} + +static NTSTATUS WINAPI read_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( context ); + NTSTATUS status; + + TRACE( "device %p, irp %p, context %p\n", device, irp, context ); + + if (irp->IoStatus.Status) + WARN( "device read failed with status %#lx, stopping\n", irp->IoStatus.Status ); + else + { + process_hid_report( impl, impl->report_buf, impl->report_len ); + + if (!InterlockedOr( &impl->removed, FALSE ) && (status = start_device_read( context ))) + ERR( "Failed to start next read, status %#lx\n", status ); + } + + if (irp->PendingReturned) IoMarkIrpPending( irp ); + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -95,16 +165,26 @@ static NTSTATUS call_hid_device( DEVICE_OBJECT *device, DWORD major, DWORD code, DWORD in_len, void *out_buf, DWORD out_len ) { struct device *impl = impl_from_DEVICE_OBJECT( device ); + IO_STACK_LOCATION *stack; IO_STATUS_BLOCK io; NTSTATUS status; KEVENT event; IRP *irp; KeInitializeEvent( &event, NotificationEvent, FALSE ); - irp = IoBuildDeviceIoControlRequest( code, device, in_buf, in_len, out_buf, out_len, - FALSE, &event, &io ); + if (major == IRP_MJ_DEVICE_CONTROL) + irp = IoBuildDeviceIoControlRequest( code, device, in_buf, in_len, out_buf, out_len, + FALSE, &event, &io ); + else + irp = IoBuildSynchronousFsdRequest( code, device, out_buf, out_len, NULL, &event, &io ); if (!irp) return STATUS_NO_MEMORY; + irp->Tail.Overlay.OriginalFileObject = &impl->dummy_file; + if (code == IRP_MJ_CREATE) irp->Flags |= IRP_CREATE_OPERATION; + if (code == IRP_MJ_CLOSE) irp->Flags |= IRP_CLOSE_OPERATION; + stack = IoGetNextIrpStackLocation( irp ); + stack->FileObject = &impl->dummy_file; + status = IoCallDriver( impl->bus_device, irp ); if (status == STATUS_PENDING) KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); return io.Status; @@ -120,6 +200,7 @@ static NTSTATUS initialize_device( DEVICE_OBJECT *device ) NTSTATUS status; HIDP_CAPS caps; + if ((status = call_hid_device( device, IRP_MJ_CREATE, 0, NULL, 0, NULL, 0 ))) return status; if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_INFORMATION, &info, 0, &info, sizeof(info) ))) return status; @@ -175,6 +256,10 @@ static NTSTATUS initialize_device( DEVICE_OBJECT *device ) impl->y_caps, &count, impl->preparsed ); if (status != HIDP_STATUS_SUCCESS) goto failed; + impl->report_len = caps.InputReportByteLength; + if (!(impl->report_buf = malloc( impl->report_len ))) return STATUS_NO_MEMORY; + impl->report_buf[0] = value_caps.ReportID; + return STATUS_SUCCESS; } @@ -213,6 +298,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) status = irp->IoStatus.Status; } if (!status) status = initialize_device( device ); + if (!status) status = start_device_read( device ); if (status) irp->IoStatus.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -220,6 +306,8 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) case IRP_MN_SURPRISE_REMOVAL: status = STATUS_SUCCESS; + if (InterlockedExchange( &impl->removed, TRUE )) break; + call_hid_device( device, IRP_MJ_CLOSE, 0, NULL, 0, NULL, 0 ); break; case IRP_MN_REMOVE_DEVICE: @@ -229,6 +317,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) free( impl->id_caps ); free( impl->x_caps ); free( impl->y_caps ); + free( impl->report_buf ); free( impl->preparsed ); IoDeleteDevice( device ); return status;

1 0

Rémi Bernon : mouhid.sys: Parse HID reports to track contact points.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: d88f92eb4e5f149e7d2d91a5546a875ad8085eff URL: https://gitlab.winehq.org/wine/wine/-/commit/d88f92eb4e5f149e7d2d91a5546a87… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:31:37 2024 +0100 mouhid.sys: Parse HID reports to track contact points. --- dlls/mouhid.sys/main.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index 247740301a5..c1b4288e1dd 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +struct contact +{ + struct list entry; + ULONG id; + POINT pos; +}; + struct device { LONG removed; @@ -49,6 +56,9 @@ struct device ULONG report_len; char *report_buf; + ULONG contact_count; + struct list contacts; + ULONG caps_count; ULONG contact_max; HIDP_VALUE_CAPS *id_caps; @@ -101,10 +111,56 @@ static NTSTATUS start_device_read( DEVICE_OBJECT *device ) return STATUS_SUCCESS; } +static void add_contact( struct device *impl, struct list *old_contacts, ULONG id, LONG x, LONG y ) +{ + struct contact *contact; + + LIST_FOR_EACH_ENTRY( contact, old_contacts, struct contact, entry ) + if (contact->id == id) break; + + if (&contact->entry != old_contacts) + { + list_remove( &contact->entry ); + + contact->pos.x = x; + contact->pos.y = y; + TRACE( "updating contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + } + else if ((contact = calloc( 1, sizeof(*contact) ))) + { + contact->id = id; + contact->pos.x = x; + contact->pos.y = y; + TRACE( "new contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + } + else + { + ERR( "failed to allocate new contact\n" ); + return; + } + + list_add_tail( &impl->contacts, &contact->entry ); +} + +static void release_contacts( struct list *contacts ) +{ + struct contact *contact, *next; + + LIST_FOR_EACH_ENTRY_SAFE( contact, next, contacts, struct contact, entry ) + { + TRACE( "releasing contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + list_remove( &contact->entry ); + free( contact ); + } +} + static void process_hid_report( struct device *impl, char *report_buf, UINT report_len ) { - ULONG contact_count; + struct list old_contacts = LIST_INIT( old_contacts ); + ULONG i, value, contact_count, usage_count, id; + LONG x = 0, y = 0; NTSTATUS status; + USHORT usage; TRACE( "impl %p, report_buf %p, report_len %u\n", impl, report_buf, report_len ); @@ -117,7 +173,36 @@ static void process_hid_report( struct device *impl, char *report_buf, UINT repo contact_count = impl->contact_max; } - FIXME( "Not implemented\n" ); + list_move_tail( &old_contacts, &impl->contacts ); + + for (i = 0; i < impl->caps_count; i++) + { + USHORT collection = impl->id_caps[i].LinkCollection; + + usage_count = 1; + usage = HID_USAGE_DIGITIZER_TIP_SWITCH; + status = HidP_GetUsages( HidP_Input, HID_USAGE_PAGE_DIGITIZER, collection, &usage, &usage_count, + impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS || !usage_count) continue; + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_DIGITIZER, collection, HID_USAGE_DIGITIZER_CONTACT_ID, + &id, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) continue; + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, collection, HID_USAGE_GENERIC_X, + &value, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) continue; + else x = scale_value( value, impl->x_caps + i, 0, 65535 ); + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, collection, HID_USAGE_GENERIC_Y, + &value, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) continue; + else y = scale_value( value, impl->y_caps + i, 0, 65535 ); + + add_contact( impl, &old_contacts, id, x, y ); + } + + release_contacts( &old_contacts ); } static NTSTATUS WINAPI read_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) @@ -200,6 +285,8 @@ static NTSTATUS initialize_device( DEVICE_OBJECT *device ) NTSTATUS status; HIDP_CAPS caps; + list_init( &impl->contacts ); + if ((status = call_hid_device( device, IRP_MJ_CREATE, 0, NULL, 0, NULL, 0 ))) return status; if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_INFORMATION, &info, 0, &info, sizeof(info) ))) @@ -314,6 +401,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) IoSkipCurrentIrpStackLocation( irp ); status = IoCallDriver( impl->bus_device, irp ); IoDetachDevice( impl->bus_device ); + release_contacts( &impl->contacts ); free( impl->id_caps ); free( impl->x_caps ); free( impl->y_caps );

1 0

Alexandre Julliard : ntdll: Move exception unwinding code to a separate file.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: a5a253820f3a4a21e2eafc80e4f9a80540c87d68 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5a253820f3a4a21e2eafc80e4f9a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 12:38:05 2024 +0100 ntdll: Move exception unwinding code to a separate file. --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/signal_arm.c | 626 ---------------- dlls/ntdll/signal_arm64.c | 537 -------------- dlls/ntdll/signal_arm64ec.c | 100 --- dlls/ntdll/signal_x86_64.c | 530 -------------- dlls/ntdll/unwind.c | 1685 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1686 insertions(+), 1793 deletions(-)

1 0

Alexandre Julliard : ntdll: Move RtlUnwind to unwind.c.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 3b85ab31a9179f46de12ab4cc8807eb8f701efc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b85ab31a9179f46de12ab4cc8807e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 19:13:27 2024 +0100 ntdll: Move RtlUnwind to unwind.c. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 19 ------------------- dlls/ntdll/signal_arm64.c | 18 ------------------ dlls/ntdll/signal_arm64ec.c | 19 ------------------- dlls/ntdll/signal_x86_64.c | 19 ------------------- dlls/ntdll/unwind.c | 24 ++++++++++++++++++++++++ 6 files changed, 25 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ccd270fee95..66995346e57 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1513,7 +1513,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stdcall -arch=arm __jump_unwind(ptr ptr) +@ stdcall -arch=arm __jump_unwind(ptr ptr) _local_unwind @ cdecl __toascii(long) @ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 12ab2860fa7..b07f91464a9 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -827,25 +827,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/*********************************************************************** - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - - -/******************************************************************* - * __jump_unwind (NTDLL.@) - */ -void WINAPI __jump_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 53d8cbfe304..0d6a88ed799 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -841,24 +841,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/*********************************************************************** - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile); diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 8b4fd399c09..3f1869a644f 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1792,25 +1792,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/******************************************************************* - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - FIXME( "not implemented\n" ); -} - - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - - /******************************************************************* * __C_specific_handler (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1dc4c9b75df..1396887bcc9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -981,25 +981,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/******************************************************************* - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - /******************************************************************* * __C_specific_handler (NTDLL.@) */ diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 42b119544fa..db95f12ebb2 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -1916,4 +1916,28 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P #endif /* __x86_64__ */ + +/*********************************************************************** + * Generic unwind functions + */ + + +/*********************************************************************** + * RtlUnwind (NTDLL.@) + */ +void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); +} + + +/******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + RtlUnwind( frame, target_ip, NULL, NULL ); +} + #endif /* !__i386__ */

1 0