November 2023 - Wine-commits

Jacek Caban : winebuild: Use COMDAT sections for ARM64EC functions.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 7b216b69c7924bbd0abee52f1c79e84871c5995f URL: https://gitlab.winehq.org/wine/wine/-/commit/7b216b69c7924bbd0abee52f1c79e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 13 14:17:48 2023 +0200 winebuild: Use COMDAT sections for ARM64EC functions. --- tools/winebuild/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 795afb29242..c9880400a8c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -842,6 +842,7 @@ void output_function_header( const char *func, int global ) break; case PLATFORM_MINGW: case PLATFORM_WINDOWS: + if (target.cpu == CPU_ARM64EC) output( ".section .text,\"xr\",discard,%s\n\t", name ); output( "\t.def %s\n\t.scl 2\n\t.type 32\n\t.endef\n", name ); if (global) output( "\t.globl %s\n", name ); if (thumb_mode) output( "\t.thumb_func\n" );

1 0

Alexandre Julliard : winebuild: Add a helper to build an ARM64EC function name.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 955664c80f9dda3c14e871d518968ed0a3d52eec URL: https://gitlab.winehq.org/wine/wine/-/commit/955664c80f9dda3c14e871d518968e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 11:29:45 2023 +0100 winebuild: Add a helper to build an ARM64EC function name. --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 6 +++--- tools/winebuild/utils.c | 16 +++++++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index ef50e0597e9..61e404640e0 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -287,6 +287,7 @@ extern int sort_func_list( ORDDEF **list, int count, int (*compare)(const void * extern unsigned int get_page_size(void); extern unsigned int get_args_size( const ORDDEF *odp ); extern const char *asm_name( const char *func ); +extern const char *arm64_name( const char *func ); extern const char *asm_globl( const char *func ); extern const char *get_asm_ptr_keyword(void); extern const char *get_asm_string_keyword(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5ae8de1406c..c3a1dad4452 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1347,7 +1347,7 @@ void output_stubs( DLLSPEC *spec ) break; case CPU_ARM64: case CPU_ARM64EC: - output_seh( ".seh_proc %s", asm_name(name) ); + output_seh( ".seh_proc %s", arm64_name(name) ); output_seh( ".seh_endprologue" ); output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_file_name") ); output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_file_name") ); @@ -1360,7 +1360,7 @@ void output_stubs( DLLSPEC *spec ) } else output( "\tmov x1, %u\n", odp->ordinal ); - output( "\tb %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tb %s\n", arm64_name("__wine_spec_unimplemented_stub") ); output_seh( ".seh_endproc" ); break; } @@ -1476,7 +1476,7 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM64: case CPU_ARM64EC: - output_seh( ".seh_proc %s", asm_name(name) ); + output_seh( ".seh_proc %s", arm64_name(name) ); output_seh( ".seh_endprologue" ); output( "\tmov x8, #%u\n", id ); output( "\tmov x9, x30\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index c9880400a8c..0649070803a 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -828,10 +828,24 @@ const char *asm_name( const char *sym ) } } +/* return the assembly name for an ARM64/ARM64EC function */ +const char *arm64_name( const char *sym ) +{ + switch (target.platform) + { + case PLATFORM_MINGW: + case PLATFORM_WINDOWS: + if (target.cpu == CPU_ARM64EC) return strmake( "\"#%s\"", sym ); + /* fall through */ + default: + return asm_name( sym ); + } +} + /* return an assembly function declaration for a C function name */ void output_function_header( const char *func, int global ) { - const char *name = asm_name( func ); + const char *name = arm64_name( func ); output( "\t.text\n" );

1 0

Alexandre Julliard : winebuild: Include x86-64 entry points in ARM64EC builds.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: b3895f55191aa52cecfa565c3394701d8cc04bcb URL: https://gitlab.winehq.org/wine/wine/-/commit/b3895f55191aa52cecfa565c339470… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 11:30:29 2023 +0100 winebuild: Include x86-64 entry points in ARM64EC builds. --- tools/winebuild/parser.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index eaf90a85966..959170e39b8 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -539,6 +539,10 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp, const char *tok token = GetToken(0); } while (token && *token == '-'); + /* x86-64 implies arm64ec */ + if (odp->flags & FLAG_CPU(CPU_x86_64)) odp->flags |= FLAG_CPU(CPU_ARM64EC); + if (cpu_mask & FLAG_CPU(CPU_x86_64)) cpu_mask |= FLAG_CPU(CPU_ARM64EC); + if (cpu_mask) odp->flags |= FLAG_CPU_MASK & ~cpu_mask; return token; }

1 0

Alistair Leslie-Hughes : include: Add DBPROPVAL_MR_* defines.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 9ff572b78958ec965254c9b1b6a04fba587c6600 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ff572b78958ec965254c9b1b6a04f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 13 18:03:03 2023 +1100 include: Add DBPROPVAL_MR_* defines. --- include/dbs.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index f664518ca37..f72204b1e90 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -587,6 +587,10 @@ cpp_quote("#define DBPROPVAL_LM_READ __MSABI_LONG(0x00000002)") cpp_quote("#define DBPROPVAL_LM_INTENT __MSABI_LONG(0x00000004)") cpp_quote("#define DBPROPVAL_LM_RITE __MSABI_LONG(0x00000008)") +cpp_quote("#define DBPROPVAL_MR_NOTSUPPORTED __MSABI_LONG(0x00000000)") +cpp_quote("#define DBPROPVAL_MR_SUPPORTED __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_MR_CONCURRENT __MSABI_LONG(0x00000002)") + cpp_quote("#define DB_MODE_READ 0x01") cpp_quote("#define DB_MODE_WRITE 0x02") cpp_quote("#define DB_MODE_READWRITE 0x03")

1 0

Alistair Leslie-Hughes : msdasql: GetAvailableColumns correct assignment of DBCOLUMN data.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 7e1989b963f26f0587f3cb63c79118871f0e7382 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e1989b963f26f0587f3cb63c79118… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 13 18:03:03 2023 +1100 msdasql: GetAvailableColumns correct assignment of DBCOLUMN data. --- dlls/msdasql/session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 1aa1132f40a..7cec1523f4d 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1215,9 +1215,9 @@ static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORD return E_OUTOFMEMORY; *count = extra_columns; - *columns[0] = DBCOLUMN_BASETABLENAME; - *columns[1] = DBCOLUMN_BASECOLUMNNAME; - *columns[2] = DBCOLUMN_KEYCOLUMN; + (*columns)[0] = DBCOLUMN_BASETABLENAME; + (*columns)[1] = DBCOLUMN_BASECOLUMNNAME; + (*columns)[2] = DBCOLUMN_KEYCOLUMN; return S_OK; }

1 0

Rémi Bernon : dmime/tests: Avoid discarding old notifications in test.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: ddd877d1c778adae47fd1a593a806d1531a037ae URL: https://gitlab.winehq.org/wine/wine/-/commit/ddd877d1c778adae47fd1a593a806d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 10 15:04:17 2023 +0100 dmime/tests: Avoid discarding old notifications in test. --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7613b82c893..e181a6b1299 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3176,6 +3176,10 @@ static void test_notification_pmsg(void) hr = IDirectMusicPerformance_AddNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); ok(hr == S_FALSE, "got %#lx\n", hr); + /* avoid discarding older notifications */ + hr = IDirectMusicPerformance_SetNotificationHandle(performance, 0, 100000000); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, &state); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_GetTime(performance, NULL, &music_time);

1 0

Rémi Bernon : dmime/tests: Test that IDirectMusicPerformance_Stop clears messages.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: fe171ec86bb527000a633ff30ca8e7ff887688bd URL: https://gitlab.winehq.org/wine/wine/-/commit/fe171ec86bb527000a633ff30ca8e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 09:18:32 2023 +0200 dmime/tests: Test that IDirectMusicPerformance_Stop clears messages. --- dlls/dmime/tests/dmime.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e181a6b1299..e70fbfd5f1b 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3294,6 +3294,55 @@ static void test_notification_pmsg(void) ok(hr == S_FALSE, "got %#lx\n", hr); + /* Stop finishes segment immediately and skips notification messages */ + + hr = IDirectMusicPerformance_AddNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, &state); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_GetTime(performance, NULL, &music_time); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 50, (DMUS_PMSG **)&notif); + ok(!ret, "got %#lx\n", ret); + check_dmus_notification_pmsg(notif, music_time, DMUS_PMSGF_TOOL_IMMEDIATE, &GUID_NOTIFICATION_SEGMENT, + DMUS_NOTIFICATION_SEGSTART, state); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicPerformance_Stop(performance, NULL, NULL, 0, DMUS_SEGF_DEFAULT); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_RemoveNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 50, &msg); + ok(!ret, "got %#lx\n", ret); + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 50, (DMUS_PMSG **)&notif); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + check_dmus_notification_pmsg(notif, music_time, DMUS_PMSGF_TOOL_IMMEDIATE, &GUID_NOTIFICATION_SEGMENT, + DMUS_NOTIFICATION_SEGABORT, state); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 500, &msg); + ok(!ret, "got %#lx\n", ret); + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got dwType %#lx\n", msg->dwType); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 100, &msg); + ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); + + IDirectMusicSegmentState_Release(state); + + /* CloseDown removes all notifications and notification messages */ hr = IDirectMusicPerformance_AddNotificationType(performance, &GUID_NOTIFICATION_SEGMENT);

1 0

Rémi Bernon : dmime: Clear all pending messages in IDirectMusicPerformance_Stop.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 2414bb4004dca8b8eb6a9c4902a0f4bbd1154f96 URL: https://gitlab.winehq.org/wine/wine/-/commit/2414bb4004dca8b8eb6a9c4902a0f4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 12:55:43 2023 +0200 dmime: Clear all pending messages in IDirectMusicPerformance_Stop. --- dlls/dmime/dmime_private.h | 4 +- dlls/dmime/performance.c | 165 ++++++++++++++++++++++++++++++++++++--------- dlls/dmime/segmentstate.c | 23 ++++++- dlls/dmime/tests/dmime.c | 5 +- 4 files changed, 158 insertions(+), 39 deletions(-)

1 0

