November 2012 - Wine-commits

Piotr Caban : msvcp60: Fixed basic_istream::ipfx implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 9796cf388c967fdf8c21a264cc186636177951be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9796cf388c967fdf8c21a264c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:19 2012 +0100 msvcp60: Fixed basic_istream::ipfx implementation. --- dlls/msvcp60/ios.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index d243b1d..99493c4 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -6756,12 +6756,7 @@ static MSVCP_bool basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_bool for(ch = basic_streambuf_char_sgetc(strbuf); ; ch = basic_streambuf_char_snextc(strbuf)) { - if(ch == EOF) { - basic_ios_char_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==EOF || !ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) break; } } @@ -7985,12 +7980,7 @@ static MSVCP_bool basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP_boo for(ch = basic_streambuf_wchar_sgetc(strbuf); ; ch = basic_streambuf_wchar_snextc(strbuf)) { - if(ch == WEOF) { - basic_ios_wchar_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==WEOF || !ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) break; } }

1 0

Piotr Caban : msvcp60: Fixed basic_istream::seekg implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: a43840bcdf69050a7ae0f4ee3d1f0df883a60be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43840bcdf69050a7ae0f4ee3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:31 2012 +0100 msvcp60: Fixed basic_istream::seekg implementation. --- dlls/msvcp60/ios.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 99493c4..08a3848 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7264,14 +7264,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this fpos_int ret; basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + } return this; } @@ -7290,14 +7283,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + } return this; } @@ -8530,14 +8516,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + } return this; } @@ -8558,14 +8537,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + } return this; }

1 0

