May 2014 - Wine-commits - list.winehq.org

Victor Martinez Calvo : shlwapi: Check correct attributes in PathRelativePath.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: c2ff8f400568d875b87320048098543e78b16f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ff8f400568d875b87320048… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:35:24 2014 +0200 shlwapi: Check correct attributes in PathRelativePath. --- dlls/shlwapi/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index eba1f69..080c243 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3533,7 +3533,7 @@ BOOL WINAPI PathRelativePathToW(LPWSTR lpszPath, LPCWSTR lpszFrom, DWORD dwAttrF if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szFrom); - if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) + if(!(dwAttrTo & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szTo); /* Paths can only be relative if they have a common root */

1 0

Nikolay Sivov : ntdll: Fix a 'tlbid' string value leak (Valgrind).
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 4a284644843913231d81997c302e8ceed20a33e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a284644843913231d81997c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:32:39 2014 +0400 ntdll: Fix a 'tlbid' string value leak (Valgrind). --- dlls/ntdll/actctx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5d88b9a..14e196f 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -851,6 +851,7 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.base); RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.ps32); RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.tlib); break; case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid);

1 0

Nikolay Sivov : msxml3/tests: Fix a BSTR leak (Valgrind).
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 30410d48fd46e9e58f35e96df9aa323520444bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=30410d48fd46e9e58f35e96df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:03 2014 +0400 msxml3/tests: Fix a BSTR leak (Valgrind). --- dlls/msxml3/tests/domdoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7a2f984..8d8c7c0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11045,7 +11045,6 @@ static void test_xmlns_attribute(void) hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); EXPECT_HR(hr, S_OK); - str = SysAllocString(szAttribute); hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute); ok( hr == S_OK, "returns %08x\n", hr ); @@ -11062,16 +11061,16 @@ static void test_xmlns_attribute(void) hr = IXMLDOMDocument_get_documentElement(doc, &elem); EXPECT_HR(hr, S_OK); + str = NULL; hr = IXMLDOMElement_get_xml(elem, &str); ok( hr == S_OK, "got 0x%08x\n", hr); todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMAttribute_Release( pAttribute); - SysFreeString(str); - IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Nikolay Sivov : msxml3/tests: Null-terminate a string before A-> W conversion (Valgrind).
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 1742449ad8497d100d34f534b30ef6ecafa56d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1742449ad8497d100d34f534b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:18 2014 +0400 msxml3/tests: Null-terminate a string before A->W conversion (Valgrind). --- dlls/msxml3/tests/saxreader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 1032b8c..646984f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3297,8 +3297,9 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = HeapAlloc(GetProcessHeap(), 0, len); + buff = HeapAlloc(GetProcessHeap(), 0, len+1); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK); @@ -3344,6 +3345,7 @@ todo_wine ok(pos2.QuadPart == 0, "expected stream beginning\n"); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len - 8); EXPECT_HR(hr, S_OK); @@ -3368,6 +3370,7 @@ todo_wine EXPECT_HR(hr, S_OK); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3/tests: Fix some stream instance leaks (Valgrind).
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: c9c47459a9709699c2d717d07d6da50f42e91468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c47459a9709699c2d717d07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:35 2014 +0400 msxml3/tests: Fix some stream instance leaks (Valgrind). --- dlls/msxml3/tests/saxreader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 646984f..6c6a1b8 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2443,6 +2443,7 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + IStream_Release(stream); resolver = (void*)0xdeadbeef; hr = ISAXXMLReader_getEntityResolver(reader, &resolver); @@ -2476,6 +2477,8 @@ static void test_saxreader(void) sprintf(seqname, "%s: cdata test", table->name); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, seqname, TRUE); + IStream_Release(stream); + /* 2. CDATA sections */ stream = create_test_stream(test2_cdata_xml, -1); V_VT(&var) = VT_UNKNOWN; @@ -4244,6 +4247,7 @@ static void test_mxwriter_stream(void) EXPECT_HR(hr, S_OK); ok(pos2.QuadPart == 2, "got wrong position\n"); + IStream_Release(stream); ISAXContentHandler_Release(content); IMXWriter_Release(writer); @@ -5509,6 +5513,7 @@ static void test_mxattr_localname(void) ISAXAttributes_Release(saxattr); IMXAttributes_Release(mxattr); + free_bstrs(); } }

1 0

Nikolay Sivov : msxml3: Fix a string leak in msxml6 mode (Valgrind).
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: c7f1262613c83cef476dafe9bb7e912148b9c6f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f1262613c83cef476dafe9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:51 2014 +0400 msxml3: Fix a string leak in msxml6 mode (Valgrind). --- dlls/msxml3/schema.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index a4aa083..d694cb3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1318,11 +1318,13 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR uri) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); + xmlChar* name; + TRACE("(%p)->(%s)\n", This, debugstr_w(uri)); if (This->version == MSXML6) return E_NOTIMPL; + name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); cache_remove_entry(This, name); heap_free(name); return S_OK;

