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

Vincent Povirk : ole32: Initial implementation of transaction locking.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 4f0d36d9a0339f5f853064bbf4fdc0d320ab82f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0d36d9a0339f5f853064bbf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 14:55:56 2014 -0500 ole32: Initial implementation of transaction locking. --- dlls/ole32/storage32.c | 310 ++++++++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 28 ++++ dlls/ole32/tests/storage32.c | 4 +- 3 files changed, 268 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0d36d9a0339f5f85306…

1 0

Victor Martinez Calvo : quartz: Check correct dwReserved item before tracing.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 2dbfb2af840e3239435564f070c65876eb14b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbfb2af840e3239435564f07… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:21:44 2014 +0200 quartz: Check correct dwReserved item before tracing. --- dlls/quartz/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6cd28da..d74c8ab 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -820,7 +820,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("dwChunkId: %.4s\n", (const char *)&pIndex->dwChunkId); if (pIndex->dwReserved[0]) TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); - if (pIndex->dwReserved[2]) + if (pIndex->dwReserved[1]) TRACE("dwReserved[1]: %u\n", pIndex->dwReserved[1]); if (pIndex->dwReserved[2]) TRACE("dwReserved[2]: %u\n", pIndex->dwReserved[2]);

1 0

Victor Martinez Calvo : msdmo: Actually copy output string in IEnumDMO_fnNext.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 0aea3728cca741913410534f411422905e3b8f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aea3728cca741913410534f4… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:27:00 2014 +0200 msdmo: Actually copy output string in IEnumDMO_fnNext. --- dlls/msdmo/dmoreg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index fb1caa1..e0c0719 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -615,9 +615,9 @@ static HRESULT WINAPI IEnumDMO_fnNext( hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szValue, &len); if (ERROR_SUCCESS == hres) { - Names[count] = HeapAlloc(GetProcessHeap(), 0, strlenW(szValue) + 1); + Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) - strcmpW(Names[count], szValue); + strcpyW(Names[count], szValue); } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]);

1 0

Victor Martinez Calvo : shlwapi: Check correct attributes in PathRelativePath.
by Alexandre Julliard May 5, 2014

May 5, 2014

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 : msxml3: Fix a string leak in msxml6 mode (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

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 : dmime: Fix handling of NULL out pointer in QI.
by Alexandre Julliard May 5, 2014

May 5, 2014

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 May 5, 2014

May 5, 2014

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

Nikolay Sivov : scrrun: Fix invalid read/write access to path buffer ( Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 8595d70203c207e75403fb6e7c55d5e18d852456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8595d70203c207e75403fb6e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 5 13:58:25 2014 +0400 scrrun: Fix invalid read/write access to path buffer (Valgrind). --- dlls/scrrun/filesystem.c | 3 --- dlls/scrrun/tests/filesystem.c | 55 +++++++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index b2a1a35..aead0d2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2721,9 +2721,6 @@ static HRESULT create_file(BSTR path, IFile **file) return E_FAIL; } - if(path[len-1]=='/' || path[len-1]=='\\') - path[len-1] = 0; - attrs = GetFileAttributesW(f->path); if(attrs==INVALID_FILE_ATTRIBUTES || (attrs&(FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE))) { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c258a0f..409cf4b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -45,6 +45,15 @@ static const WCHAR crlfW[] = {'\r','\n',0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) +static inline void get_temp_path(const WCHAR *prefix, WCHAR *path) +{ + WCHAR buffW[MAX_PATH]; + + GetTempPathW(MAX_PATH, buffW); + GetTempFileNameW(buffW, prefix, 0, path); + DeleteFileW(path); +} + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -129,15 +138,13 @@ static void test_interfaces(void) static void test_createfolder(void) { - WCHAR pathW[MAX_PATH], buffW[MAX_PATH]; + WCHAR buffW[MAX_PATH]; HRESULT hr; BSTR path; IFolder *folder; BOOL ret; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, NULL, 0, buffW); - DeleteFileW(buffW); + get_temp_path(NULL, buffW); ret = CreateDirectoryW(buffW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -528,33 +535,31 @@ static void test_GetAbsolutePathName(void) static void test_GetFile(void) { - static const WCHAR get_file[] = {'g','e','t','_','f','i','l','e','.','t','s','t',0}; - - BSTR path = SysAllocString(get_file); + static const WCHAR slW[] = {'\\',0}; + BSTR path; + WCHAR pathW[MAX_PATH]; FileAttribute fa; VARIANT size; DWORD gfa; IFile *file; HRESULT hr; HANDLE hf; + BOOL ret; + get_temp_path(NULL, pathW); + + path = SysAllocString(pathW); hr = IFileSystem3_GetFile(fs3, path, NULL); ok(hr == E_POINTER, "GetFile returned %x, expected E_POINTER\n", hr); hr = IFileSystem3_GetFile(fs3, NULL, &file); ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); - if(GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { - skip("File already exists, skipping GetFile tests\n"); - SysFreeString(path); - return; - } - file = (IFile*)0xdeadbeef; hr = IFileSystem3_GetFile(fs3, path, &file); ok(!file, "file != NULL\n"); ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); - hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + hf = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); if(hf == INVALID_HANDLE_VALUE) { skip("Can't create temporary file\n"); SysFreeString(path); @@ -566,7 +571,7 @@ static void test_GetFile(void) ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); hr = IFile_get_Attributes(file, &fa); - gfa = GetFileAttributesW(get_file) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | + gfa = GetFileAttributesW(pathW) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_COMPRESSED); ok(hr == S_OK, "get_Attributes returned %x, expected S_OK\n", hr); @@ -589,6 +594,18 @@ static void test_GetFile(void) ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); SysFreeString(path); + + /* try with directory */ + lstrcatW(pathW, slW); + ret = CreateDirectoryW(pathW, NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + + path = SysAllocString(pathW); + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected S_OK\n", hr); + SysFreeString(path); + + RemoveDirectoryW(pathW); } static inline BOOL create_file(const WCHAR *name) @@ -858,9 +875,7 @@ static void test_FolderCollection(void) BSTR str; int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, fooW, 0, buffW); - DeleteFileW(buffW); + get_temp_path(fooW, buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); @@ -1042,9 +1057,7 @@ static void test_FileCollection(void) HANDLE file_a, file_b, file_c; int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, pathW); - GetTempFileNameW(pathW, fooW, 0, buffW); - DeleteFileW(buffW); + get_temp_path(fooW, buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW);

1 0

Marcus Meissner : ver.dll16: filelen is an in/out parameter (Coverity).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: e3997294621471a077480787e8961a45351875e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3997294621471a077480787e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 4 12:52:31 2014 +0200 ver.dll16: filelen is an in/out parameter (Coverity). --- dlls/ver.dll16/version.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 5abe1c4..b2cb9ae 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -522,7 +522,8 @@ DWORD WINAPI VerInstallFile16( UINT16 flags, LPSTR lpszSrcDir, LPSTR lpszDestDir, LPSTR lpszCurDir, LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen ) { - UINT filelen; + UINT filelen = *lpwTmpFileLen; + DWORD retv = VerInstallFileA( flags, lpszSrcFilename, lpszDestFilename, lpszSrcDir, lpszDestDir, lpszCurDir, lpszTmpFile, &filelen);

1 0

Nikolay Sivov : msxml3/tests: Fix a BSTR leak (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

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