December 2023 - Wine-Commits

Yuxuan Shui : dmime: Fix handling of curve PMSG.
by Alexandre Julliard Dec. 27, 2023

Dec. 27, 2023

Module: wine Branch: master Commit: 91a29134ff35c0a6e388329ea819dd73651062b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/91a29134ff35c0a6e388329ea819dd… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Dec 15 14:59:25 2023 +0000 dmime: Fix handling of curve PMSG. DMUS_PMSG::dwType is the type of the message, but we are comparing it to curve types. We should be using DMUS_CURVE_PMSG::bType instead. --- dlls/dmime/performance.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 1d1da250cc3..bd596750f34 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -2087,7 +2087,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, DMUS_CURVE_PMSG *curve = (DMUS_CURVE_PMSG *)msg; msg->mtTime += curve->nOffset; - switch (curve->dwType) + switch (curve->bType) { case DMUS_CURVET_CCCURVE: if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, @@ -2096,7 +2096,13 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, break; case DMUS_CURVET_RPNCURVE: case DMUS_CURVET_NRPNCURVE: - FIXME("Unhandled curve type %#lx\n", curve->dwType); + case DMUS_CURVET_MATCURVE: + case DMUS_CURVET_PATCURVE: + case DMUS_CURVET_PBCURVE: + FIXME("Unhandled curve type %#x\n", curve->bType); + break; + default: + WARN("Invalid curve type %#x\n", curve->bType); break; }

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard Dec. 27, 2023

Dec. 27, 2023

Module: wine Branch: master Commit: 46030d41fd12c12e596e324e8fd8f82be9fdd227 URL: https://gitlab.winehq.org/wine/wine/-/commit/46030d41fd12c12e596e324e8fd8f8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Dec 27 09:27:26 2023 +0200 readme: Update Finnish translation. --- documentation/README.fi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 00af959c033..f49b36ea4a5 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -36,7 +36,7 @@ ennen kaikkea Internetissä osoitteessa https://www.winehq.org/. Winen kääntämiseen tarvitaan jokin seuraavista: Linuxin versio 2.0.36 tai uudempi - FreeBSD 8.0 tai uudempi + FreeBSD 12.4 tai uudempi Solaris x86 9 tai uudempi NetBSD-current Mac OS X 10.8 tai uudempi @@ -46,8 +46,7 @@ mainittuja käyttöjärjestelmiä tuetaan; tulevaisuudessa saatetaan lisätä tu muillekin käyttöjärjestelmille, joissa on tarvittava tuki säikeille. Tietoa FreeBSD:lle: - Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin FreeBSD 8.0. - Osoitteessa https://wiki.freebsd.org/Wine kerrotaan tästä lisää. + Osoitteessa https://wiki.freebsd.org/Wine on lisätietoa. Tietoa Solarikselle: Wine täytyy luultavasti kääntää GNU-työkaluilla (gcc, gas jne.).

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 27, 2023

Dec. 27, 2023

Module: wine Branch: master Commit: eca7de021b79395f7fbd96d6a218b3c81cc6d9b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/eca7de021b79395f7fbd96d6a218b3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Dec 27 09:27:07 2023 +0200 po: Update Finnish translation. --- po/fi.po | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2523178931e..5eea2dcccb7 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-03-17 20:32+0200\n" +"PO-Revision-Date: 2023-12-27 19:27+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -12615,10 +12615,8 @@ msgid "Duplex:" msgstr "Kaksipuolinen:" #: dlls/wineps.drv/wineps.rc:45 -#, fuzzy -#| msgid "&Tray:" msgid "Paper &Tray:" -msgstr "&Syöttö:" +msgstr "&Paperilähde:" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm" @@ -14697,17 +14695,13 @@ msgid "&Run..." msgstr "&Suorita..." #: programs/explorer/explorer.rc:36 -#, fuzzy -#| msgid "E&xit Windows" msgid "E&xit desktop" -msgstr "&Poistu Windowsista" +msgstr "&Sulje työpöytä" #: programs/explorer/explorer.rc:37 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "" "Are you sure you want to close all programs and exit the virtual desktop?" -msgstr "Haluatko varmasti tuhota nämä arvot?" +msgstr "Haluatko varmasti lopettaa kaikki ohjelmat ja sulkea työpöydän?" #: programs/findstr/findstr.rc:28 msgid "Usage: findstr /options string\n" @@ -15011,7 +15005,7 @@ msgstr "Seuraavat palvelut ovat toiminnassa:\n" #: programs/net/net.rc:44 msgid "A command was used with conflicting switches.\n" -msgstr "" +msgstr "Annetut valitsimet ovat ristiriidassa.\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -18475,10 +18469,8 @@ msgid "&Theme:" msgstr "&Teema:" #: programs/winecfg/winecfg.rc:295 -#, fuzzy -#| msgid "&WinRT app theme:" msgid "&WinRT theme:" -msgstr "&WinRT-sovellusten teema:" +msgstr "&WinRT-teema:" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18497,10 +18489,8 @@ msgid "MIME types" msgstr "MIME-tyypit" #: programs/winecfg/winecfg.rc:311 -#, fuzzy -#| msgid "Manage file &associations" msgid "Manage file and protocol &associations" -msgstr "&Muokkaa tiedostosidoksia" +msgstr "&Muokkaa tiedosto- ja protokollasidoksia" #: programs/winecfg/winecfg.rc:314 msgid "Folders"

