wine-commits

wine-commits@winehq.org

1 participants
187673 discussions

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

02 Feb '22

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 : ws2_32: Fix memory leaks on error paths in unix_gethostby* (scan-build).
by Alexandre Julliard 02 Feb '22

02 Feb '22

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 02 Feb '22

02 Feb '22

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

Hans Leidekker : kerberos: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 02 Feb '22

02 Feb '22

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

Hans Leidekker : bcrypt: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 02 Feb '22

02 Feb '22

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 : explorer: Only try to destroy the IShellWindows object if it exists.
by Alexandre Julliard 02 Feb '22

02 Feb '22

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

Alistair Leslie-Hughes : dpnet: Fix long types printf warnings.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: ca90b902bce26997afb9a46839abdd9bc630261f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca90b902bce26997afb9a468… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 2 20:40:06 2022 +1100 dpnet: Fix long types printf warnings. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/Makefile.in | 1 - dlls/dpnet/address.c | 24 ++++++++-------- dlls/dpnet/client.c | 64 +++++++++++++++++++++--------------------- dlls/dpnet/dpnet_main.c | 4 +-- dlls/dpnet/lobbiedapp.c | 6 ++-- dlls/dpnet/peer.c | 74 ++++++++++++++++++++++++------------------------- dlls/dpnet/server.c | 68 ++++++++++++++++++++++----------------------- dlls/dpnet/threadpool.c | 10 +++---- 8 files changed, 125 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca90b902bce26997afb9…

1 0

Alistair Leslie-Hughes : xactengine: Fix long types printf warnings.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: a80c5491600c00a54dfc8251a75706ce86d2a08f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a80c5491600c00a54dfc8251… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 2 16:28:23 2022 +1100 xactengine: Fix long types printf warnings. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine2_0/Makefile.in | 2 +- dlls/xactengine2_4/Makefile.in | 2 +- dlls/xactengine2_7/Makefile.in | 2 +- dlls/xactengine2_9/Makefile.in | 2 +- dlls/xactengine3_0/Makefile.in | 2 +- dlls/xactengine3_1/Makefile.in | 2 +- dlls/xactengine3_2/Makefile.in | 2 +- dlls/xactengine3_3/Makefile.in | 2 +- dlls/xactengine3_4/Makefile.in | 2 +- dlls/xactengine3_5/Makefile.in | 2 +- dlls/xactengine3_6/Makefile.in | 2 +- dlls/xactengine3_7/Makefile.in | 2 +- dlls/xactengine3_7/xact_dll.c | 44 +++++++++++++++++++++--------------------- 13 files changed, 34 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a80c5491600c00a54dfc…

1 0

Eric Pouech : windowscodecs: Remove useless casts to long.
by Alexandre Julliard 02 Feb '22

02 Feb '22

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

Eric Pouech : ole32: Use correct integral type.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: adad897154537cd4321e9380672e430d723b77b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adad897154537cd4321e9380… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 07:58:06 2022 +0000 ole32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 815fdcb11d0..aafc4cf19f8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -396,7 +396,7 @@ static ULONG WINAPI ISynchronize_fnRelease(ISynchronize *iface) static HRESULT WINAPI ISynchronize_fnWait(ISynchronize *iface, DWORD dwFlags, DWORD dwMilliseconds) { MREImpl *This = impl_from_ISynchronize(iface); - UINT index; + DWORD index; TRACE("%p (%08x, %08x)\n", This, dwFlags, dwMilliseconds); return CoWaitForMultipleHandles(dwFlags, dwMilliseconds, 1, &This->event, &index); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits