March 2021 - Wine-Commits - list.winehq.org

Yongjie Yao : msxml3: Fix a memory leak (Valgrind).
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: ade6d16750692fcdcfee7f5851fbddb117851417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade6d16750692fcdcfee7f58… Author: Yongjie Yao <yaoyongjie(a)uniontech.com> Date: Fri Sep 11 15:41:58 2020 +0000 msxml3: Fix a memory leak (Valgrind). Signed-off-by: Yongjie Yao <yaoyongjie(a)uniontech.com> Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9336ec8faf2e2f2420698f40c02988877781bfef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/domdoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 76d3fdb6018..3dc98279f43 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -796,13 +796,17 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) hr = GetHGlobalFromStream(hstream, &hglobal); if (FAILED(hr)) + { + IStream_Release(hstream); return hr; + } len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len) xmldoc = doparse(doc, ptr, len, XML_CHAR_ENCODING_NONE); GlobalUnlock(hglobal); + IStream_Release(hstream); if (!xmldoc) {

1 0

Tag wine-5.0.4 : Alexandre Julliard : Release 5.0.4
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: refs/tags/wine-5.0.4 Tag: 227ed9aa0cc30d7e99633e3f4fe18d2c29ca09a1 URL: https://source.winehq.org/git/wine.git/?a=tag;h=227ed9aa0cc30d7e99633e3f4fe… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 23 21:06:05 2021 +0100 Release 5.0.4

1 0

Haidong Yu : inetcpl.cpl: Fix memory leak in security_on_initdialog.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 160047def273649036595d668eecf09fb1b9b4d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=160047def273649036595d66… Author: Haidong Yu <yhd986(a)163.com> Date: Sun Dec 13 08:38:34 2020 +0800 inetcpl.cpl: Fix memory leak in security_on_initdialog. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa0296e378aa49e69daa2d2c97d47663eca4d658) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index e11caf1fc3e..4c60c42ca0e 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -323,6 +323,7 @@ static INT_PTR security_on_initdialog(HWND hsec) TRACE("using imagelist: %p\n", sd->himages); if (!sd->himages) { ERR("ImageList_Create failed!\n"); + security_on_destroy(sd); return FALSE; } SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)sd->himages);

1 0

Haidong Yu : ieframe: Fix memory leak in PersistFile_Save.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: c6553e54dbaee103c105785e0b54b317130b0efe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6553e54dbaee103c105785e… Author: Haidong Yu <yhd986(a)163.com> Date: Fri Dec 18 16:39:49 2020 +0800 ieframe: Fix memory leak in PersistFile_Save. Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e8741f08178070ff025e6e5280b552ad64af9249) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/intshcut.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 13a5582dbc7..6c64eb5b3b2 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -614,6 +614,7 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam WriteFile(file, str_ICONFILE, lstrlenA(str_ICONFILE), &bytesWritten, NULL); WriteFile(file, iconfile, lstrlenA(iconfile), &bytesWritten, NULL); WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + heap_free(iconfile); } sprintf(indexString, "ICONINDEX=%d", pvread[1].u.iVal);

1 0

Michael Stefaniuc : Release 5.0.4.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: aa3c86d6b61ea4fa26986548f2a2b207ba8cc2f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa3c86d6b61ea4fa26986548… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 4 22:38:41 2021 +0100 Release 5.0.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 434 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 8 ++ VERSION | 2 +- configure | 18 +-- 4 files changed, 266 insertions(+), 196 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa3c86d6b61ea4fa2698…

1 0

Hans Leidekker : winhttp: Avoid a crash when the connection is closed while handling a redirect.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 36ce75e0e6db46c8dc79f39a97f0f07aba3a6213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ce75e0e6db46c8dc79f39a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 16:52:08 2021 +0100 winhttp: Avoid a crash when the connection is closed while handling a redirect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48870 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83afd177b3735f88e38f926aaf3aa0a20178e458) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7c8e6ba89e0..aaa3c0df240 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2759,7 +2759,7 @@ static BOOL receive_response( struct request *request, BOOL async ) break; } - netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); + if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); if (request->content_length) ret = refill_buffer( request, FALSE ); if (async)

1 0

