November 2020 - Wine-Commits

Tag wine-5.0.3 : Alexandre Julliard : Release 5.0.3
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: refs/tags/wine-5.0.3 Tag: 9fe0c415c277e88623fb82e8406c37f092788aed URL: https://source.winehq.org/git/wine.git/?a=tag;h=9fe0c415c277e88623fb82e8406… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 20:43:43 2020 +0100 Release 5.0.3

1 0

Gijs Vermeulen : amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw().
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 286946a5333ae299fc89949e4211357a3c13c10e URL: https://source.winehq.org/git/wine.git/?a=commit;h=286946a5333ae299fc89949e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 19 16:10:30 2020 +0200 amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1e81d551903d548d42d04d5076181741309d23c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 671585f5d63..ff7cf1ab3f5 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -393,6 +393,9 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi TRACE("(%p)->(%p)\n", iface, ddraw); + if (!ddraw) + return E_POINTER; + *ddraw = NULL; if (!This->ddraw) {

1 0

Akihiro Sagawa : documentation: Update Japanese translation.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: f210feacdef0e64de059fab34b2b6e61f8286f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f210feacdef0e64de059fab3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 11 23:52:19 2020 +0900 documentation: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fef92bacc5967c1a45d7bae98af364a5df47981b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.ja | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.ja b/documentation/README.ja index 9b44353306a..57b35de9915 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -19,6 +19,14 @@ READMEというファイル]を含むディレクトリ）から、以下を実 ./configure make +それから次のいずれか、Wineをインストールするか: + +make install + +または、Wineをビルドディレクトリから直接実行してください: + +./wine notepad + "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。

1 0

Paul Gofman : shell32: Only consider copy operation multidest if the number of dst files is greater than one.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: cbfb70ba0a5fc2aadb9cd8f0df98aea732336435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbfb70ba0a5fc2aadb9cd8f0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 15:09:01 2020 +0300 shell32: Only consider copy operation multidest if the number of dst files is greater than one. Fixes crash on start in Worms World Party Remastered. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2f456cfe57de42259cca8155a56854a0f170844) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db39144..38c582be091 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c72440425..36602f335d6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1816,6 +1816,15 @@ static void test_copy(void) CreateDirectoryA("one", NULL); CreateDirectoryA("two", NULL); + /* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0"; + shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + /* pFrom has a glob, pTo has more than one dest */ shfo.pFrom = "a*.txt\0"; shfo.pTo = "one\0two\0";

1 0

Changping Yu : kernel32: Adjust thread creation insertion order.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: fe175342eb86fdad3faa32a6a3999caecfb149b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe175342eb86fdad3faa32a6… Author: Changping Yu <dead.ash(a)hotmail.com> Date: Mon Jun 29 13:08:27 2020 +0800 kernel32: Adjust thread creation insertion order. Signed-off-by: Changping Yu <dead.ash(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59ce4e3eb878ca470ec0f153f567e92a3a577922) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 4 ---- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 7ec0b3aab3a..b196a4f5f0d 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -227,7 +227,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) /* Reset data */ thread_traversed[i] = 0; } - todo_wine ok(found == FALSE, "The thread order is not strictly consistent\n"); /* Determine the order by NtQuerySystemInformation function */ @@ -282,7 +281,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) break; } } - todo_wine ok(found == FALSE, "wrong order in NtQuerySystemInformation function\n"); SetEvent(ev); @@ -303,7 +301,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) /* Check that the main thread id is first one in this thread. */ tid = get_id_thread(ULongToPtr(curr_pid)); - todo_wine ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); /* Check that the main thread id is first one in other thread. */ @@ -312,7 +309,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) ok(error == WAIT_OBJECT_0, "Thread did not complete within timelimit\n"); ok(GetExitCodeThread(thread, &tid), "Could not retrieve exit code\n"); - todo_wine ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); } diff --git a/server/thread.c b/server/thread.c index 80db41b48d2..a838bf5ddd0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -265,7 +265,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu thread->affinity = process->affinity; if (!current) current = thread; - list_add_head( &thread_list, &thread->entry ); + list_add_tail( &thread_list, &thread->entry ); if (sd && !set_sd_defaults_from_token( &thread->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |

1 0

Alex Henrie : urlmon: Fix null pointer dereference in process_hook_section (Coverity).
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 2a8257ece7cbd567f5b2edd27e8f276362457274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a8257ece7cbd567f5b2edd2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Aug 8 09:36:41 2020 -0600 urlmon: Fix null pointer dereference in process_hook_section (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0385811219a6dc7ab9726255f760ebea37e8286d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/axinstall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 9d6f9a0f15d..3f10902ddd2 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -202,7 +202,7 @@ static HRESULT process_hook_section(install_ctx_t *ctx, const WCHAR *sect_name) cmd = heap_alloc(size*sizeof(WCHAR)); if(!cmd) - heap_free(cmd); + return E_OUTOFMEMORY; expand_command(ctx, val, cmd, &size); hres = RunSetupCommandW(ctx->hwnd, cmd, NULL, ctx->tmp_dir, NULL, NULL, 0, NULL);

1 0

Gijs Vermeulen : wbemprox: Set obj to NULL on error in get_object().
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: ec77942663bcd19c76ada852d11a48fa80d84425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec77942663bcd19c76ada852… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 11 12:01:46 2020 +0200 wbemprox: Set obj to NULL on error in get_object(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11f2057768ed2d5416fad30d6e3e18683ffc17cd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/services.c | 6 +++++- dlls/wbemprox/tests/query.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 8b3a3b1af42..6aa283da387 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -469,7 +469,11 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) return hr; } hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); - if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; + if (hr == WBEM_S_FALSE) + { + hr = WBEM_E_NOT_FOUND; + *obj = NULL; + } IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a3a3565759f..be05165542c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -342,19 +342,23 @@ static void test_Win32_Service( IWbemServices *services ) service = NULL; hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); service = NULL; hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); SysFreeString( empty ); SysFreeString( class ); class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + service = (IWbemClassObject *)0xdeadbeef; hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + ok( service == NULL, "expected NULL service, got %p\n", service ); SysFreeString( class ); }

