October 2012 - Wine-commits

Marcus Meissner : dsound: HeapFree secondaries (Coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 8107290279f5fd699466de4c374943c5dfffefd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8107290279f5fd699466de4c3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 27 00:39:26 2012 +0200 dsound: HeapFree secondaries (Coverity). --- dlls/dsound/tests/dsound.c | 1 + dlls/dsound/tests/dsound8.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index ad17d54..0f199a4 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1562,6 +1562,7 @@ static void test_hw_buffers(void) for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i) if(secondaries[i]) IDirectSoundBuffer_Release(secondaries[i]); + HeapFree(GetProcessHeap(), 0, secondaries); IDirectSoundBuffer_Release(primary); IDirectSound_Release(ds); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index ba04d9f..a0b78e5 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1049,6 +1049,8 @@ static void test_hw_buffers(void) if(secondaries[i]) IDirectSoundBuffer_Release(secondaries[i]); + HeapFree(GetProcessHeap(), 0, secondaries); + IDirectSoundBuffer_Release(primary); IDirectSound8_Release(ds); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: e2d7f51cc13d98991a98be84178d5aef02462e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d7f51cc13d98991a98be841… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Oct 27 05:16:42 2012 +0200 po: Update German translation. --- po/de.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index b07dc2a..9d42102 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-08-27 01:14+0200\n" +"PO-Revision-Date: 2012-10-27 03:40+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -10154,6 +10154,8 @@ msgstr " (Ja|Nein|Alle)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" +"'%1' konnte nicht als interner oder externer Befehl, oder als Batchscript\n" +"erkannt werden.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: d4294f108012cbd2fb179c8abe3fdec18f78aae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4294f108012cbd2fb179c8ab… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Oct 26 21:51:53 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 085689d..4048a07 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-08-24 22:13+0300\n" +"PO-Revision-Date: 2012-10-27 10:40+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -9568,7 +9568,7 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT nustato komandinės eilutės raginimą.\n" +"PROMPT nustato komandos eilutės raginimą.\n" "\n" "Simbolių eilutė, einanti po PROMPT komandos (ir tarpas iškart po to),\n" "atsiranda eilutės pradžioje, kai cmd laukia įvedimo.\n" @@ -10017,7 +10017,7 @@ msgstr "Nepavyko atverti „%1“\n" #: cmd.rc:337 msgid "Cannot call batch label outside of a batch script\n" -msgstr "Negalima iškviesti žymės esančios už komandos failo ribų\n" +msgstr "Negalima iškviesti žymės esančios už komandų failo ribų\n" #: cmd.rc:338 xcopy.rc:42 msgctxt "All key" @@ -10100,6 +10100,8 @@ msgstr " (Taip|Ne|Visus)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" +"Nepavyko atpažinti „%1“ kaip vidinės ar išorinės komandos, ar komandų " +"failo.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10139,7 +10141,7 @@ msgstr "Naudojimas: ipconfig [ /? | /all ]\n" #: ipconfig.rc:28 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Klaida: nurodytas nežinomas arba netinkamas komandinės eilutės parametras\n" +"Klaida: nurodytas nežinomas arba netinkamas komandos eilutės parametras\n" #: ipconfig.rc:29 msgid "%1 adapter %2\n" @@ -13168,7 +13170,7 @@ msgstr "wineconsole: neteisinga posistemė\n" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: neatpažintas komandinės eilutės parametras\n" +msgstr "wineconsole: neatpažintas komandos eilutės parametras\n" #: wineconsole.rc:44 msgid "Starts a program in a Wine console\n"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: b3d9f50e1d5f67b279cab7cfade14f90c19181bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d9f50e1d5f67b279cab7cfa… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Oct 27 11:38:38 2012 +0300 po: Update Finnish translation. --- po/fi.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1e6f51e..1db3fb8 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10062,7 +10062,7 @@ msgstr " (Kyllä|Ei|kAikki)" #: cmd.rc:356 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "" +msgstr "'%1' ei ole sisäinen eikä ulkoinen komento eikä komentojono.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

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

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 : 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 : 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 : 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 : 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