May 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Avoid leaking foreign window data if it was already created.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: e2845104d15db4ce7c67d9848346877a89dbd790 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2845104d15db4ce7c67d984834687… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 3 14:19:47 2024 +0200 winex11: Avoid leaking foreign window data if it was already created. NtUserCreateWindowEx will call apply_window_pos and drivers WindowPosChanging callback, which already creates window data. --- dlls/winex11.drv/window.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f8202750695..c6bf49c6ec8 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2229,15 +2229,12 @@ HWND create_foreign_window( Display *display, Window xwin ) hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, style, pos.x, pos.y, attr.width, attr.height, parent, 0, NULL, NULL, 0, NULL, 0, FALSE ); - - if (!(data = alloc_win_data( display, hwnd ))) + if (!(data = get_win_data( hwnd ))) { NtUserDestroyWindow( hwnd ); return 0; } - SetRect( &data->window_rect, pos.x, pos.y, pos.x + attr.width, pos.y + attr.height ); - data->whole_rect = data->client_rect = data->window_rect; - data->whole_window = data->client_window = 0; + destroy_whole_window( data, FALSE ); data->embedded = TRUE; data->mapped = TRUE;

1 0

Rémi Bernon : mfreawrite/tests: Allow MF_E_SHUTDOWN result in test stream RequestSample.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: fd1d08ed5d448e32786128c17858039b9a48225b URL: https://gitlab.winehq.org/wine/wine/-/commit/fd1d08ed5d448e32786128c1785803… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 30 10:47:33 2024 +0200 mfreawrite/tests: Allow MF_E_SHUTDOWN result in test stream RequestSample. --- dlls/mfreadwrite/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index b70d0587072..a28cbea0c4d 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -361,7 +361,7 @@ static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUn hr = IMFMediaEventQueue_QueueEventParamUnk(stream->event_queue, MEMediaSample, &GUID_NULL, S_OK, (IUnknown *)sample); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); IMFSample_Release(sample); return S_OK;

1 0

Rémi Bernon : mf/tests: Add broken result for older Windows.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: 9a21b6a537a4735af9ed6df588db15c65009f29e URL: https://gitlab.winehq.org/wine/wine/-/commit/9a21b6a537a4735af9ed6df588db15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 30 10:58:37 2024 +0200 mf/tests: Add broken result for older Windows. --- dlls/mf/tests/transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 300a22094fb..d50b0d09082 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -7600,7 +7600,7 @@ static void test_video_processor(void) { .input_type_desc = rgb32_no_aperture, .input_bitmap = L"rgb32frame-crop.bmp", .output_type_desc = rgb32_with_aperture, .output_bitmap = L"rgb32frame-flip.bmp", - .output_sample_desc = &rgb32_sample_desc, + .output_sample_desc = &rgb32_sample_desc, .broken = TRUE /* old Windows version incorrectly rescale */ }, { .input_type_desc = rgb32_with_aperture, .input_bitmap = L"rgb32frame-flip.bmp",

1 0

Alexandre Julliard : Release 9.8.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: 655de4b0bf09746cd163dc771abd2c0f3c777447 URL: https://gitlab.winehq.org/wine/wine/-/commit/655de4b0bf09746cd163dc771abd2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 21:43:47 2024 +0200 Release 9.8. --- ANNOUNCE.md | 502 +++++++++++++++++++++++++++++++++++++----------------------- AUTHORS | 6 + VERSION | 2 +- configure | 18 +-- 4 files changed, 325 insertions(+), 203 deletions(-)

1 0

Tag wine-9.8 : Alexandre Julliard : Release 9.8
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: refs/tags/wine-9.8 Tag: 62d794324deb779bf3d50df9724da67c76aab511 URL: https://gitlab.winehq.org/wine/wine/-/tags/62d794324deb779bf3d50df9724da67c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 21:43:47 2024 +0200 Release 9.8