Rémi Bernon : dmime: Send MIDI_SYSTEM_RESET message on performance reset.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 051418c0c0bc6e0739c7f34aaa4a4472907a5dc3 URL: https://gitlab.winehq.org/wine/wine/-/commit/051418c0c0bc6e0739c7f34aaa4a44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 12:55:43 2023 +0200 dmime: Send MIDI_SYSTEM_RESET message on performance reset. --- dlls/dmime/performance.c | 71 ++++++++++++++++++++++++++++------------------- dlls/dmusic/dmusic_midi.h | 1 + 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index f85c5bf7586..0a39e86ef96 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -472,6 +472,35 @@ static HRESULT performance_init_dmusic(struct performance *This, IDirectSound *d return hr; } +static HRESULT performance_send_midi_pmsg(struct performance *This, DMUS_PMSG *msg, UINT flags, + BYTE status, BYTE byte1, BYTE byte2) +{ + IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; + DMUS_MIDI_PMSG *midi; + HRESULT hr; + + if (FAILED(hr = IDirectMusicPerformance8_AllocPMsg(performance, sizeof(*midi), + (DMUS_PMSG **)&midi))) + return hr; + + if (flags & DMUS_PMSGF_REFTIME) midi->rtTime = msg->rtTime; + if (flags & DMUS_PMSGF_MUSICTIME) midi->mtTime = msg->mtTime; + midi->dwFlags = flags; + midi->dwPChannel = msg->dwPChannel; + midi->dwVirtualTrackID = msg->dwVirtualTrackID; + midi->dwVoiceID = msg->dwVoiceID; + midi->dwGroupID = msg->dwGroupID; + midi->dwType = DMUS_PMSGT_MIDI; + midi->bStatus = status; + midi->bByte1 = byte1; + midi->bByte2 = byte2; + + if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)midi))) + IDirectMusicPerformance8_FreePMsg(performance, (DMUS_PMSG *)midi); + + return hr; +} + static HRESULT WINAPI performance_Init(IDirectMusicPerformance8 *iface, IDirectMusic **dmusic, IDirectSound *dsound, HWND hwnd) { @@ -631,6 +660,7 @@ static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectM struct performance *This = impl_from_IDirectMusicPerformance8(iface); struct list states = LIST_INIT(states); struct state_entry *entry, *next; + DMUS_PMSG msg = {.mtTime = -1}; HRESULT hr; FIXME("(%p, %p, %p, %ld, %ld): semi-stub\n", This, segment, state, music_time, flags); @@ -670,6 +700,13 @@ static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectM free(entry); } + if (!state && !segment) + { + if (FAILED(hr = performance_send_midi_pmsg(This, &msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + MIDI_SYSTEM_RESET, 0, 0))) + ERR("Failed to send MIDI_SYSTEM_RESET message, hr %#lx\n", hr); + } + LeaveCriticalSection(&This->safe); return S_OK; @@ -1368,6 +1405,7 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) struct performance *This = impl_from_IDirectMusicPerformance8(iface); struct list states = LIST_INIT(states); struct state_entry *entry, *next; + DMUS_PMSG msg = {.mtTime = -1}; HANDLE message_thread; HRESULT hr; @@ -1400,6 +1438,10 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) free(entry); } + if (FAILED(hr = performance_send_midi_pmsg(This, &msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + MIDI_SYSTEM_RESET, 0, 0))) + ERR("Failed to send MIDI_SYSTEM_RESET message, hr %#lx\n", hr); + performance_set_primary_segment(This, NULL); performance_set_control_segment(This, NULL); @@ -1953,35 +1995,6 @@ static HRESULT WINAPI performance_tool_GetMediaTypes(IDirectMusicTool *iface, DW return E_NOTIMPL; } -static HRESULT performance_send_midi_pmsg(struct performance *This, DMUS_PMSG *msg, UINT flags, - BYTE status, BYTE byte1, BYTE byte2) -{ - IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; - DMUS_MIDI_PMSG *midi; - HRESULT hr; - - if (FAILED(hr = IDirectMusicPerformance8_AllocPMsg(performance, sizeof(*midi), - (DMUS_PMSG **)&midi))) - return hr; - - if (flags & DMUS_PMSGF_REFTIME) midi->rtTime = msg->rtTime; - if (flags & DMUS_PMSGF_MUSICTIME) midi->mtTime = msg->mtTime; - midi->dwFlags = flags; - midi->dwPChannel = msg->dwPChannel; - midi->dwVirtualTrackID = msg->dwVirtualTrackID; - midi->dwVoiceID = msg->dwVoiceID; - midi->dwGroupID = msg->dwGroupID; - midi->dwType = DMUS_PMSGT_MIDI; - midi->bStatus = status; - midi->bByte1 = byte1; - midi->bByte2 = byte2; - - if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)midi))) - IDirectMusicPerformance8_FreePMsg(performance, (DMUS_PMSG *)midi); - - return hr; -} - static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, IDirectMusicPerformance *performance, DMUS_PMSG *msg) { diff --git a/dlls/dmusic/dmusic_midi.h b/dlls/dmusic/dmusic_midi.h index e545bcaf8cb..574961c12d0 100644 --- a/dlls/dmusic/dmusic_midi.h +++ b/dlls/dmusic/dmusic_midi.h @@ -31,6 +31,7 @@ enum midi_message MIDI_PROGRAM_CHANGE = 0xc0, MIDI_CHANNEL_PRESSURE = 0xd0, MIDI_PITCH_BEND_CHANGE = 0xe0, + MIDI_SYSTEM_RESET = 0xff, }; enum midi_control

1 0

Rémi Bernon : dmsynth: Reset synthesizer defaults on MIDI_SYSTEM_RESET.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 8f3980fc85d128842619badc8e81bdde35794a0e URL: https://gitlab.winehq.org/wine/wine/-/commit/8f3980fc85d128842619badc8e81bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 10:57:54 2023 +0200 dmsynth: Reset synthesizer defaults on MIDI_SYSTEM_RESET. --- dlls/dmsynth/synth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 410fb59089e..51271e48b2a 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1125,7 +1125,9 @@ static HRESULT WINAPI synth_Render(IDirectMusicSynth8 *iface, short *buffer, TRACE("status %#x chan %#x midi %#x %#x\n", status, chan, event->midi[1], event->midi[2]); - switch (status) + if (event->midi[0] == MIDI_SYSTEM_RESET) + synth_reset_default_values(This); + else switch (status) { case MIDI_NOTE_OFF: fluid_synth_noteoff(This->fluid_synth, chan, event->midi[1]);

1 0