February 2022 - Wine-Commits

Francois Gouget : testbot/SetWinLocale: Add support for a 'mixed' locale.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: tools Branch: master Commit: 0183cc0b42c01d149f788180a2b914d1ee771c09 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0183cc0b42c01d149f78818… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 3 19:25:58 2022 +0100 testbot/SetWinLocale: Add support for a 'mixed' locale. The special 'mx-MX' locale sets all locale settings to different values in order to detect when the Wine tests use the wrong locale API. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0d4c305..df0d6f7 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -416,7 +416,7 @@ while (@ARGV) } # Check and untaint parameters -my $CountryId; +my ($Keyboard, $CountryId); if (!defined $Usage) { if (!defined $OptHostName) @@ -437,11 +437,31 @@ if (!defined $Usage) $OptLocale ||= $OptDefault; $OptSystem ||= $OptDefault; $OptMUI ||= $OptDefault; - + $Keyboard = $OptKeyboard || $OptDefault; if (!$OptCountry and ($OptDefault || "") =~ /-([A-Z]{2})$/) { $OptCountry = $1; } + + # The "mixed" locale is used to make sure the tests each use the right + # locale API. To do so set each locale setting to a different value, each + # producing different results (e.g. different date format, decimal separator, + # etc). + my $MXStr = ""; + sub SetMX($$$) + { + my ($Value, $Option, $MXValue) = @_; + return $Value if (!$Value or $Value !~ /^(?:mx-|MX$)/); + $MXStr .= " $Option $MXValue"; + return $MXValue; + } + $OptLocale = SetMX($OptLocale, "--locale", "fr-FR"); + $OptCountry = SetMX($OptCountry, "--country", "TO"); + $OptSystem = SetMX($OptSystem, "--system", "ja-JP"); + $OptMUI = SetMX($OptMUI, "--mui", "ko-KR"); + $Keyboard = SetMX($Keyboard, "--keyboard", "es-ES"); + Info("using$MXStr\n") if ($MXStr); + if ($OptCountry) { $CountryId = $Countries{$OptCountry}; @@ -453,8 +473,7 @@ if (!defined $Usage) } if (!$OptLocale and !$OptCountry and !$OptSystem and !$OptUTF8 and - !$OptMUI and !$OptKeyboard and !defined $OptSysCopy and - !defined $OptDefCopy) + !$OptMUI and !$Keyboard and !defined $OptSysCopy and !defined $OptDefCopy) { if (!$OptShow) { @@ -468,7 +487,7 @@ if (!defined $Usage) } } if ($OptShow and ($OptLocale or $OptCountry or $OptSystem or $OptUTF8 or - $OptMUI or $OptKeyboard or defined $OptSysCopy or + $OptMUI or $Keyboard or defined $OptSysCopy or defined $OptDefCopy or defined $OptUseIntl or defined $OptReboot)) { @@ -822,8 +841,8 @@ sub GetKeyboardIds($) my $LCIDLocale = GetLCID($OptLocale); my $LCIDSystem = GetLCID($OptSystem); -my $KeyboardIds = GetKeyboardIds($OptKeyboard || $OptDefault); -if (!$KeyboardIds and ($OptKeyboard or $OptDefault)) +my $KeyboardIds = GetKeyboardIds($Keyboard); +if (!$KeyboardIds and $Keyboard) { if ($OptKeyboard) { @@ -832,9 +851,8 @@ if (!$KeyboardIds and ($OptKeyboard or $OptDefault)) # intl.cpl automatically pick the appropriate keyboard but, unlike # for Windows' initial installation, it does not make it the # default since the system has a keyboard already. - Warning("no known keyboard for the $OptDefault locale. Letting intl.cpl use its default.\n"); + Warning("no known keyboard for the $Keyboard locale. Letting intl.cpl use its default.\n"); } -$OptKeyboard ||= $OptDefault; # @@ -1001,7 +1019,7 @@ if ($OptMUI) } if ($KeyboardIds) { - CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); + CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $Keyboard", 1); } if ($OptSysCopy) @@ -1022,7 +1040,7 @@ if ($OptSysCopy) } if ($KeyboardIds) { - CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); + CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $Keyboard", 1); } } if (!$OptReboot and ($OptSystem or $OptMUI))

1 0

Hans Leidekker : bcrypt: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 045f50a78a210cc16e25ebffa276003ae69e1994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=045f50a78a210cc16e25ebff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 2 15:49:39 2022 +0100 bcrypt: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 - dlls/bcrypt/bcrypt_main.c | 127 ++++++++++++++++++++++++---------------------- dlls/bcrypt/gnutls.c | 14 ++--- 3 files changed, 73 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=045f50a78a210cc16e25…