1 0

Alexandre Julliard : faudio: Import upstream release 24.05.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: 3e4185435843d368a4f521a1f6f14362d6286e24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e4185435843d368a4f521a1f6f143… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 16:07:08 2024 +0200 faudio: Import upstream release 24.05. --- libs/faudio/include/FAudio.h | 7 +++- libs/faudio/src/FACT.c | 2 +- libs/faudio/src/FACT_internal.c | 4 +- libs/faudio/src/FAudio.c | 68 ++++++++++++++++++++++++++++++++- libs/faudio/src/FAudio_internal.c | 2 +- libs/faudio/src/FAudio_internal.h | 28 +++++++++++--- libs/faudio/src/FAudio_internal_simd.c | 22 +++++------ libs/faudio/src/FAudio_platform_win32.c | 10 ++++- 8 files changed, 118 insertions(+), 25 deletions(-)

1 0

Alexandre Julliard : fluidsynth: Import upstream release 2.3.5.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: 80f6d511a1a0af3764c05c26039f2ade86301a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/80f6d511a1a0af3764c05c26039f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 21:28:39 2024 +0200 fluidsynth: Import upstream release 2.3.5. --- libs/fluidsynth/include/fluidsynth/version.h | 4 ++-- libs/fluidsynth/src/midi/fluid_midi.c | 2 +- libs/fluidsynth/src/synth/fluid_chan.c | 2 +- libs/fluidsynth/src/synth/fluid_synth.c | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/fluidsynth/include/fluidsynth/version.h b/libs/fluidsynth/include/fluidsynth/version.h index 96ee8183bd3..91fa462fc8c 100644 --- a/libs/fluidsynth/include/fluidsynth/version.h +++ b/libs/fluidsynth/include/fluidsynth/version.h @@ -31,10 +31,10 @@ extern "C" { * * @{ */ -#define FLUIDSYNTH_VERSION "2.3.4" /**< String constant of libfluidsynth version. */ +#define FLUIDSYNTH_VERSION "2.3.5" /**< String constant of libfluidsynth version. */ #define FLUIDSYNTH_VERSION_MAJOR 2 /**< libfluidsynth major version integer constant. */ #define FLUIDSYNTH_VERSION_MINOR 3 /**< libfluidsynth minor version integer constant. */ -#define FLUIDSYNTH_VERSION_MICRO 4 /**< libfluidsynth micro version integer constant. */ +#define FLUIDSYNTH_VERSION_MICRO 5 /**< libfluidsynth micro version integer constant. */ FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro); FLUIDSYNTH_API char* fluid_version_str(void); diff --git a/libs/fluidsynth/src/midi/fluid_midi.c b/libs/fluidsynth/src/midi/fluid_midi.c index dc6f0b865f3..4435efc5dcf 100644 --- a/libs/fluidsynth/src/midi/fluid_midi.c +++ b/libs/fluidsynth/src/midi/fluid_midi.c @@ -1644,7 +1644,7 @@ fluid_player_handle_reset_synth(void *data, const char *name, int value) static int check_for_on_notes(fluid_synth_t *synth) { fluid_voice_t* v[1024]; - int i, res=FALSE; + unsigned int i, res=FALSE; fluid_synth_get_voicelist(synth, v, FLUID_N_ELEMENTS(v), -1); for(i=0; i<FLUID_N_ELEMENTS(v) && v[i] != NULL; i++) { diff --git a/libs/fluidsynth/src/synth/fluid_chan.c b/libs/fluidsynth/src/synth/fluid_chan.c index 0f2eecb44e0..84ca446b783 100644 --- a/libs/fluidsynth/src/synth/fluid_chan.c +++ b/libs/fluidsynth/src/synth/fluid_chan.c @@ -325,7 +325,7 @@ fluid_channel_set_bank_msb(fluid_channel_t *chan, int bankmsb) /* XG bank, do drum-channel auto-switch */ /* The number "120" was based on several keyboards having drums at 120 - 127, reference: https://lists.nongnu.org/archive/html/fluid-dev/2011-02/msg00003.html */ - chan->channel_type = (120 <= bankmsb) ? CHANNEL_TYPE_DRUM : CHANNEL_TYPE_MELODIC; + chan->channel_type = (120 == bankmsb || 126 == bankmsb || 127 == bankmsb) ? CHANNEL_TYPE_DRUM : CHANNEL_TYPE_MELODIC; return; } diff --git a/libs/fluidsynth/src/synth/fluid_synth.c b/libs/fluidsynth/src/synth/fluid_synth.c index 0580ed271f6..93858173112 100644 --- a/libs/fluidsynth/src/synth/fluid_synth.c +++ b/libs/fluidsynth/src/synth/fluid_synth.c @@ -202,16 +202,16 @@ void fluid_synth_settings(fluid_settings_t *settings) fluid_settings_register_int(settings, "synth.verbose", 0, 0, 1, FLUID_HINT_TOGGLED); fluid_settings_register_int(settings, "synth.reverb.active", 1, 0, 1, FLUID_HINT_TOGGLED); - fluid_settings_register_num(settings, "synth.reverb.room-size", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0f, 1.0f, 0); - fluid_settings_register_num(settings, "synth.reverb.damp", FLUID_REVERB_DEFAULT_DAMP, 0.0f, 1.0f, 0); - fluid_settings_register_num(settings, "synth.reverb.width", FLUID_REVERB_DEFAULT_WIDTH, 0.0f, 100.0f, 0); - fluid_settings_register_num(settings, "synth.reverb.level", FLUID_REVERB_DEFAULT_LEVEL, 0.0f, 1.0f, 0); + fluid_settings_register_num(settings, "synth.reverb.room-size", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0, 1.0, 0); + fluid_settings_register_num(settings, "synth.reverb.damp", FLUID_REVERB_DEFAULT_DAMP, 0.0, 1.0, 0); + fluid_settings_register_num(settings, "synth.reverb.width", FLUID_REVERB_DEFAULT_WIDTH, 0.0, 100.0, 0); + fluid_settings_register_num(settings, "synth.reverb.level", FLUID_REVERB_DEFAULT_LEVEL, 0.0, 1.0, 0); fluid_settings_register_int(settings, "synth.chorus.active", 1, 0, 1, FLUID_HINT_TOGGLED); fluid_settings_register_int(settings, "synth.chorus.nr", FLUID_CHORUS_DEFAULT_N, 0, 99, 0); - fluid_settings_register_num(settings, "synth.chorus.level", FLUID_CHORUS_DEFAULT_LEVEL, 0.0f, 10.0f, 0); - fluid_settings_register_num(settings, "synth.chorus.speed", FLUID_CHORUS_DEFAULT_SPEED, 0.1f, 5.0f, 0); - fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0f, 256.0f, 0); + fluid_settings_register_num(settings, "synth.chorus.level", FLUID_CHORUS_DEFAULT_LEVEL, 0.0, 10.0, 0); + fluid_settings_register_num(settings, "synth.chorus.speed", FLUID_CHORUS_DEFAULT_SPEED, 0.1, 5.0, 0); + fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0, 256.0, 0); fluid_settings_register_int(settings, "synth.ladspa.active", 0, 0, 1, FLUID_HINT_TOGGLED); fluid_settings_register_int(settings, "synth.lock-memory", 1, 0, 1, FLUID_HINT_TOGGLED); @@ -223,12 +223,12 @@ void fluid_synth_settings(fluid_settings_t *settings) fluid_settings_register_int(settings, "synth.polyphony", 256, 1, 65535, 0); fluid_settings_register_int(settings, "synth.midi-channels", 16, 16, 256, 0); - fluid_settings_register_num(settings, "synth.gain", 0.2f, 0.0f, 10.0f, 0); + fluid_settings_register_num(settings, "synth.gain", 0.2, 0.0, 10.0, 0); fluid_settings_register_int(settings, "synth.audio-channels", 1, 1, 128, 0); fluid_settings_register_int(settings, "synth.audio-groups", 1, 1, 128, 0); fluid_settings_register_int(settings, "synth.effects-channels", 2, 2, 2, 0); fluid_settings_register_int(settings, "synth.effects-groups", 1, 1, 128, 0); - fluid_settings_register_num(settings, "synth.sample-rate", 44100.0f, 8000.0f, 96000.0f, 0); + fluid_settings_register_num(settings, "synth.sample-rate", 44100.0, 8000.0, 96000.0, 0); fluid_settings_register_int(settings, "synth.device-id", 0, 0, 127, 0); #ifdef ENABLE_MIXER_THREADS fluid_settings_register_int(settings, "synth.cpu-cores", 1, 1, 256, 0);

1 0

Alexandre Julliard : png: Import upstream release 1.6.43.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: ff77a49a5e4aa63b722fbe9d4dc941ccbd02cb42 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff77a49a5e4aa63b722fbe9d4dc941… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 21:34:34 2024 +0200 png: Import upstream release 1.6.43. --- libs/png/AUTHORS | 1 + libs/png/png.c | 41 +++++++++++++++++++---------------------- libs/png/png.h | 25 ++++++++++++------------- libs/png/pngconf.h | 2 +- libs/png/pnglibconf.h | 2 +- libs/png/pngread.c | 6 +++++- libs/png/pngrtran.c | 28 ++++++++++++---------------- 7 files changed, 51 insertions(+), 54 deletions(-)

1 0

Piotr Caban : winhttp: Use GlobalAlloc to allocate lpszProxy in WinHttpGetProxyForUrl.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: 9312c453785ebf3885723979aa6c60010787f66e URL: https://gitlab.winehq.org/wine/wine/-/commit/9312c453785ebf3885723979aa6c60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 14:50:58 2024 +0200 winhttp: Use GlobalAlloc to allocate lpszProxy in WinHttpGetProxyForUrl. --- dlls/winhttp/session.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 7860bf757f4..74c8d973f35 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1896,7 +1896,17 @@ static BOOL parse_script_result( const char *result, WINHTTP_PROXY_INFO *info ) p += 5; while (*p == ' ') p++; if (!*p || *p == ';') return TRUE; - if (!(info->lpszProxy = q = strdupAW( p ))) return FALSE; + if (!(q = strdupAW( p ))) return FALSE; + len = wcslen( q ); + info->lpszProxy = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ); + if (!info->lpszProxy) + { + free( q ); + return FALSE; + } + memcpy( info->lpszProxy, q, (len + 1) * sizeof(WCHAR) ); + free( q ); + q = info->lpszProxy; info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; for (; *q; q++) {

1 0

Brendan Shanks : winemac.drv: Fix use-after-free in macdrv_copy_pasteboard_types.
by Alexandre Julliard 03 May '24

03 May '24

Module: wine Branch: master Commit: 17cbc13b90e276465e0e56c58f885790b951a19a URL: https://gitlab.winehq.org/wine/wine/-/commit/17cbc13b90e276465e0e56c58f8857… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 2 16:02:24 2024 -0700 winemac.drv: Fix use-after-free in macdrv_copy_pasteboard_types. Fixes a regression from bb2e02ab66c5c602d635722cf3a5820d6b366006. --- dlls/winemac.drv/cocoa_clipboard.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index a3dca323705..4994442f1df 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -103,6 +103,7 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) @"com.compuserve.gif" : @(NSBitmapImageFileTypeGIF), @"public.jpeg" : @(NSBitmapImageFileTypeJPEG), }; + [BitmapOutputTypeMap retain]; }); OnMainThread(^{

1 0