November 2019 - Wine-Commits

Sven Baars : msrle32: Fix a memory leak (Valgrind).
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 191f5e03ae873dadb0321cd100e34a0309049921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191f5e03ae873dadb0321cd1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 2 16:21:37 2019 +0200 msrle32: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e5857da2736dafa11f560c36044dd2b2fbe815c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msrle32/msrle32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5bcfa86f97..5b17b25a0b 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1544,6 +1544,11 @@ static LRESULT CompressEnd(CodecInfo *pi) pi->pCurFrame = NULL; pi->nPrevFrame = -1; pi->bCompress = FALSE; + + if (pi->palette_map != NULL) { + LocalFree(pi->palette_map); + pi->palette_map = NULL; + } } return ICERR_OK;

1 0

Sven Baars : shell32: Fix an item identifier list leak (Valgrind).
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 86b5e684a4d902fba60ca6d523840faac56931e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86b5e684a4d902fba60ca6d5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 20:15:44 2019 +0200 shell32: Fix an item identifier list leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d0fa46553e17efd6f72b25aad3563e8c60b365d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d771d0b5fb..d5b55d59ac 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -784,6 +784,8 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); + ILFree(computer_pidl); + return TRUE; }

1 0

Aric Stewart : dinput: Handle case where IOHIDDeviceGetValue fails.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: d0a450a32c309d56ee9a1b36136019e37d9c280f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a450a32c309d56ee9a1b36… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 4 07:47:35 2019 -0500 dinput: Handle case where IOHIDDeviceGetValue fails. This prevents crashes if a controller disconnects from OS/X. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c5283300e10b289293203a02f765cf757e3e910e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_osx.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index ad664342f6..f8074b180d 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -801,7 +801,11 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) TRACE("kIOHIDElementTypeInput_Button\n"); if(button_idx < 128) { - IOHIDDeviceGetValue(hid_device, element, &valueRef); + valueRef = NULL; + if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) + return; + if (valueRef == NULL) + return; val = IOHIDValueGetIntegerValue(valueRef); newVal = val ? 0x80 : 0x0; oldVal = device->generic.js.rgbButtons[button_idx]; @@ -823,7 +827,11 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) case kHIDUsage_GD_Hatswitch: { TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Hatswitch\n"); - IOHIDDeviceGetValue(hid_device, element, &valueRef); + valueRef = NULL; + if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) + return; + if (valueRef == NULL) + return; val = IOHIDValueGetIntegerValue(valueRef); oldVal = device->generic.js.rgdwPOV[pov_idx]; if (val >= 8) @@ -850,7 +858,11 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) { int wine_obj = -1; - IOHIDDeviceGetValue(hid_device, element, &valueRef); + valueRef = NULL; + if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) + return; + if (valueRef == NULL) + return; val = IOHIDValueGetIntegerValue(valueRef); newVal = joystick_map_axis(&device->generic.props[idx], val); switch (usage)

1 0

Alexandre Julliard : server: Fix the returned error code for an invalid NT header offset.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: ef2cf798b3c28b9918a89157c7bbcd1822a67246 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2cf798b3c28b9918a89157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 20:30:35 2019 +0200 server: Fix the returned error code for an invalid NT header offset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47359 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f59d05223d68522853dae6aa52f2308da759a94b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/loader.c | 5 +++++ server/mapping.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 01c7cfa8a9..5dd46f98e9 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -992,6 +992,11 @@ static void test_Loader(void) } ((IMAGE_OS2_HEADER *)&nt_header)->ne_exetyp = ((IMAGE_OS2_HEADER *)&nt_header_template)->ne_exetyp; + dos_header.e_lfanew = 0x98760000; + status = map_image_section( &nt_header, &section, section_data, __LINE__ ); + ok( status == STATUS_INVALID_IMAGE_PROTECT, "NtCreateSection error %08x\n", status ); + + dos_header.e_lfanew = sizeof(dos_header); nt_header.Signature = 0xdeadbeef; status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_PROTECT, "NtCreateSection error %08x\n", status ); diff --git a/server/mapping.c b/server/mapping.c index ea49e1ab43..cc06106e3f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -581,7 +581,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s pos = dos.e_lfanew; size = pread( unix_fd, &nt, sizeof(nt), pos ); - if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_FORMAT; + if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader ); if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size );

1 0