1 0

Alex Henrie : ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build).
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 6daef74f67690372e7bde377dffa0db63b25d9f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6daef74f67690372e7bde377… 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> --- 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

Huw Davies : mountmgr: Fix long type warning.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 02b9dee237ca5571e4c3c215d1ec3087097725ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=02b9dee237ca5571e4c3c215… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 2 11:48:19 2022 +0000 mountmgr: Fix long type warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/cred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/cred.c b/dlls/mountmgr.sys/cred.c index 9fb9e433881..5c95dff5cab 100644 --- a/dlls/mountmgr.sys/cred.c +++ b/dlls/mountmgr.sys/cred.c @@ -64,7 +64,7 @@ NTSTATUS query_symbol_file( void *args ) if (!(query_cfstring = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("com_apple_xcode_dsym_uuids == \"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X\""), - id->Data1, id->Data2, id->Data3, id->Data4[0], + (unsigned int)id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ))) return STATUS_NO_MEMORY;

1 0

Alex Henrie : dbghelp: Fix memory leak on error path in dwarf2_read_range (cppcheck).
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 950792ae2b60d82ed101baa00b7bcc0dd9ba4ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950792ae2b60d82ed101baa0… 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> --- 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

Hans Leidekker : kerberos: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 867dfae7749b9361f0b2fec1f246f8bd01aa3ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=867dfae7749b9361f0b2fec1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 2 15:49:38 2022 +0100 kerberos: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/Makefile.in | 1 - dlls/kerberos/krb5_ap.c | 48 +++++++++++++++++++++++------------------------ dlls/kerberos/unixlib.c | 40 ++++++++++++++++++++------------------- 3 files changed, 45 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=867dfae7749b9361f0b2…

1 0

Alex Henrie : ws2_32: Fix memory leak on error path in get_local_ips (cppcheck).
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 978df2e0310f0950e51f0cdf3e45fde546ea7cf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=978df2e0310f0950e51f0cdf… 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> --- 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 : explorer: Only try to destroy the IShellWindows object if it exists.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: adda27cdb82fd40ef71e554b8ba17244cb871710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adda27cdb82fd40ef71e554b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 30 19:25:07 2022 -0700 explorer: Only try to destroy the IShellWindows object if it exists. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52494 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index cb0d63fb688..8fa732d6c1a 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -671,8 +671,11 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L switch(uMsg) { case WM_DESTROY: - IShellWindows_Revoke(info->sw, info->sw_cookie); - IShellWindows_Release(info->sw); + if(info->sw) + { + IShellWindows_Revoke(info->sw, info->sw_cookie); + IShellWindows_Release(info->sw); + } IExplorerBrowser_Unadvise(browser,info->advise_cookie); IExplorerBrowser_Destroy(browser);

1 0

Eric Pouech : windowscodecs: Remove useless casts to long.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: df091ef01d96419b3fde447f418cecb69c291781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df091ef01d96419b3fde447f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:06:09 2022 +0100 windowscodecs: Remove useless casts to long. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ungif.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index c6711c8e24c..0f5ed6e25d5 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -460,8 +460,7 @@ DGifGetImageDesc(GifFileType * GifFile) { GifFile->ImageCount++; - Private->PixelCount = (long)GifFile->Image.Width * - (long)GifFile->Image.Height; + Private->PixelCount = GifFile->Image.Width * GifFile->Image.Height; DGifSetupDecompress(GifFile); /* Reset decompress algorithm parameters. */

1 0

Alex Henrie : winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity).
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 2b63fdd9a5fb58951e90af877f79c0a65bd445ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b63fdd9a5fb58951e90af87… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:17 2022 -0700 winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity). And use a single variable for the encoded or decoded URL so that free only has to be called once. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/url.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 0d9dfb76de6..8efd5ed0c49 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -172,7 +172,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { - WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; @@ -189,25 +189,26 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) { - if ((err = escape_url( url, &len, &url_escaped ))) + if ((err = escape_url( url, &len, &url_transformed ))) { SetLastError( err ); return FALSE; } - url = url_escaped; + url = url_transformed; } else if (flags & ICU_DECODE) { - if (!(url_decoded = decode_url( url, &len ))) + if (!(url_transformed = decode_url( url, &len ))) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - url = url_decoded; + url = url_transformed; } if (!(p = wcschr( url, ':' ))) { SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + free( url_transformed ); return FALSE; } if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; @@ -331,8 +332,7 @@ exit: if (overflow) err = ERROR_INSUFFICIENT_BUFFER; uc->nScheme = scheme_number; } - free( url_decoded ); - free( url_escaped ); + free( url_transformed ); SetLastError( err ); return !err; }

1 0