Piotr Caban : msvcp60: Fixed basic_istream::getline(basic_string) implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 43e8e008b2f41355051b71b43f61959ba784505b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e8e008b2f41355051b71b43… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:41 2012 +0100 msvcp60: Fixed basic_istream::getline(basic_string) implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp60/string.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 08a3848..02e903d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7617,9 +7617,9 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); - basic_string_char_clear(str); c = basic_streambuf_char_sgetc(strbuf); for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) @@ -8909,9 +8909,9 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - basic_string_wchar_clear(str); c = basic_streambuf_wchar_sgetc(strbuf); for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 803cd33..d2e1c81 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -153,7 +153,8 @@ void __thiscall basic_string_char__Eos(basic_string_char *this, MSVCP_size_t len void basic_string_char_clear(basic_string_char *this) { - basic_string_char__Eos(this, 0); + if(this->ptr) + basic_string_char__Eos(this, 0); } /* ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z */ @@ -1865,7 +1866,8 @@ void __thiscall basic_string_wchar__Eos(basic_string_wchar *this, MSVCP_size_t l void basic_string_wchar_clear(basic_string_wchar *this) { - basic_string_wchar__Eos(this, 0); + if(this->ptr) + basic_string_wchar__Eos(this, 0); } /* ?_Tidy@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEX_N(a)Z */

1 0

Piotr Caban : msvcp60: Added iostream tests.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: c0589a31e0e22e2efd4894656f8f2c5201ded6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0589a31e0e22e2efd4894656… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:55 2012 +0100 msvcp60: Added iostream tests. --- dlls/msvcp60/tests/Makefile.in | 1 + dlls/msvcp60/tests/ios.c | 1626 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1627 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0589a31e0e22e2efd489…

1 0

Jacek Caban : jscript: Use proper object as 'this' when function is called on an activation object.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 55f0663e3e5bc1c1a7cb460f4e75775f9cc0501b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f0663e3e5bc1c1a7cb460f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 14 15:49:46 2012 +0100 jscript: Use proper object as 'this' when function is called on an activation object. --- dlls/jscript/engine.c | 12 ++++++++++++ dlls/jscript/object.c | 5 ++++- dlls/jscript/tests/lang.js | 6 ++++++ dlls/jscript/tests/run.c | 4 ++++ 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 44c8333..f4dcc0f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -292,6 +292,18 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t ctx->ref = 1; ctx->is_global = is_global; + /* ECMA-262 3rd Edition 11.2.3.7 */ + if(this_obj) { + jsdisp_t *jsthis; + + jsthis = iface_to_jsdisp((IUnknown*)this_obj); + if(jsthis) { + if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) + this_obj = NULL; + jsdisp_release(jsthis); + } + } + if(this_obj) ctx->this_obj = this_obj; else if(script_ctx->host_global) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 34c572f..8047d3f 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "jscript.h" #include "wine/debug.h" @@ -51,7 +53,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {objectW, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW}; TRACE("\n"); @@ -62,6 +64,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { + assert(jsdisp->builtin_info->class != JSCLASS_NONE); FIXME("jdisp->builtin_info->class = %d\n", jsdisp->builtin_info->class); return E_FAIL; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ffb5e2e..4f5f29c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -56,6 +56,9 @@ ok(0 == false, "0 == false is false"); ok(1 != 2, "1 != 2 is false"); ok(false != 1, "false != 1 is false"); +ok(this === test, "this !== test"); +eval('ok(this === test, "this !== test");'); + var trueVar = true; ok(trueVar, "trueVar is not true"); @@ -71,6 +74,9 @@ function testFunc1(x, y) { ok(arguments.callee === testFunc1, "arguments.calee !== testFunc1"); ok(testFunc1.arguments === arguments, "testFunc1.arguments = " + testFunc1.arguments); + ok(this === test, "this !== test"); + eval('ok(this === test, "this !== test");'); + return true; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f0aff60..cacad25 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1815,6 +1815,10 @@ static BOOL run_tests(void) parse_script_a("testThis(this);"); parse_script_a("(function () { testThis(this); })();"); + parse_script_a("function x() { testThis(this); }; x();"); + parse_script_a("var t = {func: function () { ok(this === t, 'this !== t'); }}; with(t) { func(); }"); + parse_script_a("function x() { testThis(this); }; with({y: 1}) { x(); }"); + parse_script_a("(function () { function x() { testThis(this);} x(); })();"); SET_EXPECT(testobj_onlydispid_d); SET_EXPECT(testobj_onlydispid_i);

1 0

Jörg Höhle : mciavi: Fix player deadlock when starting to play.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 42bdb48c675be7bc1b38a76554d2eb78fd64026c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42bdb48c675be7bc1b38a7655… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 6 22:59:55 2012 +0100 mciavi: Fix player deadlock when starting to play. --- dlls/mciavi32/mciavi.c | 265 +++++++++++++++++++++------------------- dlls/mciavi32/private_mciavi.h | 1 - 2 files changed, 138 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42bdb48c675be7bc1b38a…

1 0

Akihiro Sagawa : winmm/tests: Add more mmioSeek tests.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 10c7f5859cc7300ca3a356c1dbd5e6b5522dc972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c7f5859cc7300ca3a356c1d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 13 00:26:42 2012 +0900 winmm/tests: Add more mmioSeek tests. --- dlls/winmm/tests/mmio.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index a76de7a..64f0149 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -668,6 +668,125 @@ static void test_mmioOpen_fourcc(void) mmioInstallIOProc(FOURCC_DOS, NULL, MMIO_REMOVEPROC); } +static BOOL create_test_file(char *temp_file) +{ + char temp_path[MAX_PATH]; + DWORD ret, written; + HANDLE h; + + ret = GetTempPath(sizeof(temp_path), temp_path); + ok(ret, "Failed to get a temp path, err %d\n", GetLastError()); + if (!ret) + return FALSE; + + ret = GetTempFileName(temp_path, "mmio", 0, temp_file); + ok(ret, "Failed to get a temp name, err %d\n", GetLastError()); + if (!ret) + return FALSE; + + h = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(h != INVALID_HANDLE_VALUE, "Failed to create a file, err %d\n", GetLastError()); + if (h == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(h, RIFF_buf, sizeof(RIFF_buf), &written, NULL); + ok(ret, "Failed to write a file, err %d\n", GetLastError()); + CloseHandle(h); + if (!ret) DeleteFileA(temp_file); + return ret; +} + +static void test_mmioSeek(void) +{ + HMMIO hmmio; + MMIOINFO mmio; + LONG end, pos; + const LONG size = sizeof(RIFF_buf), offset = 16; + char test_file[MAX_PATH]; + MMRESULT res; + + /* test memory file */ + memset(&mmio, 0, sizeof(mmio)); + mmio.fccIOProc = FOURCC_MEM; + mmio.pchBuffer = (char*)&RIFF_buf; + mmio.cchBuffer = sizeof(RIFF_buf); + hmmio = mmioOpen(NULL, &mmio, MMIO_READ); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio != NULL) { + /* seek to the end */ + end = mmioSeek(hmmio, 0, SEEK_END); + todo_wine ok(end == size, "expected %d, got %d\n", size, end); + + /* seek backward from the end */ + pos = mmioSeek(hmmio, offset, SEEK_END); + ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + + mmioClose(hmmio, 0); + } + + if (!create_test_file(test_file)) return; + + /* test standard file without buffering */ + hmmio = NULL; + memset(&mmio, 0, sizeof(mmio)); + mmio.fccIOProc = FOURCC_DOS; + mmio.pchBuffer = 0; + mmio.cchBuffer = 0; + hmmio = mmioOpen(test_file, &mmio, MMIO_READ); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio != NULL) { + /* seek to the end */ + end = mmioSeek(hmmio, 0, SEEK_END); + ok(end == size, "expected %d, got %d\n", size, end); + + /* test MMIOINFO values */ + res = mmioGetInfo(hmmio, &mmio, 0); + ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); + todo_wine ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); + ok(mmio.lDiskOffset == size, "expected %d, got %d\n", size, mmio.lDiskOffset); + + /* seek backward from the end */ + pos = mmioSeek(hmmio, offset, SEEK_END); + todo_wine ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + + mmioClose(hmmio, 0); + } + + /* test standard file with buffering */ + hmmio = NULL; + memset(&mmio, 0, sizeof(mmio)); + mmio.fccIOProc = FOURCC_DOS; + mmio.pchBuffer = 0; + mmio.cchBuffer = 0; + hmmio = mmioOpen(test_file, &mmio, MMIO_READ | MMIO_ALLOCBUF); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio != NULL) { + /* seek to the end */ + end = mmioSeek(hmmio, 0, SEEK_END); + ok(end == size, "expected %d, got %d\n", size, end); + + /* test MMIOINFO values */ + res = mmioGetInfo(hmmio, &mmio, 0); + ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); + ok(mmio.lBufOffset == end, "expected %d, got %d\n", end, mmio.lBufOffset); + ok(mmio.lDiskOffset == size, "expected %d, got %d\n", size, mmio.lDiskOffset); + + /* seek backward from the end */ + pos = mmioSeek(hmmio, offset, SEEK_END); + ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + + mmioClose(hmmio, 0); + } + + DeleteFileA(test_file); +} + START_TEST(mmio) { /* Make it possible to run the tests against a specific AVI file in @@ -683,4 +802,5 @@ START_TEST(mmio) test_mmioSetBuffer(NULL); test_mmioSetBuffer(fname); test_mmioOpen_fourcc(); + test_mmioSeek(); }

1 0

Akihiro Sagawa : winmm: Fix SEEK_END direction of mmio files without buffering.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 2d3f3204633388e0bba5ace02ebd370a9be1692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3f3204633388e0bba5ace02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 13 00:26:45 2012 +0900 winmm: Fix SEEK_END direction of mmio files without buffering. --- dlls/winmm/mmio.c | 5 ++++- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 7f35480..b6f60d1 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -127,7 +127,10 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, * lParam2 = from whence to seek (SEEK_SET, SEEK_CUR, SEEK_END) * Returns: new file position, -1 on error */ - ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], (LONG)lParam1, (LONG)lParam2); + if (lParam2 == SEEK_END) + ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], -(LONG)lParam1, (LONG)lParam2); + else + ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], (LONG)lParam1, (LONG)lParam2); if (ret != -1) lpmmioinfo->lDiskOffset = ret; return ret; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 64f0149..a4e7a2d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -750,7 +750,7 @@ static void test_mmioSeek(void) /* seek backward from the end */ pos = mmioSeek(hmmio, offset, SEEK_END); - todo_wine ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); mmioClose(hmmio, 0); }