Sven Baars : wmp: Fix a crash in put_volume when basic_audio is NULL.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 7d8a34d6a1c5ad11f088603fa2e165cfb78ea1ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8a34d6a1c5ad11f088603f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Aug 17 18:50:16 2019 +0200 wmp: Fix a crash in put_volume when basic_audio is NULL. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e8cf8082c3523957f6b19f49e820d910c16faa7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmp/player.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 519ffa1d18..d578b0a16b 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -969,18 +969,18 @@ static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v) { - HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); TRACE("(%p)->(%d)\n", This, v); This->volume = v; - if (!This->filter_graph) { - hres = S_OK; - } else { - /* IBasicAudio - [-10000, 0], wmp - [0, 100] */ - v = 10000 * v / 100 - 10000; - hres = IBasicAudio_put_Volume(This->basic_audio, v); - } - return hres; + if (!This->filter_graph) + return S_OK; + + /* IBasicAudio - [-10000, 0], wmp - [0, 100] */ + v = 10000 * v / 100 - 10000; + if (!This->basic_audio) + return S_FALSE; + + return IBasicAudio_put_Volume(This->basic_audio, v); } static HRESULT WINAPI WMPSettings_getMode(IWMPSettings *iface, BSTR mode, VARIANT_BOOL *p)

1 0

Rémi Bernon : wined3d: Add GPU information for Intel UHD Graphics 620.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 9475480548f0a0cc5161c4f7d7dcdce5fa454f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9475480548f0a0cc5161c4f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 26 15:21:47 2019 +0200 wined3d: Add GPU information for Intel UHD Graphics 620. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 08141ee9bdd387409b36d86517ccdf94e2b31f70) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5712905bf0..57e8ac4811 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -479,6 +479,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD620, "Intel(R) UHD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c4097fd43c..19e294fe51 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2531,6 +2531,7 @@ enum wined3d_pci_device CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, CARD_INTEL_UHD617 = 0x87c0, + CARD_INTEL_UHD620 = 0x3ea0, CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b,

1 0

Alex Henrie : server: Fix use after free in add_committed_range (scan-build).
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 85dfdc2eb587e8bd6672dd2df8ab25e4ffeccffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=85dfdc2eb587e8bd6672dd2d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 11 21:05:06 2019 -0600 server: Fix use after free in add_committed_range (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3c9fdf8522040861a7a9bf96ba385fc166965fc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index cc06106e3f..f565aa7008 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -401,7 +401,7 @@ static void add_committed_range( struct memory_view *view, file_pos_t start, fil struct range *new_ptr = realloc( committed->ranges, new_size * sizeof(*new_ptr) ); if (!new_ptr) return; committed->max = new_size; - committed->ranges = new_ptr; + ranges = committed->ranges = new_ptr; } memmove( &ranges[i + 1], &ranges[i], (committed->count - i) * sizeof(*ranges) ); ranges[i].start = start;

1 0

Alexandre Julliard : widl: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 87e7425820570449e8b88b4c5ea2cca85cf7fae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e7425820570449e8b88b4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:22 2019 +0200 widl: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ea4d5971bff3430c29f1da31166b0a2565347ab) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d979394182..2b5b297870 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -318,7 +318,7 @@ static typelib_t *current_typelib; %right '!' '~' CAST PPTR POS NEG ADDRESSOF tSIZEOF %left '.' MEMBERPTR '[' ']' -%error-verbose +%define parse.error verbose %%

1 0

Alexandre Julliard : d3dcompiler: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 09f48cc2496e3697de6df490180aead12e77b322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f48cc2496e3697de6df490… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:53 2019 +0200 d3dcompiler: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d27c13d5ea76ec80e2a67272c8eafe8527e6af0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c2c415f858..358ed96ef4 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -903,7 +903,7 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %} %locations -%error-verbose +%define parse.error verbose %expect 1 %union

1 0

Zebediah Figura : ucrtbase/tests: Add some tests for __stdio_common_vsscanf().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 090c7ad438e82c3b18de52750406481b049ee003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=090c7ad438e82c3b18de5275… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 20:19:49 2019 -0400 ucrtbase/tests: Add some tests for __stdio_common_vsscanf(). Based on msvcrt:scanf tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 353ea070f3874e1eb9ed658f7eb283ddb84a1e74) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/scanf.c | 276 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=090c7ad438e82c3b18de…

1 0