1 0

Gijs Vermeulen : wbemprox: Don't crash in IWbemClassObject::Put() when called with empty class object.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 92305238df1d041c688ce6deb2fa0c1e37cbcaef URL: https://source.winehq.org/git/wine.git/?a=commit;h=92305238df1d041c688ce6de… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 11 12:01:47 2020 +0200 wbemprox: Don't crash in IWbemClassObject::Put() when called with empty class object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40945 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c3bd08b02299e3ac89b708ff3bd4bda262ec6bde) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/class.c | 3 +++ dlls/wbemprox/tests/query.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 3ee5771e6b0..a2e04d1a15c 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -455,6 +455,9 @@ static HRESULT WINAPI class_object_Put( if ((hr = get_column_index( co->record->table, wszName, &index )) != S_OK) return hr; return record_set_value( co->record, index, pVal ); } + + if (!ec) return S_OK; + return put_propval( ec->query->view, co->index, wszName, pVal, Type ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index be05165542c..31cf93b4ac9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -263,7 +263,7 @@ static void test_Win32_Service( IWbemServices *services ) static const WCHAR emptyW[] = {0}; BSTR class = SysAllocString( serviceW ), empty = SysAllocString( emptyW ), method; IWbemClassObject *service, *out; - VARIANT state, retval; + VARIANT state, retval, classvar; CIMTYPE type; HRESULT hr; @@ -343,6 +343,13 @@ static void test_Win32_Service( IWbemServices *services ) hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( !!service, "expected non-NULL service\n" ); + + VariantInit(&classvar); + V_VT(&classvar) = VT_BSTR; + V_BSTR(&classvar) = SysAllocString(L"MyClass"); + hr = IWbemClassObject_Put(service, L"__CLASS", 0, &classvar, 0); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear(&classvar); IWbemClassObject_Release( service ); service = NULL;

1 0

Zebediah Figura : d3dcompiler: Iterate through the instruction list in reverse in free_instr_list() (Valgrind).
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: fb267b661ddcf391b725a5e4e7532cfe1c47ea67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb267b661ddcf391b725a5e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 10 11:11:35 2020 -0500 d3dcompiler: Iterate through the instruction list in reverse in free_instr_list() (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 23cc3003722317b72bd798a00678f24c36937762) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 1436ed6bf3e..ad973487f47 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2126,7 +2126,9 @@ void free_instr_list(struct list *list) if (!list) return; - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, list, struct hlsl_ir_node, entry) + /* Iterate in reverse, to avoid use-after-free when unlinking sources from + * the "uses" list. */ + LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) free_instr(node); d3dcompiler_free(list); }

1 0

Nikolay Sivov : winedbg: Double dll name buffer size for unimplemented function exception.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 755512bd9f660e8f9182f59fed7dadbd36715188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=755512bd9f660e8f9182f59f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 20 21:47:17 2020 +0300 winedbg: Double dll name buffer size for unimplemented function exception. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51fbcc0c23e3217b79a27391eafc911773ca060a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 123cbc934ef..4e8580db0d4 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -914,7 +914,7 @@ void info_win32_exception(void) break; case EXCEPTION_WINE_STUB: { - char dll[32], name[256]; + char dll[64], name[256]; memory_get_string(dbg_curr_process, (void*)rec->ExceptionInformation[0], TRUE, FALSE, dll, sizeof(dll));

1 0