September 2023 - Wine-commits

Alexandre Julliard : Wine release 8.17
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: website Branch: master Commit: 423d9b3412a1bc8dabff378cdcf32294e5084520 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/423d9b3412a1bc8dabff378cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 22:35:11 2023 +0200 Wine release 8.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023092901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023092901.xml b/news/en/2023092901.xml new file mode 100644 index 00000000..56e06bc2 --- /dev/null +++ b/news/en/2023092901.xml @@ -0,0 +1,16 @@ +<news> +<date>September 29, 2023</date> +<title>Wine 8.17 Released</title> +<body> + The Wine development release 8.17 is now available. + <a href="{$root}/announce/8.17">What's new</a> in this release: +<ul> + <li>Bundled vkd3d upgraded to version 1.9.</li> + <li>Initial window management in the Wayland driver.</li> + <li>SoundFont support in DirectMusic.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.17.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Rémi Bernon : dmband: Implement band track GUID_DownloadToAudioPath parameter.
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: 96b0bdd7b59b2c5c52b2b9a05d629cc2596cef5a URL: https://gitlab.winehq.org/wine/wine/-/commit/96b0bdd7b59b2c5c52b2b9a05d629c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 21 12:08:42 2023 +0200 dmband: Implement band track GUID_DownloadToAudioPath parameter. --- dlls/dmband/bandtrack.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index b808faaf567..845345a9fa2 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -193,7 +193,32 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ else if (IsEqualGUID(type, &GUID_Download)) FIXME("GUID_Download not handled yet\n"); else if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) - FIXME("GUID_DownloadToAudioPath not handled yet\n"); + { + IDirectMusicPerformance *performance; + IDirectMusicAudioPath *audio_path; + IUnknown *object = param; + struct band_entry *entry; + HRESULT hr; + + if (FAILED(hr = IDirectMusicAudioPath_QueryInterface(object, &IID_IDirectMusicPerformance8, (void **)&performance)) + && SUCCEEDED(hr = IDirectMusicAudioPath_QueryInterface(object, &IID_IDirectMusicAudioPath, (void **)&audio_path))) + { + hr = IDirectMusicAudioPath_GetObjectInPath(audio_path, DMUS_PCHANNEL_ALL, DMUS_PATH_PERFORMANCE, 0, + &GUID_All_Objects, 0, &IID_IDirectMusicPerformance8, (void **)&performance); + IDirectMusicAudioPath_Release(audio_path); + } + + if (FAILED(hr)) + { + WARN("Failed to get IDirectMusicPerformance from param %p\n", param); + return hr; + } + + LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) + if (FAILED(hr = IDirectMusicBand_Download(entry->band, performance))) break; + + IDirectMusicPerformance_Release(performance); + } else if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) FIXME("GUID_Enable_Auto_Download not handled yet\n"); else if (IsEqualGUID(type, &GUID_IDirectMusicBand))

1 0

Rémi Bernon : dmime: Implement IDirectMusicPerformance_DownloadInstrument.
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: 3c4d83609e16ad326685f01e7245684d7f526225 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c4d83609e16ad326685f01e724568… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 6 09:54:22 2023 +0200 dmime: Implement IDirectMusicPerformance_DownloadInstrument. --- dlls/dmime/performance.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bdb7475370a..111d7c60568 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -828,14 +828,24 @@ static HRESULT WINAPI performance_PChannelInfo(IDirectMusicPerformance8 *iface, } static HRESULT WINAPI performance_DownloadInstrument(IDirectMusicPerformance8 *iface, - IDirectMusicInstrument *pInst, DWORD dwPChannel, - IDirectMusicDownloadedInstrument **ppDownInst, DMUS_NOTERANGE *pNoteRanges, - DWORD dwNumNoteRanges, IDirectMusicPort **ppPort, DWORD *pdwGroup, DWORD *pdwMChannel) + IDirectMusicInstrument *instrument, DWORD port_channel, + IDirectMusicDownloadedInstrument **downloaded, DMUS_NOTERANGE *note_ranges, + DWORD note_range_count, IDirectMusicPort **port, DWORD *group, DWORD *music_channel) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPort *tmp_port = NULL; + HRESULT hr; - FIXME("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); - return S_OK; + TRACE("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p)\n", This, instrument, port_channel, downloaded, + note_ranges, note_range_count, port, group, music_channel); + + if (!port) port = &tmp_port; + if (FAILED(hr = IDirectMusicPerformance_PChannelInfo(iface, port_channel, port, group, music_channel))) + return hr; + + hr = IDirectMusicPort_DownloadInstrument(*port, instrument, downloaded, note_ranges, note_range_count); + if (tmp_port) IDirectMusicPort_Release(tmp_port); + return hr; } static HRESULT WINAPI performance_Invalidate(IDirectMusicPerformance8 *iface, MUSIC_TIME mtTime, DWORD dwFlags)

