wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

André Hentschel : rpcrt4: Reorder code to make sure RpcBindingFromStringBinding[AW] cleans up ( coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 81c0e1eaa1ba41e2b27e1f968a2f2588a6ec79f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c0e1eaa1ba41e2b27e1f968… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:56 2012 +0100 rpcrt4: Reorder code to make sure RpcBindingFromStringBinding[AW] cleans up (coverity). --- dlls/rpcrt4/rpc_binding.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 11956e3..8152f87 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -851,10 +851,16 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingA(&bind, FALSE, (char*)Protseq); - if (ret != RPC_S_OK) return ret; - ret = RPCRT4_SetBindingObject(bind, &Uuid); - if (ret == RPC_S_OK) - ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); + if (ret == RPC_S_OK) { + ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret == RPC_S_OK) + ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); + + if (ret == RPC_S_OK) + *Binding = (RPC_BINDING_HANDLE)bind; + else + RPCRT4_ReleaseBinding(bind); + } RpcStringFreeA(&Options); RpcStringFreeA(&Endpoint); @@ -862,11 +868,6 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND RpcStringFreeA(&Protseq); RpcStringFreeA(&ObjectUuid); - if (ret == RPC_S_OK) - *Binding = (RPC_BINDING_HANDLE)bind; - else - RPCRT4_ReleaseBinding(bind); - return ret; } @@ -890,10 +891,16 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingW(&bind, FALSE, Protseq); - if (ret != RPC_S_OK) return ret; - ret = RPCRT4_SetBindingObject(bind, &Uuid); - if (ret == RPC_S_OK) - ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options); + if (ret == RPC_S_OK) { + ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret == RPC_S_OK) + ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options); + + if (ret == RPC_S_OK) + *Binding = (RPC_BINDING_HANDLE)bind; + else + RPCRT4_ReleaseBinding(bind); + } RpcStringFreeW(&Options); RpcStringFreeW(&Endpoint); @@ -901,11 +908,6 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND RpcStringFreeW(&Protseq); RpcStringFreeW(&ObjectUuid); - if (ret == RPC_S_OK) - *Binding = (RPC_BINDING_HANDLE)bind; - else - RPCRT4_ReleaseBinding(bind); - return ret; }

1 0

André Hentschel : ole32: Don' t leak memory allocated by enumx_allocate (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 7c381e59c44094ea359abd7cb815e52995b5cbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c381e59c44094ea359abd7cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:52 2012 +0100 ole32: Don't leak memory allocated by enumx_allocate (coverity). --- dlls/ole32/stg_prop.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index b582654..c2626cf 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2386,7 +2386,10 @@ static HRESULT create_EnumSTATPROPSETSTG( /* add all the property set elements into a list */ r = IStorage_EnumElements(stg, 0, NULL, 0, &penum); if (FAILED(r)) + { + enumx_Release(enumx); return E_OUTOFMEMORY; + } while (1) {

1 0

André Hentschel : oleaut32: Don't leak SafeArray ( coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: b45e4496af3f23125edacef90a90fb1b135bfc7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45e4496af3f23125edacef90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:51 2012 +0100 oleaut32: Don't leak SafeArray (coverity). --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 602181c..7700121 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6499,6 +6499,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (hres != S_OK) { ERR("SafeArrayAccessData failed with %x\n", hres); + SafeArrayDestroy(a); break; } for (j = 0; j < bound.cElements; j++) @@ -6507,6 +6508,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (hres != S_OK) { ERR("SafeArrayUnaccessData failed with %x\n", hres); + SafeArrayDestroy(a); break; } V_ARRAY(&rgvarg[i]) = a;

1 0

André Hentschel : ieframe: Avoid memory leak (coverity ).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 69d8e75a6b365309e615e1bad811df8f6125c719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d8e75a6b365309e615e1bad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:39 2012 +0100 ieframe: Avoid memory leak (coverity). --- dlls/ieframe/iexplore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index a72ed34..c4641bd 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -988,6 +988,7 @@ static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ if(DdeGetData(data, (BYTE*)url, size, 0) != size) { ERR("error during read\n"); + heap_free(url); break; }

1 0

André Hentschel : gdi32: Avoid memory leaks (coverity) .
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 0f7bc2d8cca66bfc758694a95970fa0d0c183a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7bc2d8cca66bfc758694a95… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:37 2012 +0100 gdi32: Avoid memory leaks (coverity). --- dlls/gdi32/bidi.c | 3 +++ dlls/gdi32/tests/bitmap.c | 3 ++- dlls/gdi32/tests/dib.c | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 0354996..00dce45 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -545,6 +545,9 @@ BOOL BIDI_Reorder( WARN("Out of memory\n"); HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); + HeapFree(GetProcessHeap(), 0, run_glyphs); + HeapFree(GetProcessHeap(), 0, pwLogClust); + HeapFree(GetProcessHeap(), 0, psva); return FALSE; } res = ScriptItemize(lpString + done, i, maxItems, &Control, &State, pItems, &nItems); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 04c93c1..f72574a 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3741,7 +3741,7 @@ static void test_GdiAlphaBlend(void) DeleteObject(bmpDst); ReleaseDC(NULL, hdcNull); - + HeapFree(GetProcessHeap(), 0, bmi); } static void test_GdiGradientFill(void) @@ -3854,6 +3854,7 @@ static void test_GdiGradientFill(void) DeleteDC( hdc ); DeleteObject( bmp ); + HeapFree(GetProcessHeap(), 0, bmi); } static void test_clipping(void) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index f4ed8e1..18c1067 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1308,6 +1308,7 @@ static void compare_hash_broken_todo(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const if(current_sha1[i] == NULL) { ok(current_sha1[i] != NULL, "missing hash, got \"%s\",\n", hash); + HeapFree(GetProcessHeap(), 0, hash); return; } }

