wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Eric Pouech : dbghelp: Search subdirectories in element path.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: d05b7c8e193d4a7e73a391bd4bc812d33dd1989a URL: https://gitlab.winehq.org/wine/wine/-/commit/d05b7c8e193d4a7e73a391bd4bc812… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Feb 25 10:36:55 2024 +0100 dbghelp: Search subdirectories in element path. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/path.c | 46 ++++++++++++++++++++++++++++------------------ dlls/dbghelp/tests/path.c | 4 ---- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 0565442bb8b..db0873f133c 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -510,7 +510,7 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul SYMSRV_INDEX_INFOW *info, BOOL* is_unmatched) { struct module_find mf; - WCHAR *ptr; + WCHAR *ptr, *ext; const WCHAR* filename; WCHAR *searchPath = pcs->search_path; WCHAR buffer[MAX_PATH]; @@ -539,22 +539,9 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul /* FIXME: Use Environment-Variables (see MS docs) _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH - FIXME: Implement "Standard Path Elements" (Path) ... (see MS docs) - do a search for (every?) path-element like this ... - <path> - <path>\dll - <path>\symbols\dll - (dll may be exe, or sys depending on the file extension) */ - - /* 2. check module-path */ - file_pathW(module->module.LoadedImageName, buffer); - if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; - if (module->real_path) - { - file_pathW(module->real_path, buffer); - if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; - } + */ + ext = wcsrchr(module->module.LoadedImageName, L'.'); while (searchPath) { size_t len; @@ -562,17 +549,40 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul ptr = wcschr(searchPath, ';'); len = (ptr) ? ptr - searchPath : wcslen(searchPath); - if (len < ARRAY_SIZE(buffer)) + if (len + 1 < ARRAY_SIZE(buffer)) { memcpy(buffer, searchPath, len * sizeof(WCHAR)); - buffer[len] = '\0'; + buffer[len] = L'\0'; /* return first fully matched file */ if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + len = wcslen(buffer); /* do_searchW removes the trailing \ in buffer when present */ + /* check once max size for \symbols\<ext>\ */ + if (ext && len + 9 /* \symbols\ */ + wcslen(ext + 1) + 1 + 1 <= ARRAY_SIZE(buffer)) + { + buffer[len++] = L'\\'; + wcscpy(buffer + len, ext + 1); + wcscat(buffer + len, L"\\"); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + wcscpy(buffer + len, L"symbols\\"); + wcscat(buffer + len, ext + 1); + wcscat(buffer + len, L"\\"); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + } } else ERR("Too long search element %ls\n", searchPath); searchPath = ptr ? ptr + 1 : NULL; } + + /* check module-path */ + if (module->real_path) + { + file_pathW(module->real_path, buffer); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + } + file_pathW(module->module.LoadedImageName, buffer); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + /* if no fully matching file is found, return the best matching file if any */ if ((dbghelp_options & SYMOPT_LOAD_ANYTHING) && mf.matched) { diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index f45cfd29b58..45b71ed4718 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -1581,16 +1581,12 @@ static void test_load_modules_path(void) } else { - todo_wine_if(i == 4 || i == 5 || i == 7 || i == 8 || i == 11) ok(im.SymType == SymPdb, "Unexpected symtype %x\n", im.SymType); make_path(filename, topdir, NULL, test_files[test->found_file].module_path); - todo_wine_if(i == 2 || i == 4 || i == 5 || i == 7 || i == 8 || i == 11 || i == 21) ok(!wcscmp(im.LoadedPdbName, filename), "Expected %ls as loaded pdb file, got '%ls' instead\n", test_files[test->found_file].module_path, im.LoadedPdbName); - todo_wine_if(i == 11 || i == 21) ok(im.PdbAge == test_files[test->found_file].age_or_timestamp, "Expected %lx as pdb-age, got %lx instead\n", test_files[test->found_file].age_or_timestamp, im.PdbAge); - todo_wine_if(i == 11) ok(im.PdbUnmatched == !(test_files[test->found_file].age_or_timestamp == 0x0030cafe), "Expecting matched PDB\n"); } ok(IsEqualGUID(&im.PdbSig70, &guid1), "Unexpected PDB GUID\n");

1 0

