- Wine-Commits - list.winehq.org

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

Gabriel Ivăncescu : jscript: Fix jsstr leak after changing variant type to BSTR.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: b4948244177930e2af6737ebdd702bf7b328957e URL: https://gitlab.winehq.org/wine/wine/-/commit/b4948244177930e2af6737ebdd702b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 13 22:31:54 2023 +0200 jscript: Fix jsstr leak after changing variant type to BSTR. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 5ddeae6ac1ed0713166d6ea01b37fb0bac4f2c03) --- dlls/jscript/jsutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3dfcd08f14c..ffe6116e929 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -947,6 +947,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY break; hres = jsstr_to_bstr(str, &V_BSTR(dst)); + jsstr_release(str); break; } case VT_EMPTY:

1 0

Serkan Önder : po: Update Turkish translation.
by Alexandre Julliard April 20, 2023

April 20, 2023

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

K.B.Dharun Krishna : po: Update Tamil translation.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: fc2fdfe28af28420807c1b836009d84e450c7dc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc2fdfe28af28420807c1b836009d8… Author: K.B.Dharun Krishna <kbdharunkrishna(a)gmail.com> Date: Mon Jan 30 11:38:22 2023 +0530 po: Update Tamil translation. (cherry picked from commit b46bcd2cb182cbf29cc550d489f7759c1660b3b3) --- po/ta.po | 674 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 361 insertions(+), 313 deletions(-)

1 0

Florian Will : gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: ea4487fe0603a49043970a991f27db6fa2222268 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea4487fe0603a49043970a991f27db… Author: Florian Will <florian.will(a)gmail.com> Date: Tue Feb 28 11:56:56 2023 +0100 gdiplus: Use FILE_SHARE_READ in GdipPrivateAddFontFile(). ZusiDisplay sometimes loads the same font file into two different PrivateFontCollections using two threads, so there is a race condition when the file is opened without the FILE_SHARE_READ sharing mode. The second call to GdipPrivateAddFontFile() might fail if the first one hasn't closed the file handle yet. (cherry picked from commit b3bf30e7e21f25ca539ade9607cdaaed77067d08) --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 03678623606..fc298c102de 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1110,7 +1110,7 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCON if (!collection || !name) return InvalidParameter; - file = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) return InvalidParameter; if (!GetFileSizeEx(file, &size) || size.u.HighPart) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7fbe619cd93..a2aea904bb1 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -91,7 +91,7 @@ static void test_long_name(void) ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed: %ld\n", GetLastError()); stat = GdipPrivateAddFontFile(fonts, path); - todo_wine ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); + ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); CloseHandle(file);

1 0

Florian Will : gdiplus/tests: Test for GdipPrivateAddFontFile() sharing violation.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 760b01cbeeae404d03b7c47f3575fb7775a9d7a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/760b01cbeeae404d03b7c47f3575fb… Author: Florian Will <florian.will(a)gmail.com> Date: Wed Mar 1 08:47:34 2023 +0100 gdiplus/tests: Test for GdipPrivateAddFontFile() sharing violation. (cherry picked from commit 0ebf3222e57d2ac7da790a4ddb572fad5751806a) --- dlls/gdiplus/tests/font.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index ccdb7a2ef96..7fbe619cd93 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -76,6 +76,7 @@ static void test_long_name(void) WCHAR path[MAX_PATH]; GpStatus stat; GpFontCollection *fonts; + HANDLE file; INT num_families; GpFontFamily *family, *cloned_family; WCHAR family_name[LF_FACESIZE]; @@ -86,8 +87,19 @@ static void test_long_name(void) create_testfontfile(L"wine_longname.ttf", 1, path); + file = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed: %ld\n", GetLastError()); + stat = GdipPrivateAddFontFile(fonts, path); - ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); + todo_wine ok(stat == Ok, "GdipPrivateAddFontFile failed with open file handle: %d\n", stat); + + CloseHandle(file); + + if (stat != Ok) { + /* try again without opened file handle */ + stat = GdipPrivateAddFontFile(fonts, path); + ok(stat == Ok, "GdipPrivateAddFontFile failed: %d\n", stat); + } stat = GdipGetFontCollectionFamilyCount(fonts, &num_families); ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed: %d\n", stat);

1 0

Dmitry Timoshkov : rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 29ba0953ae07affb5df801d268a6402268aff6cf URL: https://gitlab.winehq.org/wine/wine/-/commit/29ba0953ae07affb5df801d268a640… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 13 20:57:18 2022 -0600 rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer(). (cherry picked from commit 4ec4bdff7365193f71806f7fc0c31c0cbf724a57) --- dlls/rpcrt4/cproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b2c86d54422..b51ba41a45f 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -586,7 +586,7 @@ void WINAPI NdrProxyFreeBuffer(void *This, { IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg); - pStubMsg->fBufferValid = TRUE; + pStubMsg->fBufferValid = FALSE; } IRpcChannelBuffer_Release(pStubMsg->pRpcChannelBuffer); pStubMsg->pRpcChannelBuffer = NULL;

1 0

Zhiyi Zhang : user32/tests: Test winstation and desktop access rights.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: stable Commit: 4748dbfbf3c1ed82d971c4ac813bc89683c085a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4748dbfbf3c1ed82d971c4ac813bc8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 15 10:32:55 2023 +0800 user32/tests: Test winstation and desktop access rights. (cherry picked from commit 44b92e577716f5b91fd8b6130a79a81ae13d426f) --- dlls/user32/tests/winstation.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9c27b5afd01..fc775546502 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -121,7 +121,9 @@ static void test_handles(void) char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + OBJECT_BASIC_INFORMATION info; TOKEN_STATISTICS token_stats; + NTSTATUS status; /* win stations */ @@ -133,6 +135,12 @@ static void test_handles(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() ); print_object( w1 ); + status = NtQueryObject( w1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + flags = 0; ok( GetHandleInformation( w1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) || @@ -270,6 +278,12 @@ static void test_handles(void) ok( GetHandleInformation( d1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), "handle %p PROTECT_FROM_CLOSE set\n", d1 ); + status = NtQueryObject( d1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + SetLastError( 0xdeadbeef ); ok( !CloseDesktop(d1), "closing thread desktop succeeded\n" ); ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */

1 0