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

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

Nikolay Sivov : oledb32: Fix IDBInitialize instance leak on error path ( Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

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 : msxml3/tests: Fix some stream instance leaks (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

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

Vincent Povirk : ole32: Accept STGM_TRANSACTED with no share mode specified.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: b4ade51a84a8cf865e6980d480cacb878a66b0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ade51a84a8cf865e6980d48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 11:25:25 2014 -0500 ole32: Accept STGM_TRANSACTED with no share mode specified. --- dlls/ole32/storage32.c | 7 +++++++ dlls/ole32/tests/storage32.c | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 72c52f1..a2d00b1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8251,6 +8251,10 @@ static HRESULT validateSTGM(DWORD stgm) case STGM_SHARE_DENY_WRITE: case STGM_SHARE_EXCLUSIVE: break; + case 0: + if (!(stgm & STGM_TRANSACTED)) + return E_FAIL; + break; default: return E_FAIL; } @@ -8306,6 +8310,9 @@ static DWORD GetShareModeFromSTGM(DWORD stgm) { switch (STGM_SHARE_MODE(stgm)) { + case 0: + assert(stgm & STGM_TRANSACTED); + /* fall-through */ case STGM_SHARE_DENY_NONE: return FILE_SHARE_READ | FILE_SHARE_WRITE; case STGM_SHARE_DENY_READ: diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 2cb73ce..b5c93ae 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3178,9 +3178,9 @@ static const struct lock_test lock_tests[] = { { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, - { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, TRUE }, + { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, - { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, TRUE }, + { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, }; @@ -3280,10 +3280,7 @@ static void test_locking(void) IStorage_Release(stg); hr = StgOpenStorage(filename, NULL, current->stg_mode, NULL, 0, &stg); - if (current->stg_mode == (STGM_READ|STGM_TRANSACTED) || current->stg_mode == (STGM_READWRITE|STGM_TRANSACTED)) - todo_wine ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); - else - ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); + ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); if (FAILED(hr)) { DeleteFileW(filename);

1 0

Vincent Povirk : ole32: Use share modes when creating storage files.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 04735d6f398ffb4a93dbf81778765e35c4f414fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04735d6f398ffb4a93dbf8177… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 10:27:25 2014 -0500 ole32: Use share modes when creating storage files. --- dlls/ole32/storage32.c | 9 +-------- dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b9e20d8..fd8fe32 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7562,7 +7562,7 @@ static HRESULT create_storagefile( /* * Interpret the STGM value grfMode */ - shareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + shareMode = GetShareModeFromSTGM(grfMode); accessMode = GetAccessModeFromSTGM(grfMode); if (grfMode & STGM_DELETEONRELEASE) @@ -7570,13 +7570,6 @@ static HRESULT create_storagefile( else fileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS; - if (STGM_SHARE_MODE(grfMode) && !(grfMode & STGM_SHARE_DENY_NONE)) - { - static int fixme; - if (!fixme++) - FIXME("Storage share mode not implemented.\n"); - } - *ppstgOpen = 0; hFile = CreateFileW(pwcsName, diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 6162e61..5eb80bc 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3176,8 +3176,8 @@ static const struct lock_test lock_tests[] = { { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, { STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, 0, FALSE }, - { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, TRUE }, - { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, TRUE }, + { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, FALSE }, + { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, TRUE },

1 0

Vincent Povirk : ole32: Use symbolic names for range lock offsets.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: a60d41d70ad76df44e29051aa9f01a987ee3581c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60d41d70ad76df44e29051aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 2 12:52:00 2014 -0500 ole32: Use symbolic names for range lock offsets. --- dlls/ole32/storage32.c | 61 +++++++++++++++++------------------------------- dlls/ole32/storage32.h | 47 ++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a60d41d70ad76df44e290…

1 0

Vincent Povirk : ole32: Map STGM_SHARE_EXCLUSIVE to FILE_SHARE_READ.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 6417a277cf4bdb3a739446d900d07269498d81a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6417a277cf4bdb3a739446d90… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 10:53:26 2014 -0500 ole32: Map STGM_SHARE_EXCLUSIVE to FILE_SHARE_READ. --- dlls/ole32/storage32.c | 3 +-- dlls/ole32/tests/storage32.c | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fd8fe32..72c52f1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8311,9 +8311,8 @@ static DWORD GetShareModeFromSTGM(DWORD stgm) case STGM_SHARE_DENY_READ: return FILE_SHARE_WRITE; case STGM_SHARE_DENY_WRITE: - return FILE_SHARE_READ; case STGM_SHARE_EXCLUSIVE: - return 0; + return FILE_SHARE_READ; } ERR("Invalid share mode!\n"); assert(0); diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 5eb80bc..2cb73ce 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -868,11 +868,9 @@ static void test_storage_refcount(void) r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stgprio); ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); - todo_wine { /* non-transacted mode read/write fails */ r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg); ok(r==STG_E_LOCKVIOLATION, "StgOpenStorage should return STG_E_LOCKVIOLATION instead of 0x%08x\n", r); - } /* non-transacted mode read-only succeeds */ r = StgOpenStorage( filename, NULL, STGM_SHARE_DENY_WRITE|STGM_READ, NULL, 0, &stg); @@ -3173,13 +3171,13 @@ static const int roex_fail_ranges[] = { 0x0,-1 }; static const struct lock_test lock_tests[] = { { STGM_PRIORITY, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, priority_locked_bytes, pr_fail_ranges, FALSE }, - { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, - { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, + { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, FALSE }, + { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, - { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, - { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, + { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, + { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, TRUE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, TRUE },

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: CreateJobs() is a function, not a class method.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: 7d089311a0f6430894251b0c47e2800bae94d59d URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d089311a0f6430894251b0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:06 2014 +0200 testbot/CheckForWinetestUpdate: CreateJobs() is a function, not a class method. --- testbot/bin/CheckForWinetestUpdate.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c61fdba..6d33a5c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -57,7 +57,7 @@ sub AddJob my ($BaseJob, $FileNameRandomPart, $Bits) = @_; # First create a new job - my $Jobs = WineTestBot::Jobs->CreateJobs(); + my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); @@ -118,7 +118,7 @@ sub AddJob sub AddReconfigJob { # First create a new job - my $Jobs = WineTestBot::Jobs->CreateJobs(); + my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(3);

1 0

Francois Gouget : testbot: GetBatchUser() is a function, not a class method.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: e61a2389553d4e5e8d263ff8e04abae4ebc5623f URL: http://source.winehq.org/git/tools.git/?a=commit;h=e61a2389553d4e5e8d263ff8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:50:42 2014 +0200 testbot: GetBatchUser() is a function, not a class method. CreateUsers() is not a class method so there it no reason for GetBatchUser() to call it as if it was. --- testbot/bin/CheckForWinetestUpdate.pl | 5 +++-- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 6 ++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 8cbcc9c..c61fdba 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -46,6 +46,7 @@ use HTTP::Response; use HTTP::Status; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Users; use WineTestBot::Log; use WineTestBot::Utils; use WineTestBot::VMs; @@ -58,7 +59,7 @@ sub AddJob # First create a new job my $Jobs = WineTestBot::Jobs->CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->User(WineTestBot::Users->GetBatchUser()); + $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . @@ -119,7 +120,7 @@ sub AddReconfigJob # First create a new job my $Jobs = WineTestBot::Jobs->CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->User(WineTestBot::Users->GetBatchUser()); + $NewJob->User(GetBatchUser()); $NewJob->Priority(3); $NewJob->Remarks("Update Wine to latest git"); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a478fbf..cebb064 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -180,7 +180,7 @@ sub Submit } if (! defined($User)) { - $User = $Users->GetBatchUser(); + $User = GetBatchUser(); } my $Disposition = "Submitted job "; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 1f09446..ba1f6c3 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -404,11 +404,9 @@ sub Authenticate $self->AuthenticateBuiltin(@_); } -sub GetBatchUser +sub GetBatchUser() { - my $class = shift; - - return $class->CreateUsers()->GetItem("batch"); + return CreateUsers()->GetItem("batch"); } 1;

1 0

Francois Gouget : testbot/CGI: Fix the GetCurrentSession() call in ObjectModel::CGI::Page.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: ca706ed1b11197b5e368ffd57544c2814f0852e7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ca706ed1b11197b5e368ffd5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:39 2014 +0200 testbot/CGI: Fix the GetCurrentSession() call in ObjectModel::CGI::Page. It was passing too many parameters. --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 0661519..331243c 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -172,7 +172,7 @@ sub GetCurrentSession { my $self = shift; - return $self->{PageBase}->GetCurrentSession($self, @_); + return $self->{PageBase}->GetCurrentSession(); } sub SetCurrentSession

1 0

Francois Gouget : testbot/Engine: Use rmtree() instead of running 'rm -rf' .
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: tools Branch: master Commit: 9c38a40a2e870b92b0161d0268ce8512b2e29be1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9c38a40a2e870b92b0161d02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:19 2014 +0200 testbot/Engine: Use rmtree() instead of running 'rm -rf'. --- testbot/bin/Engine.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a12f263..f0570d7 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -40,7 +40,10 @@ use Fcntl; use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; +use File::Path; + use ObjectModel::BackEnd; + use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; @@ -465,7 +468,11 @@ sub HandleWinePatchMLSubmission CreatePatches()->NewPatch($Entity); # Clean up - system("rm -rf $WorkDir"); + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } unlink($FullMessageFileName); return "1OK"; @@ -507,7 +514,11 @@ sub HandleWinePatchWebSubmission my $ErrMessage = CreatePatches()->NewPatch($Entity, $WebPatchId); # Clean up - system("rm -rf $WorkDir"); + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } unlink($FullFileName); return defined($ErrMessage) ? "0" . $ErrMessage : "1OK";

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: fc6d4afd6a6ef60bffabb3ef6ec1016b2187619e URL: http://source.winehq.org/git/website.git/?a=commit;h=fc6d4afd6a6ef60bffabb3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon May 5 08:53:33 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.18
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: cfd6ab009a795276b37021fd04a50c40b7ca62bc URL: http://source.winehq.org/git/website.git/?a=commit;h=cfd6ab009a795276b37021… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 3 07:25:29 2014 +0200 Polish translation for release 1.7.18 --- news/pl/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014050201.xml b/news/pl/2014050201.xml new file mode 100644 index 0000000..bfc8872 --- /dev/null +++ b/news/pl/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>Maj 2, 2014</date> +<title>Wydano Wine 1.7.18</title> +<body> + Wydanie rozwojowe Wine 1.7.18 jest już dostępne. + <a href="{$root}/announce/1.7.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszona obsługa obiektów dostępności OLE.</li> + <li>Ulepszenia w wymiarowaniu okien w sterowniku Mac.</li> + <li>Poprawki dla różnych problemów z pamięcią znalezione przez Valgrind.</li> + <li>Kilka funkcji MSHTML więcej.</li> + <li>Kilka porządków w DirectDraw.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.7.18 freigegeben
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: 9cb34ee1d5ee61ac9c31b97447ee087f14a8f479 URL: http://source.winehq.org/git/website.git/?a=commit;h=9cb34ee1d5ee61ac9c31b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 3 18:56:50 2014 +0200 Wine 1.7.18 freigegeben --- news/de/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2014050201.xml b/news/de/2014050201.xml new file mode 100644 index 0000000..506ee6d --- /dev/null +++ b/news/de/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. Mai 2014</date> +<title>Wine 1.7.18 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte OLE Accessible Object Unterstützung.</li> + <li>Verbesserungen an der Fenstergrößenanpassung im Mac Treiber.</li> + <li>Fehlerbehebungen für verschiedene Speicherprobleme die mit Valgrind gefunden wurden.</li> + <li>Ein paar neue MSHTML Funktionen.</li> + <li>Einige Aufräumarbeiten an DirectDraw.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.18
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: 7c8ada766ee0008d5ad9008c092e7c536d6fed76 URL: http://source.winehq.org/git/website.git/?a=commit;h=7c8ada766ee0008d5ad900… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 3 08:39:23 2014 +0200 French translation for release 1.7.18 --- news/fr/2014050201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014050201.xml b/news/fr/2014050201.xml new file mode 100644 index 0000000..ce52717 --- /dev/null +++ b/news/fr/2014050201.xml @@ -0,0 +1,16 @@ +<news> +<date>2 mai 2014</date> +<title>Sortie de Wine 1.7.18</title> +<body> + La version de développement 1.7.18 de Wine est disponible. + <a href="{$root}/announce/1.7.18">Nouveautés</a> de cette version : +<ul> + <li>Meilleure prise en charge de l'API OLE Accessible Object.</li> + <li>Améliorations au dimensionnement des fenêtres dans le pilote Mac.</li> + <li>Correctifs pour différents problèmes mémoire signalés par Valgrind.</li> + <li>Fonctions MSHTML supplémentaires.</li> + <li>Quelques nettoyages dans DirectDraw.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.18
by Jeremy Newman May 5, 2014

May 5, 2014

Module: website Branch: master Commit: a672e2d09347b9fb72a90378f7d953bee4d0be4a URL: http://source.winehq.org/git/website.git/?a=commit;h=a672e2d09347b9fb72a903… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri May 2 23:56:12 2014 +0300 Ukrainian translation for release 1.7.18 --- news/uk/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014050201.xml b/news/uk/2014050201.xml new file mode 100644 index 0000000..2797465 --- /dev/null +++ b/news/uk/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>2 травня 2014</date> +<title>Випущено Wine 1.7.18</title> +<body> + Розробницький реліз Wine 1.7.18 наразі доступний. + <a href="{$root}/announce/1.7.18">Що нового</a> в цьому релізі: +<ul> + <li>Покращена підтримка OLE Accessible Object.</li> + <li>Покращення зміни розмірів вікна у Mac драйвері.</li> + <li>Виправлення різних проблем з пам'яттю знайдених за допомогою Valgrind.</li> + <li>Додано кілька функцій MSHTML.</li> + <li>Деяке чищення коду DirectDraw.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.18
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: website Branch: master Commit: e9cd518ed8c8a04588fdf434b9f2a6dd8c49e058 URL: http://source.winehq.org/git/website.git/?a=commit;h=e9cd518ed8c8a04588fdf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 20:23:32 2014 +0200 Wine release 1.7.18 --- news/en/2014050201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2014050201.xml b/news/en/2014050201.xml new file mode 100644 index 0000000..a247bd2 --- /dev/null +++ b/news/en/2014050201.xml @@ -0,0 +1,17 @@ +<news> +<date>May 2, 2014</date> +<title>Wine 1.7.18 Released</title> +<body> + The Wine development release 1.7.18 is now available. + <a href="{$root}/announce/1.7.18">What's new</a> in this release: +<ul> + <li>Improved OLE Accessible Object support.</li> + <li>Window sizing improvements in the Mac driver.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>A few more MSHTML functions.</li> + <li>Some DirectDraw cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.18 : Alexandre Julliard : Release 1.7.18
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: refs/tags/wine-1.7.18 Tag: 6726af75d18e111579f949c642e4a68d58c315ab URL: http://source.winehq.org/git/wine.git/?a=tag;h=6726af75d18e111579f949c642e4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 20:15:48 2014 +0200 Release 1.7.18

1 0

Alexandre Julliard : Release 1.7.18.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: e8cfb0e5b049e68da9df34ec4e6c6a329de0c1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cfb0e5b049e68da9df34ec4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 2 20:15:48 2014 +0200 Release 1.7.18. --- ANNOUNCE | 727 +++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 353 insertions(+), 395 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cfb0e5b049e68da9df3…

1 0

Francois Gouget : dpnet/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: b95b044bffb097623019f55d7418caee9ec6aa71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95b044bffb097623019f55d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 2 16:44:48 2014 +0200 dpnet/tests: Add a trailing '\n' to an ok() call. --- dlls/dpnet/tests/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index dad5a8e..e7b35f8 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -31,7 +31,7 @@ static void create_directplay_address(void) IDirectPlay8Address *localaddr = NULL; hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); - ok(hr == S_OK, "Failed to create IDirectPlay8Address object"); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); if(SUCCEEDED(hr)) { GUID guidsp;

1 0

Francois Gouget : ole32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard May 2, 2014

May 2, 2014

Module: wine Branch: master Commit: 3d70f86fe2b921b47727963ded281c4f0c2cf12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d70f86fe2b921b47727963de… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 2 16:44:43 2014 +0200 ole32/tests: Add a trailing '\n' to an ok() call. --- dlls/ole32/tests/hglobalstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index cf9fedf..e20d81b 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -267,7 +267,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek\n"); if (SUCCEEDED(hr)) ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); else

1 0