Yuxuan Shui : dmime: Handle MIDI control events in MIDI files.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 28b94c4d4267230572d8df95d4020ed09d36ebad URL: https://gitlab.winehq.org/wine/wine/-/commit/28b94c4d4267230572d8df95d4020e… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Feb 22 18:08:17 2024 +0000 dmime: Handle MIDI control events in MIDI files. Adding them to the seqtrack, and also implementing playing them from the seqtrack. --- dlls/dmime/midi.c | 48 ++++++++++++++++++++++++++++++++---------------- dlls/dmime/seqtrack.c | 42 +++++++++++++++++++++++++++++++----------- dlls/dmime/tests/dmime.c | 29 ++++++++++++++++++++++++++--- 3 files changed, 89 insertions(+), 30 deletions(-) diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c index e4aa165815d..57b6a3adf90 100644 --- a/dlls/dmime/midi.c +++ b/dlls/dmime/midi.c @@ -187,22 +187,12 @@ static HRESULT read_midi_event(IStream *stream, struct midi_event *event, BYTE * status_type = event->status & 0xf0; event->data[0] = byte; - if (status_type == MIDI_PROGRAM_CHANGE) - { - TRACE("MIDI program change event status %#02x, data: %#02x, time +%lu\n", event->status, - event->data[0], delta_time); - } - else - { - if (status_type != MIDI_CHANNEL_PRESSURE && (hr = stream_read_at_most(stream, &byte, 1, bytes_left)) != S_OK) - return hr; - event->data[1] = byte; - if (status_type == MIDI_NOTE_ON || status_type == MIDI_NOTE_OFF) - TRACE("MIDI note event status %#02x, data: %#02x, %#02x, time +%lu\n", event->status, - event->data[0], event->data[1], delta_time); - else - FIXME("MIDI event status %#02x, time +%lu, not supported\n", event->status, delta_time); - } + if (status_type != MIDI_PROGRAM_CHANGE && status_type != MIDI_CHANNEL_PRESSURE && + (hr = stream_read_at_most(stream, &byte, 1, bytes_left)) != S_OK) + return hr; + event->data[1] = byte; + TRACE("MIDI event status %#02x, data: %#02x, %#02x, time +%lu\n", event->status, event->data[0], + event->data[1], delta_time); return S_OK; } @@ -303,6 +293,27 @@ static HRESULT midi_parser_handle_note_on_off(struct midi_parser *parser, struct return S_OK; } +static HRESULT midi_parser_handle_control(struct midi_parser *parser, struct midi_event *event) +{ + struct midi_seqtrack_item *item; + DMUS_IO_SEQ_ITEM *seq_item; + MUSIC_TIME dmusic_time = (ULONGLONG)parser->time * DMUS_PPQ / parser->division; + + if ((item = calloc(1, sizeof(struct midi_seqtrack_item))) == NULL) return E_OUTOFMEMORY; + + seq_item = &item->item; + seq_item->mtTime = dmusic_time; + seq_item->mtDuration = 0; + seq_item->dwPChannel = event->status & 0xf; + seq_item->bStatus = event->status & 0xf0; + seq_item->bByte1 = event->data[0]; + seq_item->bByte2 = event->data[1]; + list_add_tail(&parser->seqtrack_items, &item->entry); + parser->seqtrack_items_count++; + + return S_OK; +} + static int midi_seqtrack_item_compare(const void *a, const void *b) { const DMUS_IO_SEQ_ITEM *item_a = a, *item_b = b; @@ -351,6 +362,11 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment case MIDI_NOTE_OFF: hr = midi_parser_handle_note_on_off(parser, &event); break; + case MIDI_CHANNEL_PRESSURE: + case MIDI_PITCH_BEND_CHANGE: + case MIDI_CONTROL_CHANGE: + hr = midi_parser_handle_control(parser, &event); + break; case MIDI_PROGRAM_CHANGE: hr = midi_parser_handle_program_change(parser, &event); break; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index fc50009402a..1b0e99bd77c 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dmusic_midi.h" #include "dmime_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -130,27 +131,46 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *state for (i = 0; SUCCEEDED(hr) &&i < This->count; i++) { DMUS_IO_SEQ_ITEM *item = This->items + i; - DMUS_NOTE_PMSG *msg; + DMUS_PMSG *msg; if (item->mtTime < start_time) continue; if (item->mtTime >= end_time) continue; - if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), - (DMUS_PMSG **)&msg))) - break; + if (item->bStatus == MIDI_NOTE_ON) + { + DMUS_NOTE_PMSG *note; + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*note), + (DMUS_PMSG **)&note))) + break; + + note->dwType = DMUS_PMSGT_NOTE; + note->mtDuration = item->mtDuration; + note->wMusicValue = item->bByte1; + note->nOffset = item->nOffset; + note->bVelocity = item->bByte2; + note->bFlags = 1; + note->bMidiValue = item->bByte1; + msg = (DMUS_PMSG *)note; + } + else + { + DMUS_MIDI_PMSG *midi; + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*midi), + (DMUS_PMSG **)&midi))) + break; + + midi->dwType = DMUS_PMSGT_MIDI; + midi->bStatus = item->bStatus; + midi->bByte1 = item->bByte1; + midi->bByte2 = item->bByte2; + msg = (DMUS_PMSG *)midi; + } msg->mtTime = item->mtTime + time_offset; msg->dwFlags = DMUS_PMSGF_MUSICTIME; msg->dwPChannel = item->dwPChannel; msg->dwVirtualTrackID = track_id; - msg->dwType = DMUS_PMSGT_NOTE; msg->dwGroupID = 1; - msg->mtDuration = item->mtDuration; - msg->wMusicValue = item->bByte1; - msg->nOffset = item->nOffset; - msg->bVelocity = item->bByte2; - msg->bFlags = 1; - msg->bMidiValue = item->bByte1; if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3086dcaf978..9a2cd9d803c 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1633,6 +1633,13 @@ static void test_midi(void) 0xc1, /* event type, program change, channel 1 */ 0x30, /* event data, patch 48 */ }; + static const char midi_control_change[] = + { + 0x04, /* delta time = 4 */ + 0xb1, /* event type, control change, channel 1 */ + 0x07, /* event data, channel volume */ + 0x40, /* event data, 64 */ + }; static const char midi_note_on[] = { 0x04, /* delta time = 4 */ @@ -1667,10 +1674,11 @@ static void test_midi(void) WCHAR test_mid[MAX_PATH], bogus_mid[MAX_PATH]; HRESULT hr; ULONG ret; - DWORD track_length; + DWORD track_length, trace2_length; MUSIC_TIME next; DMUS_PMSG *msg; DMUS_NOTE_PMSG *note; + DMUS_MIDI_PMSG *midi; DMUS_PATCH_PMSG *patch; DMUS_TEMPO_PARAM tempo_param; #include <pshpack1.h> @@ -1873,13 +1881,16 @@ static void test_midi(void) ok(hr == S_OK, "got %#lx\n", hr); /* Add a second track, to test the duration of the trailing note. */ - track_header.length = RtlUlongByteSwap(sizeof(track_header) - 8 + sizeof(midi_note_on) + sizeof(midi_note_off)); + trace2_length = sizeof(midi_note_on) + sizeof(midi_note_off2) + sizeof(midi_control_change); + track_header.length = RtlUlongByteSwap(sizeof(track_header) - 8 + trace2_length); hr = IStream_Write(stream, &track_header, sizeof(track_header), NULL); ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Write(stream, midi_note_on, sizeof(midi_note_on), NULL); ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Write(stream, midi_note_off2, sizeof(midi_note_off2), NULL); ok(hr == S_OK, "got %#lx\n", hr); + hr = IStream_Write(stream, midi_control_change, sizeof(midi_control_change), NULL); + ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Seek(stream, zero, 0, NULL); ok(hr == S_OK, "got %#lx\n", hr); @@ -1887,7 +1898,7 @@ static void test_midi(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Seek(stream, zero, STREAM_SEEK_CUR, &position); ok(hr == S_OK, "got %#lx\n", hr); - ok(position.QuadPart == sizeof(header) + sizeof(track_header) * 2 + track_length + sizeof(midi_note_on) + sizeof(midi_note_off), + ok(position.QuadPart == sizeof(header) + sizeof(track_header) * 2 + track_length + trace2_length, "got %lld\n", position.QuadPart); IPersistStream_Release(persist); IStream_Release(stream); @@ -1981,6 +1992,18 @@ static void test_midi(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&msg); + ok(!ret, "got %#lx\n", ret); + ok(msg->dwType == DMUS_PMSGT_MIDI, "got msg type %#lx, expected MIDI\n", msg->dwType); + ok(msg->mtTime == 649, "got mtTime %lu, expected 649\n", msg->mtTime); + ok(msg->dwPChannel == 1, "got pchannel %lu, expected 1\n", msg->dwPChannel); + midi = (DMUS_MIDI_PMSG *)msg; + ok(midi->bStatus == 0xb0, "got status %#x, expected 0xb1\n", midi->bStatus); + ok(midi->bByte1 == 0x07, "got byte1 %#x, expected 0x07\n", midi->bByte1); + ok(midi->bByte2 == 0x40, "got byte2 %#x, expected 0x40\n", midi->bByte2); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + /* wine generates an extra DIRTY event. */ ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&msg); todo_wine ok(ret == WAIT_TIMEOUT, "unexpected message\n");

