April 2023 - Wine-Commits - list.winehq.org

Michael Stefaniuc : Release 8.0.1.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: d8b2687760f7c07eaf481aba2835b820d3092b3e URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b2687760f7c07eaf481aba2835b8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 4 22:13:33 2023 +0200 Release 8.0.1. --- ANNOUNCE | 521 ++++++++++++++++++++++---------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 26 ++-- 4 files changed, 201 insertions(+), 352 deletions(-)

1 0

Hans Leidekker : adsldp/tests: Fix test failures.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 903375bf2ff69fb45d33d4ba553a46058e462b2a URL: https://gitlab.winehq.org/wine/wine/-/commit/903375bf2ff69fb45d33d4ba553a46… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Mar 19 21:32:27 2023 +0100 adsldp/tests: Fix test failures. The server is back online now and apparently its contents changed, causing test failures. (cherry picked from commit 42fbc50b66d6d0b7e48840e9d30761ef98df8b3d) --- dlls/adsldp/tests/ldap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index a5bb4ee971f..7404b62a231 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -310,8 +310,6 @@ static void do_search(const struct search *s) "expected %s, got %s\n", wine_dbgstr_w(res->values[i]), wine_dbgstr_w(col.pADsValues[i].CaseIgnoreString)); } - ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i])); - IDirectorySearch_FreeColumn(ds, &col); FreeADsMem(name); res++;

1 0