1 0

Nikolay Sivov : oledb32: Fix IDBInitialize instance leak on error path ( Valgrind).
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 3804423f8cd65922ee74e7722b407769916c5f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3804423f8cd65922ee74e7722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:34:09 2014 +0400 oledb32: Fix IDBInitialize instance leak on error path (Valgrind). --- dlls/oledb32/datainit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 9fe3c4f..dfafeb1 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -205,7 +205,7 @@ static const IDBInitializeVtbl dbinit_vtbl = dbinit_Uninitialize }; -static HRESULT create_db_init(void **obj) +static HRESULT create_db_init(IUnknown **obj) { dbinit *This; @@ -220,7 +220,7 @@ static HRESULT create_db_init(void **obj) This->IDBProperties_iface.lpVtbl = &dbprops_vtbl; This->ref = 1; - *obj = &This->IDBInitialize_iface; + *obj = (IUnknown*)&This->IDBInitialize_iface; return S_OK; } @@ -512,7 +512,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = CoCreateInstance(&provclsid, outer, clsctx, riid, (void**)datasource); if (FAILED(hr) && IsEqualIID(riid, &IID_IDBInitialize)) - hr = create_db_init((void**)datasource); + hr = create_db_init(datasource); } /* now set properties */ @@ -555,7 +555,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o hr = set_dbpropset(name, value, &propset); SysFreeString(name); SysFreeString(value); - if (FAILED(hr)) return hr; + if (FAILED(hr)) break; hr = IDBProperties_SetProperties(dbprops, 1, propset); free_dbpropset(1, propset);

1 0

Nikolay Sivov : oledb32/tests: Simplify IMalloc handling.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 51a4fce54d9807043534ccf139c694c8800b13b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a4fce54d9807043534ccf13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:34:27 2014 +0400 oledb32/tests: Simplify IMalloc handling. --- dlls/oledb32/tests/Makefile.in | 2 +- dlls/oledb32/tests/database.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index df71d64..1a4e07e 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oledb32.dll -IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b7020ab..a46725c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -29,7 +29,6 @@ #include "ole2.h" #include "msdadc.h" #include "msdasc.h" -#include "shlobj.h" #include "msdaguid.h" #include "initguid.h" #include "oledberr.h" @@ -56,14 +55,6 @@ static void test_GetDataSource(WCHAR *initstring) if(SUCCEEDED(hr)) { IDBProperties *props = NULL; - IMalloc *ppM = NULL; - - hr = SHGetMalloc(&ppM); - if (FAILED(hr)) - { - ok(0, "Couldn't get IMalloc object.\n"); - goto end; - } hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); @@ -84,15 +75,12 @@ static void test_GetDataSource(WCHAR *initstring) pInfoset->rgPropertyInfos[i].vtType); } - IMalloc_Free(ppM, ary); + CoTaskMemFree(ary); } IDBProperties_Release(props); } - IMalloc_Release(ppM); - -end: IDBInitialize_Release(dbinit); }

1 0

Nikolay Sivov : dmime: Fix handling of NULL out pointer in QI.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: a596cbb8478372411f8596e28b68ff547ec6aee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a596cbb8478372411f8596e28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:35:15 2014 +0400 dmime: Fix handling of NULL out pointer in QI. --- dlls/dmime/segmentstate.c | 3 +++ dlls/dmime/tests/dmime.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 8a9ed1f..b1b176c 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -37,6 +37,9 @@ static HRESULT WINAPI DirectMusicSegmentState8_QueryInterface(IDirectMusicSegmen TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); + if (!ppobj) + return E_POINTER; + *ppobj = NULL; if (IsEqualIID(riid, &IID_IUnknown) || diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 669e99e..c1c2caa 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -293,6 +293,9 @@ static void test_COM_segmentstate(void) ok(refcount == 4, "refcount == %u, expected 4\n", refcount); refcount = IUnknown_Release(unk); + hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + while (IDirectMusicSegmentState8_Release(dmss8)); }

1 0

Nikolay Sivov : scrrun: Fix use-after-free of version info (Valgrind).
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: c50503d049bd28a05c7a17e16c996c3ac497a138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50503d049bd28a05c7a17e16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 5 13:58:03 2014 +0400 scrrun: Fix use-after-free of version info (Valgrind). --- dlls/scrrun/filesystem.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index b04637c..b2a1a35 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3657,11 +3657,15 @@ static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR name, BST } ret = VerQueryValueW(ptr, rootW, (void**)&info, &len); - heap_free(ptr); if (!ret) + { + heap_free(ptr); return HRESULT_FROM_WIN32(GetLastError()); + } get_versionstring(info, ver); + heap_free(ptr); + *version = SysAllocString(ver); TRACE("version=%s\n", debugstr_w(ver));

1 0