1 0

Yuxuan Shui : dmime: Parse note on/off events and generate a seqtrack.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 5ff94358a0b9ac8ebc5bde5b76e72aef35370699 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ff94358a0b9ac8ebc5bde5b76e72a… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Feb 21 15:27:31 2024 +0000 dmime: Parse note on/off events and generate a seqtrack. --- dlls/dmime/dmime_private.h | 2 + dlls/dmime/midi.c | 125 +++++++++++++++++++++++++++++++++++++++++++-- dlls/dmime/seqtrack.c | 8 +++ dlls/dmime/tests/dmime.c | 117 +++++++++++++++++++++++++++++++++++++----- 4 files changed, 235 insertions(+), 17 deletions(-)

1 0

Yuxuan Shui : dmime/tests: Call the correct QueryInterface function for DirectMusic track.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 1df0e34293d959c80d3bf6a21083b1d072382916 URL: https://gitlab.winehq.org/wine/wine/-/commit/1df0e34293d959c80d3bf6a21083b1… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Feb 19 18:21:23 2024 +0000 dmime/tests: Call the correct QueryInterface function for DirectMusic track. --- dlls/dmime/tests/dmime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 8a95c7f2c21..9c2a9c0e919 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4122,7 +4122,7 @@ static void test_sequence_track(void) &IID_IDirectMusicTrack, (void **)&track); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicSegment_QueryInterface(track, &IID_IPersistStream, (void **)&persist); + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void **)&persist); ok(hr == S_OK, "got %#lx\n", hr); hr = CreateStreamOnHGlobal(0, TRUE, &stream); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Rémi Bernon : server: Send emulated mouse messages on primary pointer updates.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 24ad74ee26f53947cbccb468f68440fe4c6c4714 URL: https://gitlab.winehq.org/wine/wine/-/commit/24ad74ee26f53947cbccb468f68440… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:11:58 2024 +0100 server: Send emulated mouse messages on primary pointer updates. --- server/queue.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/server/queue.c b/server/queue.c index 55f6911faf4..0e8653bedf0 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2274,6 +2274,23 @@ static void queue_pointer_message( struct pointer *pointer, int repeated ) queue_hardware_message( desktop, msg, 1 ); } + if (!repeated && pointer->primary && (msg = alloc_hardware_message( 0xff515700, source, time, 0 ))) + { + unsigned int message = WM_MOUSEMOVE; + if (input->hw.msg == WM_POINTERDOWN) message = WM_LBUTTONDOWN; + else if (input->hw.msg == WM_POINTERUP) message = WM_LBUTTONUP; + + msg->win = get_user_full_handle( win ); + msg->msg = message; + msg->wparam = 0; + msg->lparam = 0; + msg->x = x; + msg->y = y; + + if (!send_hook_ll_message( desktop, msg, input, NULL )) + queue_hardware_message( desktop, msg, 0 ); + } + if (input->hw.msg != WM_POINTERUP) { pointer->input.hw.msg = WM_POINTERUPDATE;

