October 2012 - Wine-commits

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

30 Oct '12

Module: wine Branch: master Commit: 64e169d97407b3006648ce1398110163dcdc3a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e169d97407b3006648ce139… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 15:03:05 2012 +0100 user32: Avoid memory leaks (coverity). --- dlls/user32/message.c | 6 +++++- dlls/user32/text.c | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b934705..6d45671 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2903,7 +2903,11 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags handle_internal_message( info.msg.hwnd, info.msg.message, info.msg.wParam, info.msg.lParam ); /* if this is a nested call return right away */ - if (first == info.msg.message && last == info.msg.message) return FALSE; + if (first == info.msg.message && last == info.msg.message) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return FALSE; + } } else peek_message( msg, info.msg.hwnd, info.msg.message, diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 8539bdf..20f7798 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -985,7 +985,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, p = str; while (p < str+len && *p != TAB) p++; len_seg = p - str; if (len_seg != len && !GetTextExtentPointW(hdc, str, len_seg, &size)) + { + HeapFree (GetProcessHeap(), 0, retstr); return 0; + } } else len_seg = len; @@ -993,7 +996,11 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (!ExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), - rect, str, len_seg, NULL )) return 0; + rect, str, len_seg, NULL )) + { + HeapFree (GetProcessHeap(), 0, retstr); + return 0; + } if (prefix_offset != -1 && prefix_offset < len_seg) { TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 1, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect);

1 0

