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

Alexandre Julliard : Release 9.8.
by Alexandre Julliard May 3, 2024

May 3, 2024

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 May 3, 2024

May 3, 2024

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

Rémi Bernon : winex11: Remove duplicated foreign window class string constant.
by Alexandre Julliard May 3, 2024

May 3, 2024

Module: wine Branch: master Commit: 97cb5b9cb43cb432b1bcc389cef6f339337c4267 URL: https://gitlab.winehq.org/wine/wine/-/commit/97cb5b9cb43cb432b1bcc389cef6f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 3 14:44:42 2024 +0200 winex11: Remove duplicated foreign window class string constant. --- dlls/winex11.drv/window.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b5061463b10..f8202750695 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2171,7 +2171,6 @@ static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *wi */ HWND create_foreign_window( Display *display, Window xwin ) { - static const WCHAR classW[] = {'_','_','w','i','n','e','_','x','1','1','_','f','o','r','e','i','g','n','_','w','i','n','d','o','w',0}; static BOOL class_registered; struct x11drv_win_data *data; HWND hwnd, parent; @@ -2181,7 +2180,7 @@ HWND create_foreign_window( Display *display, Window xwin ) unsigned int nchildren; XWindowAttributes attr; UINT style = WS_CLIPCHILDREN; - UNICODE_STRING class_name = RTL_CONSTANT_STRING( classW ); + UNICODE_STRING class_name = RTL_CONSTANT_STRING( foreign_window_prop ); if (!class_registered) { @@ -2191,7 +2190,7 @@ HWND create_foreign_window( Display *display, Window xwin ) memset( &class, 0, sizeof(class) ); class.cbSize = sizeof(class); class.lpfnWndProc = client_foreign_window_proc; - class.lpszClassName = classW; + class.lpszClassName = foreign_window_prop; if (!NtUserRegisterClassExWOW( &class, &class_name, &version, NULL, 0, 0, NULL ) && RtlGetLastWin32Error() != ERROR_CLASS_ALREADY_EXISTS) { @@ -2227,7 +2226,6 @@ HWND create_foreign_window( Display *display, Window xwin ) pos.y = attr.y; } - RtlInitUnicodeString( &class_name, classW ); 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 );

1 0

Rémi Bernon : winex11: Don't call x11drv_xinput2_disable for foreign windows.
by Alexandre Julliard May 3, 2024

May 3, 2024

Module: wine Branch: master Commit: 749574a298b43584e0a7955779158aa3ab767a08 URL: https://gitlab.winehq.org/wine/wine/-/commit/749574a298b43584e0a7955779158a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 3 14:18:59 2024 +0200 winex11: Don't call x11drv_xinput2_disable for foreign windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56429 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56607 --- dlls/winex11.drv/window.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 68b34fa868d..b5061463b10 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1807,12 +1807,7 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des Window xwin = (Window)NtUserGetProp( data->hwnd, foreign_window_prop ); if (xwin) { - if (!already_destroyed) - { - x11drv_xinput2_disable( data->display, xwin ); - XSelectInput( data->display, xwin, 0 ); - } - + if (!already_destroyed) XSelectInput( data->display, xwin, 0 ); XDeleteContext( data->display, xwin, winContext ); NtUserRemoveProp( data->hwnd, foreign_window_prop ); }

1 0

Peter Johnson : wined3d: Added missing GTX 3080 & 1070M.
by Alexandre Julliard May 3, 2024

May 3, 2024

Module: wine Branch: master Commit: b0a5fa50f98990ef42fd8744c9f99988885a03f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0a5fa50f98990ef42fd8744c9f999… Author: Peter Johnson <peterghost86(a)gmail.com> Date: Wed May 1 22:51:38 2024 +0800 wined3d: Added missing GTX 3080 & 1070M. --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e4d123519fe..b34b5f9374a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1318,6 +1318,7 @@ cards_nvidia_binary[] = /* Direct 3D 11 */ {"Tesla T4", CARD_NVIDIA_TESLA_T4}, {"Ampere A10", CARD_NVIDIA_AMPERE_A10}, + {"RTX 3080", CARD_NVIDIA_GEFORCE_RTX3080}, /* GeForce 3000 - highend */ {"RTX 3070", CARD_NVIDIA_GEFORCE_RTX3070}, /* GeForce 3000 - highend */ {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ @@ -1332,6 +1333,7 @@ cards_nvidia_binary[] = {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ + {"GTX 1070M", CARD_NVIDIA_GEFORCE_GTX1070M}, /* GeForce 1000 - highend */ {"GTX 1060 3GB", CARD_NVIDIA_GEFORCE_GTX1060_3GB},/* GeForce 1000 - midend high */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ {"GTX 1050 Ti", CARD_NVIDIA_GEFORCE_GTX1050TI}, /* GeForce 1000 - midend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bccec55528f..97e1880f3f1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -466,6 +466,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_KEPLER, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060M, "NVIDIA GeForce GTX 1060M", DRIVER_NVIDIA_KEPLER, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_KEPLER, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070M, "NVIDIA GeForce GTX 1070M", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080M, "NVIDIA GeForce GTX 1080M", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, @@ -480,6 +481,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX3070, "NVIDIA GeForce RTX 3070", DRIVER_NVIDIA_KEPLER, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX3080, "NVIDIA GeForce RTX 3080", DRIVER_NVIDIA_KEPLER, 10240}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_AMPERE_A10, "NVIDIA Ampere A10", DRIVER_NVIDIA_KEPLER, 24576}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1867b864d34..5f0c88eda97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2364,6 +2364,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1060M = 0x1c20, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, + CARD_NVIDIA_GEFORCE_GTX1070M = 0x1be1, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_NVIDIA_GEFORCE_GTX1080M = 0x1be0, CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, @@ -2378,6 +2379,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, CARD_NVIDIA_GEFORCE_RTX3070 = 0x249d, + CARD_NVIDIA_GEFORCE_RTX3080 = 0x2206, CARD_NVIDIA_TESLA_T4 = 0x1eb8, CARD_NVIDIA_AMPERE_A10 = 0x2236,

1 0

Alexandre Julliard : faudio: Import upstream release 24.05.
by Alexandre Julliard May 3, 2024

May 3, 2024

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 : png: Import upstream release 1.6.43.
by Alexandre Julliard May 3, 2024

May 3, 2024

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 May 3, 2024

May 3, 2024

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

Alexandre Julliard : fluidsynth: Import upstream release 2.3.5.
by Alexandre Julliard May 3, 2024

May 3, 2024

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

Brendan Shanks : winemac.drv: Fix use-after-free in macdrv_copy_pasteboard_types.
by Alexandre Julliard May 3, 2024

May 3, 2024

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