Hans Leidekker : adsldp/tests: Skip all remaining tests when the server is down.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 0b00e61a89437f9c7883ae1b17ecb6d6c9d09068 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b00e61a89437f9c7883ae1b17ecb6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 17 08:45:01 2023 +0100 adsldp/tests: Skip all remaining tests when the server is down. There's a long timeout when the connection fails and there doesn't appear to be a way to reduce it with this API. When several of these timeouts occur the total time can exceed the timeout for the test. This patch skips all remaining tests when one of them detects that the server is down. (cherry picked from commit 39e70374e67a84ee96a660b637a6c148d0513c91) --- dlls/adsldp/tests/ldap.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 80b41df5ea7..a5bb4ee971f 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -37,6 +37,8 @@ DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_OLEGUID(CLSID_PointerMoniker,0x306,0,0); +static BOOL server_down; + static const struct { const WCHAR *path; @@ -74,6 +76,8 @@ static void test_LDAP(void) BSTR path, user, password; int i; + if (server_down) return; + hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads); ok(hr == S_OK, "got %#lx\n", hr); IADs_Release(ads); @@ -99,6 +103,7 @@ static void test_LDAP(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -110,6 +115,7 @@ static void test_LDAP(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -121,6 +127,7 @@ static void test_LDAP(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -149,6 +156,8 @@ static void test_ParseDisplayName(void) ULONG count; int i; + if (server_down) return; + hr = CoCreateInstance(&CLSID_LDAP, 0, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&parse); ok(hr == S_OK, "got %#lx\n", hr); IParseDisplayName_Release(parse); @@ -172,6 +181,7 @@ static void test_ParseDisplayName(void) { SysFreeString(path); skip("server is down\n"); + server_down = TRUE; break; } ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#lx, expected %#lx\n", i, hr, test[i].hr); @@ -193,6 +203,7 @@ static void test_ParseDisplayName(void) if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; break; } todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) @@ -237,12 +248,15 @@ static void do_search(const struct search *s) LPWSTR name; const struct result *res; + if (server_down) return; + trace("search DN %s\n", wine_dbgstr_w(s->dn)); hr = ADsGetObject(s->dn, &IID_IDirectorySearch, (void **)&ds); if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == S_OK, "got %#lx\n", hr); @@ -363,6 +377,8 @@ static void test_DirectorySearch(void) ADS_SEARCH_COLUMN col; LPWSTR name; + if (server_down) return; + hr = ADsGetObject(L"LDAP:", &IID_IDirectorySearch, (void **)&ds); ok(hr == E_NOINTERFACE, "got %#lx\n", hr); @@ -370,6 +386,7 @@ static void test_DirectorySearch(void) if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == E_NOINTERFACE, "got %#lx\n", hr); @@ -378,6 +395,7 @@ static void test_DirectorySearch(void) if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == S_OK, "got %#lx\n", hr); @@ -492,10 +510,13 @@ static void test_DirectoryObject(void) ADS_SEARCH_HANDLE sh; ADS_SEARCH_COLUMN col; + if (server_down) return; + hr = ADsGetObject(L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", &IID_IDirectoryObject, (void **)&dirobj); if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) { skip("server is down\n"); + server_down = TRUE; return; } ok(hr == S_OK, "got %#lx\n", hr);

1 0

Brendan Shanks : taskmgr: Use exit code 1 when terminating processes.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b59ff5eefccf2cf7e3997e8a35b71c748cd9b21c URL: https://gitlab.winehq.org/wine/wine/-/commit/b59ff5eefccf2cf7e3997e8a35b71c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 1 13:34:38 2023 -0800 taskmgr: Use exit code 1 when terminating processes. (cherry picked from commit 2da1126021faf1a455d1e48f6828640bdd046136) --- programs/taskmgr/endproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 498186212b7..0d2752be9ac 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -83,7 +83,7 @@ void ProcessPage_OnEndProcess(void) return; } - if (!TerminateProcess(hProcess, 0)) + if (!TerminateProcess(hProcess, 1)) { GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP); @@ -133,7 +133,7 @@ void ProcessPage_OnEndProcessTree(void) return; } - if (!TerminateProcess(hProcess, 0)) + if (!TerminateProcess(hProcess, 1)) { GetLastErrorText(wstrErrorText, ARRAY_SIZE(wstrErrorText)); MessageBoxW(hMainWnd, wstrErrorText,wszUnable2Terminate, MB_OK|MB_ICONSTOP);

1 0

Brendan Shanks : loader: In macOS preloader, fix an environment variable sometimes being lost.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 104aecf3f7e614e91451b048a66fcb985b148982 URL: https://gitlab.winehq.org/wine/wine/-/commit/104aecf3f7e614e91451b048a66fcb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Feb 6 16:02:50 2023 -0800 loader: In macOS preloader, fix an environment variable sometimes being lost. (cherry picked from commit 36bb7175c14c887d8ebd73958fa69987181c1eb3) --- loader/preloader_mac.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 8986d234e62..8e249a7dc4d 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -605,25 +605,22 @@ static inline void get_dyld_func( const char *name, void **func ) static void fixup_stack( void *stack ) { int *pargc; - char **argv, **env, **apple, **apple_end; + char **argv, **env_new; + static char dummyvar[] = "WINEPRELOADERDUMMYVAR=1"; pargc = stack; argv = (char **)pargc + 1; - env = &argv[*pargc-1] + 2; - - apple = env; - while (*apple) - apple++; - apple++; - - apple_end = apple; - while (*apple_end) - apple_end++; - apple_end++; - /* decrement argc, and move all the data between &argv[1] and apple_end down to start at &argv[0] */ + /* decrement argc, and "remove" argv[0] */ *pargc = *pargc - 1; - memmove(&argv[0], &argv[1], (char *)apple_end - (char *)&argv[1]); + memmove( &argv[0], &argv[1], (*pargc + 1) * sizeof(char *) ); + + env_new = &argv[*pargc-1] + 2; + /* In the launched binary on some OSes, _NSGetEnviron() returns + * the original 'environ' pointer, so env_new[0] would be ignored. + * Put a dummy variable in env_new[0], so nothing is lost in this case. + */ + env_new[0] = dummyvar; } static void set_program_vars( void *stack, void *mod )

1 0

Alex Henrie : server: Fix buffer overrun in map_view handler.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 40d54217119ab7ac1ffb4fd8128fb97f7b3a6c3a URL: https://gitlab.winehq.org/wine/wine/-/commit/40d54217119ab7ac1ffb4fd8128fb9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 23:34:58 2022 -0700 server: Fix buffer overrun in map_view handler. Because of padding at the end of the struct, sizeof(*view) is greater than offsetof(struct memory_view, name[0]). Change the allocation to overallocate slightly instead of underallocating slightly. (cherry picked from commit 94d6e616e2cbade844fdc2306514690bf629f675) --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 8d4332d240f..ed81a718bbe 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1212,7 +1212,7 @@ DECL_HANDLER(map_view) if (!req->mapping) /* image mapping for a .so dll */ { if (get_req_data_size() > sizeof(view->image)) namelen = get_req_data_size() - sizeof(view->image); - if (!(view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) return; + if (!(view = mem_alloc( sizeof(struct memory_view) + namelen * sizeof(WCHAR) ))) return; memset( view, 0, sizeof(*view) ); view->base = req->base; view->size = req->size;

1 0

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 405c143cbab7478587d715e6c3f48aaed9c808d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/405c143cbab7478587d715e6c3f48a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 26 21:05:28 2017 +0200 tools: Get the ANNOUNCE bug list from the stable-notes git notes. --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index 13a391e7c44..cd61cbb6bce 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; use open ':encoding(utf8)'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Michael Stefaniuc : gitlab: Do not run the build script on each commit.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 66dee6200f606b0d9df61687c8cd7ca595d1ff09 URL: https://gitlab.winehq.org/wine/wine/-/commit/66dee6200f606b0d9df61687c8cd7c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 4 22:06:28 2023 +0200 gitlab: Do not run the build script on each commit. There are too many commits at once in Stable. --- tools/gitlab/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index b474f271c8b..89461483b7e 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -34,7 +34,7 @@ build-linux: paths: - usr/local/ script: - - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux + - ./tools/gitlab/build-linux build-mac: extends: .wine-build @@ -49,7 +49,7 @@ build-mac: - build32/config.log script: - export PATH="/usr/local/opt/ccache/libexec:$PATH" - - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac + - ./tools/gitlab/build-mac build-daily-linux: extends: .wine-build

1 0

Brendan Shanks : taskkill: Use exit code 1 when terminating processes.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 4790d4b29e2840911c787de1461e5fecf7244547 URL: https://gitlab.winehq.org/wine/wine/-/commit/4790d4b29e2840911c787de1461e5f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 1 13:37:11 2023 -0800 taskkill: Use exit code 1 when terminating processes. (cherry picked from commit fe6294c74346e9956fb839d2a4ca078c624f6bbf) --- programs/taskkill/taskkill.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 2904e64f40a..424e87b9a44 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -341,7 +341,7 @@ static int terminate_processes(void) continue; } - if (!TerminateProcess(process, 0)) + if (!TerminateProcess(process, 1)) { taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); status_code = 1; @@ -381,7 +381,7 @@ static int terminate_processes(void) continue; } - if (!TerminateProcess(process, 0)) + if (!TerminateProcess(process, 1)) { taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); status_code = 1;

1 0

Rémi Bernon : services: Use a separate allocation for NotifyParamsArray[0].params.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: cbc1ba2d63e0d809145c039688758fc2d10a21ac URL: https://gitlab.winehq.org/wine/wine/-/commit/cbc1ba2d63e0d809145c039688758f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 15:13:41 2023 +0100 services: Use a separate allocation for NotifyParamsArray[0].params. The pointer might be freed by RPC NdrPointerFree, which will try to use a dedicated free call for the array elements, and fail. (cherry picked from commit 03aa9e13e70e0f4c8087a93c7435eff75fc7cddd) --- programs/services/rpc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index de918d33b1f..e56d25ea1af 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -102,6 +102,8 @@ static void sc_notify_release(struct sc_notify_handle *notify) if (r == 0) { CloseHandle(notify->event); + if (notify->params_list) + free(notify->params_list->NotifyParamsArray[0].params); free(notify->params_list); free(notify); } @@ -841,11 +843,14 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s SC_RPC_NOTIFY_PARAMS_LIST *list; SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; - list = calloc(1, sizeof(SC_RPC_NOTIFY_PARAMS_LIST) + sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)); + list = calloc(1, sizeof(SC_RPC_NOTIFY_PARAMS_LIST)); if (!list) return; - - cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); + if (!(cparams = calloc(1, sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)))) + { + free(list); + return; + } cparams->dwNotifyMask = notify->notify_mask; fill_status_process(&cparams->ServiceStatus, service);

1 0