1 0

André Hentschel : fusion: Reorder some code to avoid memory leak (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: c19dd4764307c5101273a658299915978ddc7e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19dd4764307c5101273a6582… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:35 2012 +0100 fusion: Reorder some code to avoid memory leak (coverity). --- dlls/fusion/fusion.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 6ace81f..e79fa3a 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -76,9 +76,9 @@ static HRESULT get_corversion(LPWSTR version, DWORD size) pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); if (!pGetCORVersion) - return E_FAIL; - - hr = pGetCORVersion(version, size, &len); + hr = E_FAIL; + else + hr = pGetCORVersion(version, size, &len); FreeLibrary(hmscoree); return hr;

1 0

André Hentschel : dplayx/tests: Add missing GetPlayerName test.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 436e9f9c06416e92724e02170693d50cebc3be2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=436e9f9c06416e92724e02170… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:15:15 2012 +0100 dplayx/tests: Add missing GetPlayerName test. --- dlls/dplayx/tests/dplayx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e020a47..c6ab185 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -2525,6 +2525,13 @@ static void test_PlayerName(void) hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, DPSET_GUARANTEED ); checkHR( DP_OK, hr ); + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 45, dwDataSize ); + checkStr( U1(playerName).lpszShortNameA, U1(*(LPDPNAME)lpData).lpszShortNameA ); + checkStr( U2(playerName).lpszLongNameA, U2(*(LPDPNAME)lpData).lpszLongNameA ); + check( 0, ((LPDPNAME)lpData)->dwFlags ); /* - Local (no propagation) */ U1(playerName).lpszShortNameA = (LPSTR) "no_propagation";

1 0

Francois Gouget : testbot/scripts: Remove the hardcoded path and username.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: tools Branch: master Commit: 12ea02c6d59b39fb40f3e67ea4d0116d3c4c95c2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=12ea02c6d59b39fb40f3e67e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 15:53:38 2012 +0100 testbot/scripts: Remove the hardcoded path and username. Instead, fail if they are not set and tell the user to either put them in the script or in the standard /etc/default directory. --- testbot/scripts/initd | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index bffc26d..262fa54 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -33,8 +33,18 @@ # Description: Start winetestbot to start job processing ### END INIT INFO -USER="winehq" -WTB_ROOT="/home/winehq/tools/testbot" +USER= +WTB_ROOT= +if [ $ -z "$USER" -o -z "$WTB_ROOT" $ -a -f "/etc/default/winetestbot" ] +then + . /etc/default/winetestbot +fi +if [ -z "$USER" -o -z "$WTB_ROOT" ] +then + echo "Set the username and WineTestBot root in the init.d script or in /etc/default/winetestbot" >&2 + exit 1 +fi + DAEMON="$WTB_ROOT/bin/Engine.pl" PING="$WTB_ROOT/bin/PingEngine.pl" PIDFILE="/var/run/winetestbot.pid"

1 0

Francois Gouget : testbot/scripts: Fix a stray reference to the winetest user and group.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: tools Branch: master Commit: 832b73319b718d85a19130a16efda41b43676177 URL: http://source.winehq.org/git/tools.git/?a=commit;h=832b73319b718d85a19130a1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 15:53:16 2012 +0100 testbot/scripts: Fix a stray reference to the winetest user and group. Remove the reference to the group entirely. --- testbot/scripts/initd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 0424174..bffc26d 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -159,7 +159,7 @@ then echo -n "Starting WineTestBot " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - /sbin/startproc -u winetest -g winetest $DAEMON + /sbin/startproc -u $USER $DAEMON # Remember status and be verbose rc_status -v

1 0

Francois Gouget : testbot/scripts: Print error messages on stderr.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: tools Branch: master Commit: cad268f24209cb5e85ae4d8d1594113511ae2218 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cad268f24209cb5e85ae4d8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 15:53:06 2012 +0100 testbot/scripts: Print error messages on stderr. --- testbot/scripts/initd | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 9d3e8b1..0424174 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -112,7 +112,7 @@ then ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" >&2 exit 1 ;; esac @@ -179,7 +179,7 @@ then ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then @@ -210,7 +210,7 @@ then ;; status) status_of_proc $DAEMON -echo -n "Checking for service WineTestBot " + echo -n "Checking for service WineTestBot " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. @@ -230,7 +230,7 @@ echo -n "Checking for service WineTestBot " rc_status -v ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" >&2 exit 1 ;; esac @@ -238,6 +238,6 @@ echo -n "Checking for service WineTestBot " else - echo "WineTestBot does not know how to start on this system" + echo "WineTestBot does not know how to start on this system" >&2 exit 1 fi

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
96
Older →

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 October 2012