1 0

Alexandre Julliard : Release 8.17.
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: 3db7506221e44e8091887d7eb42fe1666d422166 URL: https://gitlab.winehq.org/wine/wine/-/commit/3db7506221e44e8091887d7eb42fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 22:29:20 2023 +0200 Release 8.17. --- ANNOUNCE | 917 +++++++++++++++++++++++++------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 383 insertions(+), 555 deletions(-)

1 0

Tag wine-8.17 : Alexandre Julliard : Release 8.17
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: refs/tags/wine-8.17 Tag: 049a5fcb51948eda499da71860840e44eafb439d URL: https://gitlab.winehq.org/wine/wine/-/tags/049a5fcb51948eda499da71860840e44… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 22:29:20 2023 +0200 Release 8.17

1 0

Paul Gofman : shell32: Avoid stack corruption with long name in SHELL_TryAppPathW().
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: f1c57f06d66d61c423c7b842cce3368817663c51 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1c57f06d66d61c423c7b842cce336… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 28 19:29:03 2023 -0600 shell32: Avoid stack corruption with long name in SHELL_TryAppPathW(). --- dlls/shell32/shlexec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ae61c923037..4b943d69637 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -428,8 +428,14 @@ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env) BOOL found = FALSE; if (env) *env = NULL; - lstrcpyW(buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); - lstrcatW(buffer, szName); + wcscpy(buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); + if (wcslen(buffer) + wcslen(szName) + 1 > ARRAY_SIZE(buffer)) + { + WARN("Name is too big.\n"); + return FALSE; + } + + wcscat(buffer, szName); res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buffer, 0, KEY_READ, &hkApp); if (res) goto end;

1 0