1 0

Brendan Shanks : server: Fix compile error on FreeBSD/NetBSD.
by Alexandre Julliard Dec. 27, 2023

Dec. 27, 2023

Module: wine Branch: master Commit: 6b4eae4088b19441a0185b5f4e5a4f11fb4d552d URL: https://gitlab.winehq.org/wine/wine/-/commit/6b4eae4088b19441a0185b5f4e5a4f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Dec 26 14:37:16 2023 -0800 server: Fix compile error on FreeBSD/NetBSD. F_GETPATH is currently only implemented on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56047 --- server/change.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/change.c b/server/change.c index 00d286ede7a..843e495411c 100644 --- a/server/change.c +++ b/server/change.c @@ -723,18 +723,18 @@ static unsigned int filter_from_inode( struct inode *inode, int is_parent ) static char *get_path_from_fd( int fd, int sz ) { -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +#ifdef linux + char *ret = malloc( 32 + sz ); + + if (ret) sprintf( ret, "/proc/self/fd/%u", fd ); + return ret; +#elif defined(F_GETPATH) char *ret = malloc( PATH_MAX + sz ); if (!ret) return NULL; if (!fcntl( fd, F_GETPATH, ret )) return ret; free( ret ); return NULL; -#elif defined(linux) - char *ret = malloc( 32 + sz ); - - if (ret) sprintf( ret, "/proc/self/fd/%u", fd ); - return ret; #else return NULL; #endif

1 0

Brendan Shanks : include: Assert that the debug channel name will be null-terminated and is not too long.
by Alexandre Julliard Dec. 27, 2023

Dec. 27, 2023

Module: wine Branch: master Commit: 2c14e0777a8a3ec10078811d84ad0989f5aef962 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c14e0777a8a3ec10078811d84ad09… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Dec 26 12:25:39 2023 -0800 include: Assert that the debug channel name will be null-terminated and is not too long. --- include/wine/debug.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 86e008a1408..ce5e141ccb7 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -501,9 +501,11 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) #define WINE_ERR_ON(ch) __WINE_IS_DEBUG_ON(_ERR,&__wine_dbch_##ch) #define WINE_DECLARE_DEBUG_CHANNEL(ch) \ - static struct __wine_debug_channel __wine_dbch_##ch = { 0xff, #ch } + static struct __wine_debug_channel __wine_dbch_##ch = { 0xff, #ch }; \ + C_ASSERT(sizeof(#ch) <= sizeof(__wine_dbch_##ch.name)) #define WINE_DEFAULT_DEBUG_CHANNEL(ch) \ static struct __wine_debug_channel __wine_dbch_##ch = { 0xff, #ch }; \ + C_ASSERT(sizeof(#ch) <= sizeof(__wine_dbch_##ch.name)); \ static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch #define WINE_MESSAGE wine_dbg_printf

1 0

Fan WenJie : wineandroid: Fix incorrect checking reason.
by Alexandre Julliard Dec. 27, 2023

Dec. 27, 2023