Daniel Lehman : msvcp90: Set eof state in istream<>::peek if got eof.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 32be163545459bf85c58895bcb315dcdfd7d22b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32be163545459bf85c58895bc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 17:27:15 2012 -0700 msvcp90: Set eof state in istream<>::peek if got eof. --- dlls/msvcp90/ios.c | 8 +++++ dlls/msvcp90/tests/ios.c | 75 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7e84f93..a11f90c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7575,6 +7575,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -8837,6 +8841,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 8573778..c184cdb 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -359,19 +359,21 @@ static void (*__thiscall p_basic_stringstream_wchar_vbase_dtor)(basic_stringstre /* istream */ static basic_istream_char* (*__thiscall p_basic_istream_char_read_uint64)(basic_istream_char*, unsigned __int64*); static basic_istream_char* (*__thiscall p_basic_istream_char_read_double)(basic_istream_char*, double*); -static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); -static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); +static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); +static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); static basic_istream_char* (*__thiscall p_basic_istream_char_ignore)(basic_istream_char*, streamsize, int); static basic_istream_char* (*__thiscall p_basic_istream_char_seekg)(basic_istream_char*, streamoff, int); static basic_istream_char* (*__thiscall p_basic_istream_char_seekg_fpos)(basic_istream_char*, fpos_int); +static int (*__thiscall p_basic_istream_char_peek)(basic_istream_char*); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_uint64)(basic_istream_wchar*, unsigned __int64*); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_double)(basic_istream_wchar*, double *); -static int (*__thiscall p_basic_istream_wchar_get)(basic_istream_wchar*); -static MSVCP_bool (*__thiscall p_basic_istream_wchar_ipfx)(basic_istream_wchar*, MSVCP_bool); +static int (*__thiscall p_basic_istream_wchar_get)(basic_istream_wchar*); +static MSVCP_bool (*__thiscall p_basic_istream_wchar_ipfx)(basic_istream_wchar*, MSVCP_bool); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_ignore)(basic_istream_wchar*, streamsize, unsigned short); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_seekg)(basic_istream_wchar*, streamoff, int); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_seekg_fpos)(basic_istream_wchar*, fpos_int); +static unsigned short (*__thiscall p_basic_istream_wchar_peek)(basic_istream_wchar*); /* ostream */ static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_double)(basic_ostream_char*, double); @@ -540,7 +542,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JH@Z"); SET(p_basic_istream_char_seekg_fpos, "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z"); - + SET(p_basic_istream_char_peek, + "?peek@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)AEA_K@Z"); @@ -556,6 +559,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)_JH@Z"); SET(p_basic_istream_wchar_seekg_fpos, "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z"); + SET(p_basic_istream_wchar_peek, + "?peek@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z"); @@ -629,6 +634,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JH@Z"); SET(p_basic_istream_char_seekg_fpos, "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z"); + SET(p_basic_istream_char_peek, + "?peek@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)AA_K@Z"); @@ -644,6 +651,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)JH@Z"); SET(p_basic_istream_wchar_seekg_fpos, "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z"); + SET(p_basic_istream_wchar_peek, + "?peek@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z"); @@ -1358,6 +1367,61 @@ static void test_istream_seekg_fpos(void) } +static void test_istream_peek(void) +{ + unsigned short testus, nextus, peekus; + basic_stringstream_wchar wss; + basic_stringstream_char ss; + basic_string_wchar wstr; + basic_string_char str; + IOSB_iostate state; + int i, next, peek; + wchar_t wide[64]; + + struct _test_istream_peek { + const char *str; + int peek; + int next; + IOSB_iostate state; + } tests[] = { + { "", EOF, EOF, IOSTATE_eofbit }, + { "ABCDEF", 'A', 'A', IOSTATE_goodbit }, + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + /* char version */ + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); + + peek = (int)call_func1(p_basic_istream_char_peek, &ss.base.base1); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); + next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); + ok(peek == next, "wrong peek, expected %c (%i) found = %c (%i)\n", peek, peek, next, next); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + + /* wchar_t version */ + AtoW(wide, tests[i].str, strlen(tests[i].str)); + call_func2(p_basic_string_wchar_ctor_cstr, &wstr, wide); + call_func4(p_basic_stringstream_wchar_ctor_str, &wss, &wstr, OPENMODE_out|OPENMODE_in, TRUE); + + peekus = (unsigned short)(int)call_func1(p_basic_istream_wchar_peek, &wss.base.base1); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &wss.basic_ios.base); + nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; + ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus); + ok(peekus == nextus, "wrong peek, expected %c (%i) found = %c (%i)\n", peekus, peekus, nextus, nextus); + + call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); + } +} + + START_TEST(ios) { if(!init()) @@ -1370,6 +1434,7 @@ START_TEST(ios) test_istream_ignore(); test_istream_seekg(); test_istream_seekg_fpos(); + test_istream_peek(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

Daniel Lehman : msvcp: Sync istream<>::peek implementations.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: c868db7668ffc24319d65d8a4843864f19d677fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c868db7668ffc24319d65d8a4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 26 10:18:58 2012 -0700 msvcp: Sync istream<>::peek implementations. --- dlls/msvcp100/ios.c | 8 ++++++++ dlls/msvcp60/ios.c | 8 ++++++++ dlls/msvcp71/ios.c | 8 ++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 278abd8..32f36ce 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -5821,6 +5821,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -6949,6 +6953,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 71ff193..0bccd5f 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7212,6 +7212,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -8467,6 +8471,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index be8f744..280ce86 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7544,6 +7544,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -8802,6 +8806,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; }

1 0

Henri Verbeet : d3d9/tests: Avoid LPDIRECT3DTEXTURE9.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 369fb5185f199e8c53ba90480fcf169d5099fcb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369fb5185f199e8c53ba90480… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 01:01:44 2012 +0100 d3d9/tests: Avoid LPDIRECT3DTEXTURE9. --- dlls/d3d9/tests/visual.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b6763099..03678d0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6934,11 +6934,10 @@ static void srgbtexture_test(IDirect3DDevice9 *device) * texture stage state to render a quad using that texture. The resulting * color components should be 0x36 (~ 0.21), per this formula: * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 - * This is true where srgb_color > 0.04045. - */ + * This is true where srgb_color > 0.04045. */ + struct IDirect3DTexture9 *texture = NULL; IDirect3D9 *d3d = NULL; HRESULT hr; - LPDIRECT3DTEXTURE9 texture = NULL; LPDIRECT3DSURFACE9 surface = NULL; D3DLOCKED_RECT lr; DWORD color;

1 0

Henri Verbeet : d3d9/tests: Avoid LPDIRECT3DVERTEXBUFFER9.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 64ffe6476e8dccbefcca054388d6b47ad0872021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ffe6476e8dccbefcca05438… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 01:01:45 2012 +0100 d3d9/tests: Avoid LPDIRECT3DVERTEXBUFFER9. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 03678d0..8d49fa4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7014,14 +7014,14 @@ out: static void shademode_test(IDirect3DDevice9 *device) { /* Render a quad and try all of the different fixed function shading models. */ + struct IDirect3DVertexBuffer9 *vb_strip = NULL; + struct IDirect3DVertexBuffer9 *vb_list = NULL; HRESULT hr; DWORD color0, color1; DWORD color0_gouraud = 0, color1_gouraud = 0; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; LPVOID data = NULL; - LPDIRECT3DVERTEXBUFFER9 vb_strip = NULL; - LPDIRECT3DVERTEXBUFFER9 vb_list = NULL; UINT i, j; struct vertex quad_strip[] = {

1 0

Henri Verbeet : d3d9/tests: Avoid LPDIRECT3DSURFACE9.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 32f8548d6778894cd4ffe63bb9640106589a331d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f8548d6778894cd4ffe63bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 01:01:46 2012 +0100 d3d9/tests: Avoid LPDIRECT3DSURFACE9. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8d49fa4..5bb50f7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6936,9 +6936,9 @@ static void srgbtexture_test(IDirect3DDevice9 *device) * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 * This is true where srgb_color > 0.04045. */ struct IDirect3DTexture9 *texture = NULL; + struct IDirect3DSurface9 *surface = NULL; IDirect3D9 *d3d = NULL; HRESULT hr; - LPDIRECT3DSURFACE9 surface = NULL; D3DLOCKED_RECT lr; DWORD color; float quad[] = {

1 0

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

30 Oct '12

Module: wine Branch: master Commit: 3dd7c64c257ac801a0679a7b2be5388fe68ccce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd7c64c257ac801a0679a7b2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 29 20:16:36 2012 +0100 dplayx: Reorder some code to avoid memory leak (coverity). --- dlls/dplayx/dplay.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 7636546..29212bc 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1126,10 +1126,6 @@ DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, /* Reallocate for new data */ if( lpData != NULL ) { - LPVOID lpNewData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( dwDataSize ) ); - CopyMemory( lpNewData, lpData, dwDataSize ); - if( dwFlags & DPSET_LOCAL ) { lpGData->lpLocalData = lpData; @@ -1137,7 +1133,8 @@ DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, } else { - lpGData->lpRemoteData = lpNewData; + lpGData->lpRemoteData = HeapAlloc( GetProcessHeap(), 0, dwDataSize ); + CopyMemory( lpGData->lpRemoteData, lpData, dwDataSize ); lpGData->dwRemoteDataSize = dwDataSize; } } @@ -1330,9 +1327,6 @@ DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags, /* Reallocate for new data */ if( lpData != NULL ) { - LPVOID lpNewData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( dwDataSize ) ); - CopyMemory( lpNewData, lpData, dwDataSize ); if( dwFlags & DPSET_LOCAL ) { @@ -1341,7 +1335,8 @@ DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags, } else { - lpPData->lpRemoteData = lpNewData; + lpPData->lpRemoteData = HeapAlloc( GetProcessHeap(), 0, dwDataSize ); + CopyMemory( lpPData->lpRemoteData, lpData, dwDataSize ); lpPData->dwRemoteDataSize = dwDataSize; } }

1 0

Frédéric Delanoy : crypt32: Avoid double free in CRYPT_LoadSIP on error path (coverity).
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: e078c872a07e40b12b865bb26583ff9f9c5ca749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e078c872a07e40b12b865bb26… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 29 21:17:31 2012 +0100 crypt32: Avoid double free in CRYPT_LoadSIP on error path (coverity). --- dlls/crypt32/sip.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index e43ebc7..4a32cad 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -634,14 +634,17 @@ static BOOL CRYPT_LoadSIP(const GUID *pgSubject) if (!sip.pfPut || temp != lib) goto error; FreeLibrary(temp); + temp = NULL; sip.pfCreate = CRYPT_LoadSIPFunc(pgSubject, szCreate, &temp); if (!sip.pfCreate || temp != lib) goto error; FreeLibrary(temp); + temp = NULL; sip.pfVerify = CRYPT_LoadSIPFunc(pgSubject, szVerify, &temp); if (!sip.pfVerify || temp != lib) goto error; FreeLibrary(temp); + temp = NULL; sip.pfRemove = CRYPT_LoadSIPFunc(pgSubject, szRemoveSigned, &temp); if (!sip.pfRemove || temp != lib) goto error;

1 0

Frédéric Delanoy : gdiplus/tests: Cleanup resources on error path in test_font_height_scaling (coverity).
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: c97066370cc7a1fbf6d276f69dc311ae5538066c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97066370cc7a1fbf6d276f69… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 30 08:55:37 2012 +0100 gdiplus/tests: Cleanup resources on error path in test_font_height_scaling (coverity). --- dlls/gdiplus/tests/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4ed13ea..5fc1626 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3790,7 +3790,7 @@ static void test_font_height_scaling(void) if (fabs(scale - 1.0) > 0.1) { win_skip("GdipGetRegionBounds is broken, scale %f (should be near 1.0)\n", scale); - return; + goto cleanup; } status = GdipScaleWorldTransform(graphics, 0.01, 0.01, MatrixOrderAppend); @@ -3893,6 +3893,7 @@ todo_wine GdipDeleteFont(font); } +cleanup: status = GdipDeleteGraphics(graphics); expect(Ok, status); DeleteDC(hdc);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 05d641188451655512f5fd2d54bf99e39ff85245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d641188451655512f5fd2d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 29 21:13:46 2012 +0100 po: Update French translation. --- po/fr.po | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/po/fr.po b/po/fr.po index fb2aff7..d159431 100644 --- a/po/fr.po +++ b/po/fr.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-07-23 07:34+0100\n" +"PO-Revision-Date: 2012-10-29 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3475,6 +3475,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"Après l'activation ou désactivation d'un périphérique, la liste des " +"joysticks connectés ne sera pas mise à jour à moins de redémarrer l'applet." #: joy.rc:47 msgid "Test Joystick" @@ -10195,6 +10197,8 @@ msgstr " (Oui|Non|Tous)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" +"Ne reconnaît pas « %1 » comme commande interne ou externe, ou fichier de " +"traitement par lots.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0