Paul Gofman : shell32: Handle long command line in execute_from_key().
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: 4e5594546713a36ef02cf350ffd78fdd4132efa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e5594546713a36ef02cf350ffd78f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 28 19:23:41 2023 -0600 shell32: Handle long command line in execute_from_key(). --- dlls/shell32/shlexec.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 4b943d69637..b31f800e92a 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -965,7 +965,7 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST SHELL_ExecuteW32 execfunc, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) { - WCHAR cmd[256], param[1024], ddeexec[256]; + WCHAR cmd[256], parambuffer[1024], ddeexec[256], *param = parambuffer; LONG cmdlen = sizeof(cmd), ddeexeclen = sizeof(ddeexec); UINT_PTR retval = SE_ERR_NOASSOC; DWORD resultLen; @@ -987,9 +987,12 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST if (cmdlen >= ARRAY_SIZE(cmd)) cmdlen = ARRAY_SIZE(cmd) - 1; cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, ARRAY_SIZE(param), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); - if (resultLen > ARRAY_SIZE(param)) - ERR("Argify buffer not large enough, truncating\n"); + SHELL_ArgifyW(param, ARRAY_SIZE(parambuffer), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); + if (resultLen > ARRAY_SIZE(parambuffer)) + { + if ((param = malloc(resultLen * sizeof(*param)))) + SHELL_ArgifyW(param, resultLen, cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); + } } /* Get the parameters needed by the application @@ -1012,6 +1015,7 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST else WARN("Nothing appropriate found for %s\n", debugstr_w(key)); + if (param != parambuffer) free(param); return retval; }

1 0

Alexandre Julliard : ntdll: Don't free reserved memory on 64-bit macOS.
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: d92d9bc2a9c2fa097beb7c420b7e0229760f365c URL: https://gitlab.winehq.org/wine/wine/-/commit/d92d9bc2a9c2fa097beb7c420b7e02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 18:41:29 2023 +0200 ntdll: Don't free reserved memory on 64-bit macOS. It's part of the zerofill section. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55674 --- dlls/ntdll/unix/virtual.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3784cb6c16a..f027c0e4b85 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4161,15 +4161,20 @@ static void virtual_release_address_space(void) */ void virtual_set_large_address_space(void) { -#ifdef _WIN64 - if (is_wow64()) - user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; - else - free_reserved_memory( 0, (char *)0x7ffe0000 ); -#else - if (!(main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; - free_reserved_memory( (char *)0x80000000, address_space_limit ); + if (is_win64) + { + if (is_wow64()) + user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; +#ifndef __APPLE__ /* don't free the zerofill section on macOS */ + else + free_reserved_memory( 0, (char *)0x7ffe0000 ); #endif + } + else + { + if (!(main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; + free_reserved_memory( (char *)0x80000000, address_space_limit ); + } user_space_limit = working_set_limit = address_space_limit; }

1 0

Rémi Bernon : dmime/tests: Add some tests for GUID_ConnectToDLSCollection.
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: 0d3b83c021455654aa02ccd05ef56a8d3e63ef5f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d3b83c021455654aa02ccd05ef56a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 21 12:25:35 2023 +0200 dmime/tests: Add some tests for GUID_ConnectToDLSCollection. --- dlls/dmime/tests/dmime.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 57879f52069..f69e42d2fec 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3627,6 +3627,51 @@ static void test_band_track_play(void) IDirectMusicTool_Release(tool); } +static void test_connect_to_collection(void) +{ + IDirectMusicCollection *collection; + IDirectMusicSegment *segment; + IDirectMusicTrack *track; + void *param; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicCollection, (void **)&collection); + ok(hr == S_OK, "got %#lx\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment, (void **)&segment); + ok(hr == S_OK, "got %#lx\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void **)&track); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicSegment_InsertTrack(segment, track, 1); + ok(hr == S_OK, "got %#lx\n", hr); + + /* it is possible to connect the band track to another collection, but not to disconnect it */ + hr = IDirectMusicTrack_IsParamSupported(track, &GUID_ConnectToDLSCollection); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicTrack_SetParam(track, &GUID_ConnectToDLSCollection, 0, NULL); + todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + hr = IDirectMusicTrack_SetParam(track, &GUID_ConnectToDLSCollection, 0, collection); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicTrack_GetParam(track, &GUID_ConnectToDLSCollection, 0, NULL, NULL); + todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + hr = IDirectMusicTrack_GetParam(track, &GUID_ConnectToDLSCollection, 0, NULL, &param); + ok(hr == DMUS_E_GET_UNSUPPORTED, "got %#lx\n", hr); + + hr = IDirectMusicSegment_SetParam(segment, &GUID_ConnectToDLSCollection, -1, DMUS_SEG_ALLTRACKS, 0, NULL); + todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + hr = IDirectMusicSegment_SetParam(segment, &GUID_ConnectToDLSCollection, -1, DMUS_SEG_ALLTRACKS, 0, collection); + ok(hr == S_OK, "got %#lx\n", hr); + + IDirectMusicTrack_Release(track); + IDirectMusicSegment_Release(segment); + IDirectMusicCollection_Release(collection); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -3662,6 +3707,7 @@ START_TEST(dmime) test_wave_pmsg(); test_sequence_track(); test_band_track_play(); + test_connect_to_collection(); CoUninitialize(); }

1 0

Rémi Bernon : dmime/tests: Test segment state and playing a custom track.
by Alexandre Julliard 29 Sep '23

29 Sep '23

Module: wine Branch: master Commit: 406f1783a926b0ff404e897650739a9fcaecb2df URL: https://gitlab.winehq.org/wine/wine/-/commit/406f1783a926b0ff404e897650739a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 29 09:02:56 2023 +0200 dmime/tests: Test segment state and playing a custom track. --- dlls/dmime/tests/dmime.c | 443 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 443 insertions(+)

1 0