1 0

André Hentschel : oleaut32: Fix remaining memory leak (coverity).
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 43ffbe5611161d1227baa710c541c22b94794204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ffbe5611161d1227baa710c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:56:58 2012 +0100 oleaut32: Fix remaining memory leak (coverity). --- dlls/oleaut32/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cb179f9..83ea7e1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4079,6 +4079,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pTIHeader = pBlk; if(pTIHeader->magic != SLTG_TIHEADER_MAGIC) { FIXME_(typelib)("TypeInfoHeader magic = %04x\n", pTIHeader->magic); + heap_free(pOtherTypeInfoBlks); return NULL; } TRACE_(typelib)("pTIHeader->res06 = %x, pTIHeader->res0e = %x, "

1 0

André Hentschel : msxml3: Fix remaining memory leak ( coverity).
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 5e031741cd02785348da0d0c51d12e1a3c517c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e031741cd02785348da0d0c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:57:22 2012 +0100 msxml3: Fix remaining memory leak (coverity). --- dlls/msxml3/httprequest.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 9a9d93e..62fff98 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -685,7 +685,11 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * case VT_ARRAY|VT_UI1: { sa = V_ARRAY(body); - if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) return hr; + if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) + { + heap_free(bsc); + return hr; + } if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) { SafeArrayUnaccessData(sa);

1 0