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

Serkan Önder : po: Update Turkish translation.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 90c5775819245ca149e2e3b52e68a5f4db3399b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/90c5775819245ca149e2e3b52e68a5… Author: Serkan Önder <serkanonder(a)outlook.com> Date: Sun Feb 26 17:19:29 2023 +0000 po: Update Turkish translation. Conflicts: po/tr.po (cherry picked from commit 56db5b0bf1aa6df5edbedbec03e0a1db39d6639b) --- po/tr.po | 1406 ++++++++++++++++++++++++++++---------------------------------- 1 file changed, 644 insertions(+), 762 deletions(-)

1 0

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

20 Apr '23

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 20 Apr '23

20 Apr '23

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

Rémi Bernon : services: Use a separate allocation for NotifyParamsArray[0].params.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Brendan Shanks : taskmgr: Use exit code 1 when terminating processes.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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 : taskkill: Use exit code 1 when terminating processes.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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 20 Apr '23

20 Apr '23

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

Jason Millard : oleaut32: Fix VarAbs function for BSTR with positive values.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 5dec0c134d12913b035837848e92c9217176d87d URL: https://gitlab.winehq.org/wine/wine/-/commit/5dec0c134d12913b035837848e92c9… Author: Jason Millard <jsm174(a)gmail.com> Date: Tue Feb 14 13:22:56 2023 -0500 oleaut32: Fix VarAbs function for BSTR with positive values. (cherry picked from commit 72b86f967e0282be60b3507194ba01a7e1cf66b5) --- dlls/oleaut32/tests/vartest.c | 8 ++++++++ dlls/oleaut32/variant.c | 4 +--- dlls/vbscript/tests/api.vbs | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4e9c892e37e..d31df67d084 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3145,6 +3145,14 @@ static void test_VarAbs(void) hres = pVarAbs(&v,&vDst); ok(hres == S_OK && V_VT(&vDst) == VT_R8 && V_R8(&vDst) == 1.1, "VarAbs: expected 0x0,%d,%g, got 0x%lX,%d,%g\n", VT_R8, 1.1, hres, V_VT(&vDst), V_R8(&vDst)); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"30000"); + memset(&vDst,0,sizeof(vDst)); + hres = pVarAbs(&v,&vDst); + ok(hres == S_OK && V_VT(&vDst) == VT_R8 && V_R8(&vDst) == 30000.0, + "VarAbs: expected 0x0,%d,%g, got 0x%lX,%d,%g\n", VT_R8, 30000.0, hres, V_VT(&vDst), V_R8(&vDst)); + SysFreeString(V_BSTR(&v)); } static HRESULT (WINAPI *pVarNot)(LPVARIANT,LPVARIANT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bbfc1b2d952..8c2aa3b729d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4329,7 +4329,6 @@ VarOr_Exit: */ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) { - VARIANT varIn; HRESULT hRet = S_OK; VARIANT temp; @@ -4373,11 +4372,10 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) if (V_R4(pVarOut) < 0.0) V_R4(pVarOut) = -V_R4(pVarOut); break; case VT_BSTR: - hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(&varIn)); + hRet = VarR8FromStr(V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &V_R8(pVarOut)); if (FAILED(hRet)) break; V_VT(pVarOut) = VT_R8; - pVarIn = &varIn; /* Fall through ... */ case VT_DATE: case VT_R8: diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 903593ebd60..5c7b1ecabee 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1646,6 +1646,7 @@ Call ok(Abs(True) = 1, "Abs(True) = " & Abs(True)) Call ok(getVT(Abs(True)) = "VT_I2", "getVT(Abs(True)) = " & getVT(Abs(True))) Call ok(Abs(CByte(1)) = 1, "Abs(CByte(1)) = " & Abs(CByte(1))) Call ok(getVT(Abs(CByte(1))) = "VT_UI1", "getVT(Abs(CByte(1))) = " & getVT(Abs(CByte(1)))) +Call ok(Abs("30000") = 30000, "Abs(""30000"") = " & Abs("30000")) Sub testAbsError(strings, error_num1, error_num2) on error resume next

1 0

Jason Millard : vbscript: Fix compile when statement after ElseIf or after separator.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 270c09ee8e03c79af4fbd1ca69870cb132b670c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/270c09ee8e03c79af4fbd1ca69870c… Author: Jason Millard <jsm174(a)gmail.com> Date: Tue Feb 14 10:02:09 2023 -0500 vbscript: Fix compile when statement after ElseIf or after separator. (cherry picked from commit 887e72b24ead813facc3bd2ec9fd90a268d0dcd8) --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 03415dc2b1c..9ae6c478bfa 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -314,7 +314,7 @@ ElseIfs | ElseIf ElseIfs { $1->next = $2; $$ = $1; } ElseIf - : tELSEIF Expression tTHEN tNL StatementsNl_opt + : tELSEIF Expression tTHEN StSep_opt StatementsNl_opt { $$ = new_elseif_decl(ctx, @$, $2, $5); } Else_opt diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1707cc9a92b..4a629627a16 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -337,6 +337,23 @@ ElseIf not False Then End If Call ok(x, "elseif not called?") +' ElseIf with statement on same line +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not False Then x = true +End If +Call ok(x, "elseif not called?") + +' ElseIf with statement following statement separator +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not False Then +: x = true +End If +Call ok(x, "elseif not called?") + x = false if 1 then x = true Call ok(x, "if 1 not run?")

1 0