1 0

Rémi Bernon : server: Continuously send pointer update messages while it's down.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 40b65e28a761354c3002d64df7bf9d74db401f68 URL: https://gitlab.winehq.org/wine/wine/-/commit/40b65e28a761354c3002d64df7bf9d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 00:47:06 2024 +0100 server: Continuously send pointer update messages while it's down. --- server/queue.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index bc62c5f1b9d..55f6911faf4 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2221,13 +2221,22 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c struct pointer { struct list entry; + struct timeout_user *timeout; struct desktop *desktop; user_handle_t win; int primary; hw_input_t input; }; -static void queue_pointer_message( struct pointer *pointer ) +static void queue_pointer_message( struct pointer *pointer, int repeated ); + +static void pointer_message_timeout( void *private ) +{ + struct pointer *pointer = private; + queue_pointer_message( pointer, 1 ); +} + +static void queue_pointer_message( struct pointer *pointer, int repeated ) { static const unsigned int messages[][2] = { @@ -2265,7 +2274,13 @@ static void queue_pointer_message( struct pointer *pointer ) queue_hardware_message( desktop, msg, 1 ); } - if (input->hw.msg == WM_POINTERUP) + if (input->hw.msg != WM_POINTERUP) + { + pointer->input.hw.msg = WM_POINTERUPDATE; + pointer->input.hw.wparam &= ~(POINTER_MESSAGE_FLAG_NEW << 16); + pointer->timeout = add_timeout_user( -160000, pointer_message_timeout, pointer ); + } + else { list_remove( &pointer->entry ); free( pointer ); @@ -2280,6 +2295,7 @@ static struct pointer *find_pointer_from_id( struct desktop *desktop, unsigned i if (LOWORD(pointer->input.hw.wparam) == id) return pointer; pointer = mem_alloc( sizeof(struct pointer) ); + pointer->timeout = NULL; pointer->desktop = desktop; pointer->primary = list_empty( &desktop->pointers ); list_add_tail( &desktop->pointers, &pointer->entry ); @@ -2321,10 +2337,11 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ if (input->hw.msg == WM_POINTERDOWN || input->hw.msg == WM_POINTERUP || input->hw.msg == WM_POINTERUPDATE) { pointer = find_pointer_from_id( desktop, LOWORD(input->hw.wparam) ); + if (pointer->timeout) remove_timeout_user( pointer->timeout ); pointer->input = *input; pointer->win = win; - queue_pointer_message( pointer ); + queue_pointer_message( pointer, 0 ); return; } @@ -2661,6 +2678,7 @@ void free_pointers( struct desktop *desktop ) LIST_FOR_EACH_ENTRY_SAFE( pointer, next, &desktop->pointers, struct pointer, entry ) { list_remove( &pointer->entry ); + if (pointer->timeout) remove_timeout_user( pointer->timeout ); free( pointer ); } }

1 0

Rémi Bernon : server: Generate WM_POINTERENTER / WM_POINTERLEAVE messages.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: d8b8ac85ebf0d11e64f88dee54bfd506c47d29b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b8ac85ebf0d11e64f88dee54bfd5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 15 12:26:54 2024 +0100 server: Generate WM_POINTERENTER / WM_POINTERLEAVE messages. --- dlls/dinput/tests/device8.c | 30 +++++------------------------- server/queue.c | 28 +++++++++++++++++++--------- 2 files changed, 24 insertions(+), 34 deletions(-)

1 0

Rémi Bernon : server: Stop waiting on LL-hooks for non-injected input.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 5b833c83beadcad2ace5f27e95554c164f6f7c86 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b833c83beadcad2ace5f27e95554c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 16:05:17 2024 +0100 server: Stop waiting on LL-hooks for non-injected input. --- server/queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 0b9430c5f4d..91284f1da17 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2871,7 +2871,8 @@ DECL_HANDLER(send_hardware_message) { struct desktop *desktop; unsigned int origin = (req->flags & SEND_HWMSG_INJECTED ? IMO_INJECTED : IMO_HARDWARE); - struct msg_queue *sender = get_current_queue(); + struct msg_queue *sender = req->flags & SEND_HWMSG_INJECTED ? get_current_queue() : NULL; + int wait = 0; if (!(desktop = get_hardware_input_desktop( req->win ))) return; if ((origin == IMO_INJECTED && desktop != current->queue->input->desktop) || @@ -2888,10 +2889,10 @@ DECL_HANDLER(send_hardware_message) switch (req->input.type) { case INPUT_MOUSE: - reply->wait = queue_mouse_message( desktop, req->win, &req->input, origin, sender ); + wait = queue_mouse_message( desktop, req->win, &req->input, origin, sender ); break; case INPUT_KEYBOARD: - reply->wait = queue_keyboard_message( desktop, req->win, &req->input, origin, sender ); + wait = queue_keyboard_message( desktop, req->win, &req->input, origin, sender ); break; case INPUT_HARDWARE: queue_custom_hardware_message( desktop, req->win, origin, &req->input ); @@ -2900,6 +2901,7 @@ DECL_HANDLER(send_hardware_message) set_error( STATUS_INVALID_PARAMETER ); } + reply->wait = sender ? wait : 0; reply->new_x = desktop->cursor.x; reply->new_y = desktop->cursor.y; release_object( desktop );

1 0

Alexandros Frantzis : winewayland.drv: Handle resizing of OpenGL content.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 4bba16fd185801efe9989b2b5068d3dd1b746677 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bba16fd185801efe9989b2b5068d3… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Feb 26 14:34:50 2024 +0200 winewayland.drv: Handle resizing of OpenGL content. Wayland surfaces don't have an inherent native size that the EGL implementation can track, so we need to explicitly tell EGL about changes in the native size with wl_egl_window_resize. Since the resize can be triggered outside the GL render thread, and wl_egl_window_resize is not thread safe (with respect to other EGL/GL calls), we cannot call it directly at will. Instead we mark the wayland_gl_drawable as resized, and actually call the wl_egl_window_resize function from the thread in which the respective drawable is current. Note that the first EGL/GL operation that requires a new backbuffer latches whatever native size we have reported, until the next eglSwapBuffers. In order to ensure the current native size is applied as soon as possible (to avoid glitches), we check for and apply resizes at a few extra points where a new backbuffer may be required (e.g., glClear, eglMakeCurrent). --- dlls/winewayland.drv/opengl.c | 59 ++++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland_surface.c | 2 ++ dlls/winewayland.drv/waylanddrv.h | 1 + 3 files changed, 62 insertions(+) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 004aad26e79..4692d2f1e15 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -68,6 +68,7 @@ DECL_FUNCPTR(eglInitialize); DECL_FUNCPTR(eglMakeCurrent); DECL_FUNCPTR(eglQueryString); DECL_FUNCPTR(eglSwapBuffers); +DECL_FUNCPTR(glClear); #undef DECL_FUNCPTR static pthread_mutex_t gl_object_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -82,6 +83,7 @@ struct wayland_gl_drawable struct wayland_client_surface *client; struct wl_egl_window *wl_egl_window; EGLSurface surface; + LONG resized; }; struct wgl_context @@ -228,6 +230,28 @@ static void wayland_update_gl_drawable(HWND hwnd, struct wayland_gl_drawable *ne if (old) wayland_gl_drawable_release(old); } +static void wayland_gl_drawable_sync_size(struct wayland_gl_drawable *gl) +{ + int client_width, client_height; + struct wayland_surface *wayland_surface; + + if (InterlockedCompareExchange(&gl->resized, FALSE, TRUE)) + { + if (!(wayland_surface = wayland_surface_lock_hwnd(gl->hwnd))) return; + + client_width = wayland_surface->window.client_rect.right - + wayland_surface->window.client_rect.left; + client_height = wayland_surface->window.client_rect.bottom - + wayland_surface->window.client_rect.top; + if (client_width == 0 || client_height == 0) + client_width = client_height = 1; + + wl_egl_window_resize(gl->wl_egl_window, client_width, client_height, 0, 0); + + pthread_mutex_unlock(&wayland_surface->mutex); + } +} + static void wayland_gl_drawable_sync_surface_state(struct wayland_gl_drawable *gl) { struct wayland_surface *wayland_surface; @@ -263,6 +287,10 @@ static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, draw ? draw->surface : EGL_NO_SURFACE, read ? read->surface : EGL_NO_SURFACE); + /* Since making an EGL surface current may latch the native size, + * perform any pending resizes before calling it. */ + if (draw) wayland_gl_drawable_sync_size(draw); + pthread_mutex_lock(&gl_object_mutex); ret = p_eglMakeCurrent(egl_display, @@ -380,6 +408,15 @@ out: return ctx; } +void wayland_glClear(GLbitfield mask) +{ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + /* Since glClear is one of the operations that may latch the native size, + * perform any pending resizes before calling it. */ + if (ctx && ctx->draw) wayland_gl_drawable_sync_size(ctx->draw); + p_glClear(mask); +} + static BOOL wayland_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask) { @@ -528,6 +565,7 @@ static BOOL wayland_wglSwapBuffers(HDC hdc) if (ctx) wgl_context_refresh(ctx); wayland_gl_drawable_sync_surface_state(gl); p_eglSwapBuffers(egl_display, gl->surface); + wayland_gl_drawable_sync_size(gl); wayland_gl_drawable_release(gl); @@ -569,6 +607,9 @@ static BOOL init_opengl_funcs(void) } } + p_glClear = opengl_funcs.gl.p_glClear; + opengl_funcs.gl.p_glClear = wayland_glClear; + register_extension("WGL_ARB_extensions_string"); opengl_funcs.ext.p_wglGetExtensionsStringARB = wayland_wglGetExtensionsStringARB; @@ -768,6 +809,20 @@ void wayland_destroy_gl_drawable(HWND hwnd) wayland_update_gl_drawable(hwnd, NULL); } +/********************************************************************** + * wayland_resize_gl_drawable + */ +void wayland_resize_gl_drawable(HWND hwnd) +{ + struct wayland_gl_drawable *gl; + + if (!(gl = wayland_gl_drawable_get(hwnd))) return; + /* wl_egl_window_resize is not thread safe, so we just mark the + * drawable as resized and perform the resize in the proper thread. */ + InterlockedExchange(&gl->resized, TRUE); + wayland_gl_drawable_release(gl); +} + #else /* No GL */ struct opengl_funcs *WAYLAND_wine_get_wgl_driver(UINT version) @@ -779,4 +834,8 @@ void wayland_destroy_gl_drawable(HWND hwnd) { } +void wayland_resize_gl_drawable(HWND hwnd) +{ +} + #endif diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index a955f3688c5..e212e74362a 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -519,6 +519,8 @@ static void wayland_surface_reconfigure_client(struct wayland_surface *surface) } wl_surface_commit(surface->client->wl_surface); + + wayland_resize_gl_drawable(surface->hwnd); } /********************************************************************** diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 7da33dc9f18..7cf813a1ca3 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -297,6 +297,7 @@ void wayland_pointer_clear_constraint(void); */ void wayland_destroy_gl_drawable(HWND hwnd); +void wayland_resize_gl_drawable(HWND hwnd); /********************************************************************** * Helpers

1 0

Alexandros Frantzis : winewayland.drv: Implement wglSwapBuffers.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: aed0c822f16e8dad1b9b1504c54fa0e215e0470f URL: https://gitlab.winehq.org/wine/wine/-/commit/aed0c822f16e8dad1b9b1504c54fa0… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Feb 23 10:53:34 2024 +0200 winewayland.drv: Implement wglSwapBuffers. --- dlls/winewayland.drv/opengl.c | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 85ad94903eb..004aad26e79 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -67,6 +67,7 @@ DECL_FUNCPTR(eglGetProcAddress); DECL_FUNCPTR(eglInitialize); DECL_FUNCPTR(eglMakeCurrent); DECL_FUNCPTR(eglQueryString); +DECL_FUNCPTR(eglSwapBuffers); #undef DECL_FUNCPTR static pthread_mutex_t gl_object_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -88,7 +89,7 @@ struct wgl_context struct list entry; EGLConfig config; EGLContext context; - struct wayland_gl_drawable *draw, *read; + struct wayland_gl_drawable *draw, *read, *new_draw, *new_read; }; /* lookup the existing drawable for a window, gl_object_mutex must be held */ @@ -200,6 +201,18 @@ err: return NULL; } +static void update_context_drawables(struct wayland_gl_drawable *new, + struct wayland_gl_drawable *old) +{ + struct wgl_context *ctx; + + LIST_FOR_EACH_ENTRY(ctx, &gl_contexts, struct wgl_context, entry) + { + if (ctx->draw == old || ctx->new_draw == old) ctx->new_draw = new; + if (ctx->read == old || ctx->new_read == old) ctx->new_read = new; + } +} + static void wayland_update_gl_drawable(HWND hwnd, struct wayland_gl_drawable *new) { struct wayland_gl_drawable *old; @@ -208,13 +221,33 @@ static void wayland_update_gl_drawable(HWND hwnd, struct wayland_gl_drawable *ne if ((old = find_drawable_for_hwnd(hwnd))) list_remove(&old->entry); if (new) list_add_head(&gl_drawables, &new->entry); - /* TODO: Update context drawables */ + if (old && new) update_context_drawables(new, old); pthread_mutex_unlock(&gl_object_mutex); if (old) wayland_gl_drawable_release(old); } +static void wayland_gl_drawable_sync_surface_state(struct wayland_gl_drawable *gl) +{ + struct wayland_surface *wayland_surface; + + if (!(wayland_surface = wayland_surface_lock_hwnd(gl->hwnd))) return; + + wayland_surface_ensure_contents(wayland_surface); + + /* Handle any processed configure request, to ensure the related + * surface state is applied by the compositor. */ + if (wayland_surface->processing.serial && + wayland_surface->processing.processed && + wayland_surface_reconfigure(wayland_surface)) + { + wl_surface_commit(wayland_surface->wl_surface); + } + + pthread_mutex_unlock(&wayland_surface->mutex); +} + static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, HWND read_hwnd) { @@ -242,6 +275,7 @@ static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, old_read = ctx->read; ctx->draw = draw; ctx->read = read; + ctx->new_draw = ctx->new_read = NULL; NtCurrentTeb()->glContext = ctx; } else @@ -258,6 +292,35 @@ static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, return ret; } +static void wgl_context_refresh(struct wgl_context *ctx) +{ + BOOL refresh = FALSE; + struct wayland_gl_drawable *old_draw = NULL, *old_read = NULL; + + pthread_mutex_lock(&gl_object_mutex); + + if (ctx->new_draw) + { + old_draw = ctx->draw; + ctx->draw = wayland_gl_drawable_acquire(ctx->new_draw); + ctx->new_draw = NULL; + refresh = TRUE; + } + if (ctx->new_read) + { + old_read = ctx->read; + ctx->read = wayland_gl_drawable_acquire(ctx->new_read); + ctx->new_read = NULL; + refresh = TRUE; + } + if (refresh) p_eglMakeCurrent(egl_display, ctx->draw, ctx->read, ctx->context); + + pthread_mutex_unlock(&gl_object_mutex); + + if (old_draw) wayland_gl_drawable_release(old_draw); + if (old_read) wayland_gl_drawable_release(old_read); +} + static BOOL set_pixel_format(HDC hdc, int format, BOOL internal) { HWND hwnd = NtUserWindowFromDC(hdc); @@ -454,6 +517,23 @@ static BOOL wayland_wglSetPixelFormatWINE(HDC hdc, int format) return set_pixel_format(hdc, format, TRUE); } +static BOOL wayland_wglSwapBuffers(HDC hdc) +{ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + HWND hwnd = NtUserWindowFromDC(hdc); + struct wayland_gl_drawable *gl; + + if (!(gl = wayland_gl_drawable_get(hwnd))) return FALSE; + + if (ctx) wgl_context_refresh(ctx); + wayland_gl_drawable_sync_surface_state(gl); + p_eglSwapBuffers(egl_display, gl->surface); + + wayland_gl_drawable_release(gl); + + return TRUE; +} + static BOOL has_extension(const char *list, const char *ext) { size_t len = strlen(ext); @@ -606,6 +686,7 @@ static void init_opengl(void) LOAD_FUNCPTR_EGL(eglGetPlatformDisplay); LOAD_FUNCPTR_EGL(eglInitialize); LOAD_FUNCPTR_EGL(eglMakeCurrent); + LOAD_FUNCPTR_EGL(eglSwapBuffers); #undef LOAD_FUNCPTR_EGL egl_display = p_eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, @@ -660,6 +741,7 @@ static struct opengl_funcs opengl_funcs = .p_wglGetProcAddress = wayland_wglGetProcAddress, .p_wglMakeCurrent = wayland_wglMakeCurrent, .p_wglSetPixelFormat = wayland_wglSetPixelFormat, + .p_wglSwapBuffers = wayland_wglSwapBuffers, } };

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2024