November 2022 - Wine-commits

Michael Stefaniuc : tools: Import make_announce changes from the devel tree.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 8e4f7ddcef4a9b2913569e96431fe53c1fb20623 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e4f7ddcef4a9b2913569e96431fe5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 7 18:17:11 2022 +0100 tools: Import make_announce changes from the devel tree. Partial cherry-pick of a1af412482d36c4046061faa676ff7bc774f40eb Changes by Alexandre Julliard. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index b38b7b0a70a..cd61cbb6bce 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -144,24 +144,20 @@ print NEW "----------------------------------------------------------------\n\n" printf NEW "Bugs fixed in %s (total %u):\n\n", $new, scalar( keys %bugs ); foreach my $id (sort {$a <=> $b} keys %bugs) { - printf NEW " %6d %s\n", $id, unescape( $bugs{$id} ); + printf NEW " - #%-6d %s\n", $id, unescape( $bugs{$id} ); } print NEW "\n----------------------------------------------------------------\n\n"; -print NEW "Changes since $old:\n\n"; +print NEW "Changes since $old:\n"; open LOG, "-|" or exec "git", "shortlog", "wine-$old..HEAD" or die "cannot run git shortlog"; while (<LOG>) { - if (/^(\S.*)\s$\d+$:$/) { $authors{$1} = 1; } + next if /^$/; + if (/^(\S.*)\s$\d+$:$/) { $authors{$1} = 1; print NEW "\n"; } print NEW $_; } close LOG; - -while (<ANNOUNCE>) { last if /^--$/; } -print NEW "--\n"; -while (<ANNOUNCE>) { print NEW $_; } - close ANNOUNCE; close NEW; update_file( "ANNOUNCE" );

1 0

Michael Stefaniuc : Release 7.0.1.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 8a6bc2c73736fd65af0ee910ef0316706b149aff URL: https://gitlab.winehq.org/wine/wine/-/commit/8a6bc2c73736fd65af0ee910ef0316… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 28 21:03:17 2022 +0200 Release 7.0.1. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- ANNOUNCE | 657 ++++++++++++++++++++++---------------------------------------- AUTHORS | 6 + VERSION | 2 +- configure | 18 +- 4 files changed, 251 insertions(+), 432 deletions(-)

1 0