Rémi Bernon : mscoree: Fallback to assembly name if codebase path is invalid.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 4264a498a02f3df1fa2e3123c9649f84402b8f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4264a498a02f3df1fa2e3123… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:46 2020 +0200 mscoree: Fallback to assembly name if codebase path is invalid. Also use the InprocServer32 key values if there's no subkeys, as shown by the test results. L.A.Noire game crashes on startup after failing to load its ErrorHandler assembly, that has an invalid CodeBase path in the registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b0a939a1fb9f0acc7b450cd849fb4e1d93eb499) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 44 +++++++++++++++++++++++++++++-------------- dlls/mscoree/tests/comtest.c | 3 ++- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index a900ed6a3e2..886267546c5 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1759,6 +1759,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) HKEY key, subkey; LONG res; int offset = 0; + HANDLE file = INVALID_HANDLE_VALUE; DWORD numKeys, keyLength; WCHAR codebase[MAX_PATH + 8]; WCHAR classname[350], subkeyName[256]; @@ -1794,7 +1795,12 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) offset = lstrlenW(wszFileSlash); lstrcpyW(filename, codebase + offset); + + file = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); } + + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); else { WCHAR assemblyname[MAX_PATH + 8]; @@ -1803,27 +1809,37 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) WARN("CodeBase value cannot be found, trying Assembly.\n"); /* get the last subkey of InprocServer32 */ res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); - if (res != ERROR_SUCCESS || numKeys == 0) - goto cleanup; - numKeys--; - keyLength = ARRAY_SIZE(subkeyName); - res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); - if (res != ERROR_SUCCESS) - goto cleanup; - res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) - goto cleanup; - dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); - RegCloseKey(subkey); if (res != ERROR_SUCCESS) goto cleanup; + if (numKeys > 0) + { + numKeys--; + keyLength = ARRAY_SIZE(subkeyName); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + } + else + { + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(key, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + if (res != ERROR_SUCCESS) + goto cleanup; + } hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); if (FAILED(hr)) { /* - * The registry doesn't have a CodeBase entry and it's not in the GAC. + * The registry doesn't have a CodeBase entry or the file isn't there, and it's not in the GAC. * * Use the Assembly Key to retrieve the filename. * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 63df3219a79..87d7626a3dd 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -177,7 +177,8 @@ static void run_registry_test(run_type run) ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); - todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + todo_wine_if(result_expected != S_OK) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); if (hr == S_OK) {

1 0

Rémi Bernon : mscoree/tests: Test invalid assembly paths in registry.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 971ab954f768624e0242726f9686f2889ecdf7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=971ab954f768624e0242726f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:44 2020 +0200 mscoree/tests: Test invalid assembly paths in registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7612ff5930c7de8c2279f2b6613c8dbaeea9894e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/tests/Makefile.in | 2 +- dlls/mscoree/tests/comtest.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index f65e1bc6c25..7dcd5b64113 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid shell32 +IMPORTS = ole32 shlwapi uuid shell32 advapi32 C_SRCS = \ comtest.c \ diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 4879e3b7622..63df3219a79 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -148,6 +148,51 @@ static void run_test(BOOL expect_success) } IClassFactory_Release(classFactory); } + +} + +static void run_registry_test(run_type run) +{ + char buffer[256]; + ITest *test = NULL; + HRESULT hr, result_expected; + HKEY hkey; + DWORD ret; + int i = 0; + + if (run == run_type_exe_directory) result_expected = S_OK; + else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); + ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); + + ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Assembly", REG_SZ, "comtest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", 74); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Class", REG_SZ, "DLL.Test", 8); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "CodeBase", REG_SZ, "file:///U:/invalid/path/to/comtest.dll", 41); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + RegDeleteKeyValueA(hkey, "InprocServer32", "CodeBase"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Class"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Assembly"); + RegDeleteKeyValueA(hkey, "InprocServer32", NULL); + RegDeleteKeyA(hkey, "InprocServer32"); + RegCloseKey(hkey); } static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) @@ -247,6 +292,7 @@ static void prepare_and_run_test(const char *dll_source, run_type run) SetCurrentDirectoryA(path_tmp); run_test(run == run_type_exe_directory); + run_registry_test(run); cleanup: if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE)

1 0

Myah Caron : dmband: Avoid cloning stream in parse_bands_list.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: a0f1cf0449bc8225720ad38702d0235886c6da5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f1cf0449bc8225720ad387… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 17 05:18:08 2020 -0700 dmband: Avoid cloning stream in parse_bands_list. A stream that doesn't implement ::Clone can be passed, causing IStream_Seek to crash. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2cf69bb5a5b43951abb251f415ccb81e809bd32e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/bandtrack.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 14d2c7a571c..612be063e19 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -425,21 +425,22 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK StreamSize = Chunk.dwSize - sizeof(FOURCC); switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { - LPSTREAM pClonedStream = NULL; + ULARGE_INTEGER liOrigPos; TRACE_(dmfile)(": BAND RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - + liMove.QuadPart = 0; + IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, &liOrigPos); + liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - hr = load_band(This, pClonedStream, &pBand, &header); + hr = load_band(This, pStm, &pBand, &header); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; } - IStream_Release (pClonedStream); + liMove.QuadPart = (LONGLONG)liOrigPos.QuadPart; + IStream_Seek (pStm, liMove, STREAM_SEEK_SET, NULL); IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release at as it inserted */

1 0

Ken Thomases : mountmgr: Avoid operating on a null CFStringRef, which would crash.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 432e3297d1bfca3ce208da38799999dd188d3da2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=432e3297d1bfca3ce208da38… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 9 14:21:49 2020 -0500 mountmgr: Avoid operating on a null CFStringRef, which would crash. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7e312c346cc94f093d82324f9020ac5595464f61) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 8bbf43579c8..bd1fcae9206 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -298,7 +298,7 @@ static CFStringRef find_service_id( const WCHAR *adapter ) service = CFArrayGetValueAtIndex( services, i ); name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) ); - if (CFStringGetLength( name ) < ARRAY_SIZE( buf )) + if (name && CFStringGetLength( name ) < ARRAY_SIZE( buf )) { CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf ); if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service )))

1 0