Module: wine Branch: master Commit: 857ce7eeb59204fd86bc8b5d3d27eb612983e5a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/857ce7eeb59204fd86bc8b5d3d27eb… Author: Fan WenJie <fanwj(a)mail.ustc.edu.cn> Date: Sun Dec 24 12:29:15 2023 +0800 wineandroid: Fix incorrect checking reason. Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn> --- dlls/wineandroid.drv/dllmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 320e47e88d2..1045a902ae9 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -119,7 +119,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) struct init_params params; void **callback_table; - if (reason == DLL_PROCESS_ATTACH) return TRUE; + if (reason != DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); if (__wine_init_unix_call()) return FALSE;

1 0

Tag wine-9.0-rc3 : Alexandre Julliard : Release 9.0-rc3
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: refs/tags/wine-9.0-rc3 Tag: c9bfb923f5be9d53d9e0011f0ad908629b759527 URL: https://gitlab.winehq.org/wine/wine/-/tags/c9bfb923f5be9d53d9e0011f0ad90862… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 21:55:14 2023 +0100 Release 9.0-rc3

1 0

Alexandre Julliard : Release 9.0-rc3.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: bba97115d1a0991e4a95e8b209cb502dd434042a URL: https://gitlab.winehq.org/wine/wine/-/commit/bba97115d1a0991e4a95e8b209cb50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 21:55:14 2023 +0100 Release 9.0-rc3. --- ANNOUNCE | 217 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +++--- 3 files changed, 120 insertions(+), 117 deletions(-)

1 0

Rémi Bernon : dmime/tests: Allow small time variation in test_performance_time.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: 2f86a5d6cbb081fa2eabeb80ef5357d2fd4f87a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f86a5d6cbb081fa2eabeb80ef5357… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 12:11:12 2023 +0100 dmime/tests: Allow small time variation in test_performance_time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55637 --- dlls/dmime/tests/dmime.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 5fff5ea02de..8f79511bf96 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -65,6 +65,11 @@ static double scale_music_time(MUSIC_TIME time, double tempo) return (600000000.0 * time) / (tempo * DMUS_PPQ); } +static MUSIC_TIME music_time_from_reference(REFERENCE_TIME time, double tempo) +{ + return (time * tempo * DMUS_PPQ) / 600000000; +} + #define check_dmus_note_pmsg(a, b, c, d, e, f, g) check_dmus_note_pmsg_(__LINE__, a, b, c, d, e, f, g) static void check_dmus_note_pmsg_(int line, DMUS_NOTE_PMSG *msg, MUSIC_TIME time, UINT chan, UINT duration, UINT key, UINT vel, UINT flags) @@ -2896,7 +2901,7 @@ static void test_performance_time(void) hr = IDirectMusicPerformance_GetTime(performance, &time, &music_time); ok(hr == S_OK, "got %#lx\n", hr); ok(time - init_time <= 200 * 10000, "got %I64d\n", time - init_time); - ok(music_time == (time - init_time) / 6510, "got %ld\n", music_time); + ok(abs(music_time - music_time_from_reference(time - init_time, 120)) <= 1, "got %ld\n", music_time); hr = IDirectMusicPerformance_CloseDown(performance);

1 0

Rémi Bernon : dmime/tests: Remove some unnecessary and spuriously failing waits.
by Alexandre Julliard Dec. 22, 2023

Dec. 22, 2023

Module: wine Branch: master Commit: 930776022d33b5d1745d59cd4a4671e1fd347b11 URL: https://gitlab.winehq.org/wine/wine/-/commit/930776022d33b5d1745d59cd4a4671… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 12:12:49 2023 +0100 dmime/tests: Remove some unnecessary and spuriously failing waits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55637 --- dlls/dmime/tests/dmime.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index cf45f30777f..f5ae845cf97 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3296,8 +3296,6 @@ static void test_notification_pmsg(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - ret = test_tool_wait_message(tool, 50, &msg); - ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); ret = test_tool_wait_message(tool, 500, &msg); ok(!ret, "got %#lx\n", ret); check_dmus_dirty_pmsg(msg, music_time + length); @@ -3534,9 +3532,6 @@ static void test_notification_pmsg(void) hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - ret = test_tool_wait_message(tool, 500, &msg); - ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); - IDirectMusicSegmentState_Release(state); IDirectMusicSegment_Release(segment);

1 0