Alex Henrie : dbghelp: Fix memory leak on error path in dwarf2_read_range (cppcheck).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 19f3ef9123997e1d8cc01ffd4b99b54d2f46e6b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/19f3ef9123997e1d8cc01ffd4b99b5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:13 2022 -0700 dbghelp: Fix memory leak on error path in dwarf2_read_range (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 950792ae2b60d82ed101baa00b7bcc0dd9ba4ad8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7472b6070e6..fc88b741a56 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1289,6 +1289,7 @@ static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsig { struct attribute range; struct addr_range* ranges; + struct addr_range* new_ranges; if (dwarf2_find_attribute(di, DW_AT_ranges, &range)) { @@ -1312,8 +1313,13 @@ static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsig if (*num_ranges >= alloc) { alloc *= 2; - ranges = realloc(ranges, sizeof(struct addr_range) * alloc); - if (!ranges) return NULL; + new_ranges = realloc(ranges, sizeof(struct addr_range) * alloc); + if (!new_ranges) + { + free(ranges); + return NULL; + } + ranges = new_ranges; } ranges[*num_ranges].low = di->unit_ctx->compiland->address + low; ranges[*num_ranges].high = di->unit_ctx->compiland->address + high;

1 0

Alex Henrie : ws2_32: Fix memory leak on error path in get_local_ips (cppcheck).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e4fc629062039cc20a75b1d3f368a4d772d0ea84 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4fc629062039cc20a75b1d3f368a4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:18 2022 -0700 ws2_32: Fix memory leak on error path in get_local_ips (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 978df2e0310f0950e51f0cdf3e45fde546ea7cf0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/protocol.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 867e9513ca2..56b7379cccc 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -806,7 +806,7 @@ static struct hostent *get_local_ips( char *hostname ) IP_ADAPTER_INFO *adapters = NULL, *k; struct hostent *hostlist = NULL; MIB_IPFORWARDTABLE *routes = NULL; - struct route *route_addrs = NULL; + struct route *route_addrs = NULL, *new_route_addrs; DWORD adap_size, route_size, n; /* Obtain the size of the adapter list and routing table, also allocate memory */ @@ -852,9 +852,10 @@ static struct hostent *get_local_ips( char *hostname ) } if (exists) continue; - route_addrs = realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); - if (!route_addrs) + new_route_addrs = realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); + if (!new_route_addrs) goto cleanup; + route_addrs = new_route_addrs; route_addrs[numroutes].interface = ifindex; route_addrs[numroutes].metric = ifmetric; route_addrs[numroutes].default_route = ifdefault;

1 0

Alex Henrie : ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 8858479b5c4673540ca6ff4317f56c3a3e0e999f URL: https://gitlab.winehq.org/wine/wine/-/commit/8858479b5c4673540ca6ff4317f56c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:19 2022 -0700 ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6daef74f67690372e7bde377dffa0db63b25d9f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/unixlib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 56a0bed308d..0625c5c72ce 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -865,9 +865,9 @@ static NTSTATUS unix_gethostbyaddr( void *args ) } if (!unix_host) - return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); - - ret = hostent_from_unix( unix_host, params->host, params->size ); + ret = (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + else + ret = hostent_from_unix( unix_host, params->host, params->size ); free( unix_buffer ); return ret; @@ -915,9 +915,9 @@ static NTSTATUS unix_gethostbyname( void *args ) } if (!unix_host) - return (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); - - ret = hostent_from_unix( unix_host, params->host, params->size ); + ret = (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + else + ret = hostent_from_unix( unix_host, params->host, params->size ); free( unix_buffer ); return ret;

1 0

Alex Henrie : sane: Fix memory leak in create_item (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 42a167cdce40568de980323b7edafb1286ff83ba URL: https://gitlab.winehq.org/wine/wine/-/commit/42a167cdce40568de980323b7edafb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 21:35:00 2022 -0700 sane: Fix memory leak in create_item (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 746b5bbd50c6041f19c3810b7fb20d762ac9e15f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sane.ds/ui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 8be7ed42b70..e66526a088e 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -318,6 +318,7 @@ static int create_item(HDC hdc, const struct option_descriptor *opt, if (trail_edit) *count+=1; + free(trail_edit); return leading_len + local_len + padding + padding2 + trail_len; }

1 0

Alex Henrie : winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 542d9a925d66caff063fc28ee83747f519f8b5bb URL: https://gitlab.winehq.org/wine/wine/-/commit/542d9a925d66caff063fc28ee83747… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 21:35:01 2022 -0700 winspool: Fix memory leaks on error path in DeviceCapabilitiesA (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5a12c6a481c157a299821cb85874819c181081a4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 971eb654e6a..52edd362622 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1775,7 +1775,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, WCHAR *outputW; ret = DeviceCapabilitiesW(device_name, port, cap, NULL, devmode); - if (ret == -1) return ret; + if (ret == -1) goto cleanup; switch (cap) { case DC_BINNAMES: @@ -1795,6 +1795,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, } else { ret = DeviceCapabilitiesW(device_name, port, cap, (WCHAR *)output, devmode); } +cleanup: HeapFree(GetProcessHeap(), 0, device_name); HeapFree(GetProcessHeap(), 0, devmode); HeapFree(GetProcessHeap(), 0, port);

1 0

Zebediah Figura : setupapi: Avoid leaking subKey in SETUPDI_AddDeviceInterfaces().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 39d328e958faf7a685693c8635ff57b2ebdaaa25 URL: https://gitlab.winehq.org/wine/wine/-/commit/39d328e958faf7a685693c8635ff57… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 16:18:20 2022 -0500 setupapi: Avoid leaking subKey in SETUPDI_AddDeviceInterfaces(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 93d8a86ce22c0295219cd709eecdee871c37f4b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ecc0b58ca5c..34beae23bdc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2281,8 +2281,8 @@ static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, (BYTE *)symbolicLink, &len); if (!l && dataType == REG_SZ) SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); - RegCloseKey(subKey); } + RegCloseKey(subKey); } } /* Allow enumeration to continue */

1 0

Zebediah Figura : server: Allocate enough space for the backslash in dup_nt_name() (Valgrind).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e303dfe7ccec7395f1d38a2c8330053c82c703fc URL: https://gitlab.winehq.org/wine/wine/-/commit/e303dfe7ccec7395f1d38a2c833005… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 20 16:12:32 2022 -0600 server: Allocate enough space for the backslash in dup_nt_name() (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b32a327f898cb2a8225669a2b945f0f606bf19e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index c9a21186722..1b4b98b0e76 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1867,7 +1867,7 @@ static WCHAR *dup_nt_name( struct fd *root, struct unicode_str name, data_size_t name.str++; name.len -= sizeof(WCHAR); } - if ((ret = malloc( retlen + name.len + 1 ))) + if ((ret = malloc( retlen + name.len + sizeof(WCHAR) ))) { memcpy( ret, root->nt_name, root->nt_namelen ); if (name.len && name.str[0] != '\\' &&

1 0

Alex Henrie : shell32: Fix sizeof argument in DoPaste (Coverity).
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 2b1f1bd7ea007c5b0fc3bd56cdda84877a3d7ed6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b1f1bd7ea007c5b0fc3bd56cdda84… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 3 21:56:22 2022 -0600 shell32: Fix sizeof argument in DoPaste (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68c3ac76808e747f8a1fd9f5458bee5dc33fed03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 6c05904bb91..a7e14b3e241 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1218,7 +1218,7 @@ static HRESULT DoPaste(ContextMenu *This) TRACE("CF_HDROP=%p\n", medium.u.hGlobal); count = DragQueryFileW(medium.u.hGlobal, -1, NULL, 0); - pidls = SHAlloc(count*sizeof(ITEMIDLIST**)); + pidls = SHAlloc(count*sizeof(ITEMIDLIST*)); if (pidls) { for (i = 0; i < count; i++)

1 0