October 2012 - Wine-Commits

Sam Edwards : opengl32: Fix outline-font glyphs rendering with incorrect front faces.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: a428416a8ab7174ed477cc0842e6e4e4dca57726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a428416a8ab7174ed477cc084… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Oct 29 04:06:45 2012 +0000 opengl32: Fix outline-font glyphs rendering with incorrect front faces. --- dlls/opengl32/wgl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index eb24b0f..b6efdba 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1399,6 +1399,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, } funcs->gl.p_glNewList(listBase++, GL_COMPILE); + funcs->gl.p_glFrontFace(GL_CW); pgluTessBeginPolygon(tess, NULL); pph = (TTPOLYGONHEADER*)buf;

1 0

Marcus Meissner : dsound: HeapFree secondaries (Coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

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

Józef Kucia : d3dx9: Correct the FIXME message in ID3DXFont::GetGlyphData.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: d1a99feee6ed097d3f2e1c5e1937014d86c4c0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a99feee6ed097d3f2e1c5e1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Oct 28 22:59:58 2012 +0100 d3dx9: Correct the FIXME message in ID3DXFont::GetGlyphData. --- dlls/d3dx9_36/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 1aeebea..65adff1 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -147,7 +147,7 @@ static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, IDirect3DTexture9 **texture, RECT *blackbox, POINT *cellinc) { - FIXME("iface %p, glyph %#x, texture %p, baclbox %s, cellinc %s stub!\n", + FIXME("iface %p, glyph %#x, texture %p, blackbox %s, cellinc %s stub!\n", iface, glyph, texture, wine_dbgstr_rect(blackbox), wine_dbgstr_point(cellinc)); return E_NOTIMPL; }

1 0

André Hentschel : setupapi: Avoid memory leaks ( coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 4d796458d0ed517d45adc57a1aedaf1c3bdde232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d796458d0ed517d45adc57a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:58 2012 +0100 setupapi: Avoid memory leaks (coverity). --- dlls/setupapi/install.c | 1 + dlls/setupapi/queue.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 1c8236a..e216e8c 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1640,6 +1640,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, ( 2 + dir_len + name_len) * sizeof( WCHAR )); if( !fullname ) { + FindClose( hdl ); HeapFree( GetProcessHeap(), 0, filter ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cd733a0..1855e99 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1156,7 +1156,11 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) return FALSE; + if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) + { + HeapFree( GetProcessHeap(), 0, inf_source ); + return FALSE; + } source = inf_source; } else if (!source)

1 0

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

Oct. 29, 2012

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 : ieframe: Avoid memory leak (coverity ).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

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 memory allocated by heap_alloc_zero (coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: a46bfd644d8b80c54f315869420b9eaf85e6a061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46bfd644d8b80c54f3158694… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:54 2012 +0100 oleaut32: Don't leak memory allocated by heap_alloc_zero (coverity). --- dlls/oleaut32/typelib.c | 9 +++++---- dlls/oleaut32/typelib2.c | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7700121..3d94164 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4070,10 +4070,10 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) SLTG_TypeInfoTail *pTITail; SLTG_MemberHeader *pMemHeader; - if(strcmp(pBlkEntry[order].index_string + (char*)pMagic, - pOtherTypeInfoBlks[i].index_name)) { - FIXME_(typelib)("Index strings don't match\n"); - return NULL; + if(strcmp(pBlkEntry[order].index_string + (char*)pMagic, pOtherTypeInfoBlks[i].index_name)) { + FIXME_(typelib)("Index strings don't match\n"); + heap_free(pOtherTypeInfoBlks); + return NULL; } pTIHeader = pBlk; @@ -4189,6 +4189,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) if(i != pTypeLibImpl->TypeInfoCount) { FIXME("Somehow processed %d TypeInfos\n", i); + heap_free(pOtherTypeInfoBlks); return NULL; } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8ea95fe..689d9af 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -5272,7 +5272,8 @@ static ICreateTypeLib2 *ICreateTypeLib2_Constructor(SYSKIND syskind, LPCOLESTR f if (failed) { ICreateTypeLib2_fnRelease(&create_tlib2->ICreateTypeLib2_iface); - return NULL; + heap_free(create_tlib2); + return NULL; } return &create_tlib2->ICreateTypeLib2_iface;

1 0

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

Oct. 29, 2012

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 : rpcrt4: Reorder code to make sure RpcBindingFromStringBinding[AW] cleans up ( coverity).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

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