wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Brendan Shanks : winemac.drv: Fix minimizing windows when Stage Manager is enabled.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 2fcf40a6e1af4ed043b56d2a2d6450e3311afdd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fcf40a6e1af4ed043b56d2a2d6450… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 25 12:51:26 2023 -0500 winemac.drv: Fix minimizing windows when Stage Manager is enabled. --- dlls/winemac.drv/cocoa_window.m | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 5700bd3d531..820bb606769 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -161,6 +161,21 @@ static inline NSUInteger adjusted_modifiers_for_settings(NSUInteger modifiers) return new_modifiers; } +static inline BOOL stage_manager_enabled(void) +{ + /* There is no documented way to determine if Stage Manager is enabled, + * but this seems like the best option. + */ + if (floor(NSAppKitVersionNumber) >= 2299 /* NSAppKitVersionNumber13_0 */) + { + NSUserDefaults *defs = [[NSUserDefaults alloc] initWithSuiteName:@"com.apple.WindowManager.plist"]; + BOOL enabled = [defs boolForKey:@"GloballyEnabled"]; + [defs release]; + return enabled; + } + return FALSE; +} + @interface NSWindow (WineAccessPrivateMethods) - (id) _displayChanged; @@ -2576,6 +2591,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) miniaturize:(id)sender { + /* When Stage Manager is enabled, miniaturize: just moves the app/window to + * the background rather than minimizing the window. + * Don't start minimizing the window on the Win32 side. + */ + if (stage_manager_enabled()) + { + [super miniaturize:sender]; + return; + } + macdrv_event* event = macdrv_create_event(WINDOW_MINIMIZE_REQUESTED, self); [queue postEvent:event]; macdrv_release_event(event);

1 0

Yuxuan Shui : mfmediaengine: Don't send event notify when engine is shutdown.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: e8943a64635a330ad23a3ce4957e7c6dcee8e6df URL: https://gitlab.winehq.org/wine/wine/-/commit/e8943a64635a330ad23a3ce4957e7c… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Oct 17 20:40:44 2023 +0100 mfmediaengine: Don't send event notify when engine is shutdown. I've also tried saving a cancel cookie from `BeginCreateObject*` and using it to cancel the operation in engine shutdown. However there are 2 problems: 1. Callback might still get called after `CancelObjectCreation`. Microsoft's [own documentation](https://learn.microsoft.com/en-us/windows/win32/api/mfidl/nf… says as much: > Because these methods are asynchronous, however, they might be completed before the > operation can be canceled. Therefore, your callback might still be invoked after you > call this method. 2. Our implementations of `BeginCreateObject*` are not cancellable. They call either `MFPutWorkItem` or `IMFByteStream_BeginRead`, neight of which provides cancellation. (and our `CancelObjectCreation` doesn't actually work. AsyncResult objects aren't added to `handler->results` list until they are completed, which means any attempts to cancel an yet-to-be-completed object creation will always fail with `MF_E_UNEXPECTED`) --- dlls/mfmediaengine/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 0d553a40a7e..d8694cf6011 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1356,6 +1356,12 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + { + LeaveCriticalSection(&engine->cs); + return S_OK; + } + engine->network_state = MF_MEDIA_ENGINE_NETWORK_LOADING; IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADSTART, 0, 0);

1 0

Rémi Bernon : mf/tests: Avoid crashing if MF_BYTESTREAM_EFFECTIVE_URL is missing.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: d0400e5637f1bd259c00ca888f8158676110ffa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0400e5637f1bd259c00ca888f8158… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 27 09:21:53 2023 +0200 mf/tests: Avoid crashing if MF_BYTESTREAM_EFFECTIVE_URL is missing. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=55588 --- dlls/mf/tests/mf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index aefc1b92b4d..18c97b93593 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6485,9 +6485,11 @@ static void test_scheme_resolvers(void) PropVariantInit(&propvar); hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, &propvar); ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got hr %#lx\n", hr); - ok(!wcsncmp(expect_domain[i], propvar.pwszVal, wcslen(expect_domain[i])) - || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, - "got url %s\n", debugstr_w(propvar.pwszVal)); + if (hr == S_OK) + { + ok(!wcsncmp(expect_domain[i], propvar.pwszVal, wcslen(expect_domain[i])), + "got url %s\n", debugstr_w(propvar.pwszVal)); + } hr = PropVariantClear(&propvar); ok(hr == S_OK, "got hr %#lx\n", hr);

1 0

Alistair Leslie-Hughes : msxml3: Do not leak bind context on error paths (Coverity).
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 48cebe2b91c5fd9c1c9202be4779ba831efeb02c URL: https://gitlab.winehq.org/wine/wine/-/commit/48cebe2b91c5fd9c1c9202be4779ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 11 17:55:04 2023 +1100 msxml3: Do not leak bind context on error paths (Coverity). --- dlls/msxml3/httprequest.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 459466a1234..e21ece7d9c4 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -680,19 +680,12 @@ static const IAuthenticateVtbl AuthenticateVtbl = { static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback **obj, const VARIANT *body) { BindStatusCallback *bsc; - IBindCtx *pbc; + IBindCtx *pbc = NULL; HRESULT hr; LONG size; - hr = CreateBindCtx(0, &pbc); - if (hr != S_OK) return hr; - - bsc = heap_alloc(sizeof(*bsc)); - if (!bsc) - { - IBindCtx_Release(pbc); + if (!(bsc = heap_alloc(sizeof(*bsc)))) return E_OUTOFMEMORY; - } bsc->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; bsc->IHttpNegotiate_iface.lpVtbl = &BSCHttpNegotiateVtbl; @@ -795,7 +788,9 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * SafeArrayUnaccessData(sa); } - hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); + hr = CreateBindCtx(0, &pbc); + if (hr == S_OK) + hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); if (hr == S_OK) { IMoniker *moniker; @@ -809,9 +804,11 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * IMoniker_Release(moniker); if (stream) IStream_Release(stream); } - IBindCtx_Release(pbc); } + if (pbc) + IBindCtx_Release(pbc); + if (FAILED(hr)) { IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface);

1 0

Alistair Leslie-Hughes : msxml3: Move tid_NULL out of possible enum values.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 2e23904abc7c0587462a142707f3c18e8b894e5c URL: https://gitlab.winehq.org/wine/wine/-/commit/2e23904abc7c0587462a142707f3c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 11 17:55:04 2023 +1100 msxml3: Move tid_NULL out of possible enum values. This was reported as a out of bounds access (Coverity), which is possible if the tid_NULL was ever passed in. --- dlls/msxml3/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 6212fc2976c..ef68cb74745 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -82,7 +82,7 @@ static lib_id_t lib_ids[] = { }; static tid_id_t tid_ids[] = { - { &IID_NULL, LibXml_Last }, + { &IID_NULL, LibXml2 }, { &IID_IXMLDOMAttribute, LibXml2 }, { &IID_IXMLDOMCDATASection, LibXml2 }, { &IID_IXMLDOMComment, LibXml2 },

1 0

Alistair Leslie-Hughes : msxml3: Don't call qsort if we have no data (Coverity).
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 5e0251f80d8732577998033cf6f7b12f41bcd273 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e0251f80d8732577998033cf6f7b1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 11 17:55:04 2023 +1100 msxml3: Don't call qsort if we have no data (Coverity). --- dlls/msxml3/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index cd7c2820133..6212fc2976c 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -294,9 +294,9 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); } - qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); - if(data->funcs) { + qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); + data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); for(i=0; i < data->func_cnt; i++) data->name_table[i] = data->funcs+i;

1 0

Zebediah Figura : ws2_32/tests: Wait for AFD_POLL_RESET in test_get_events_reset().
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 2ca895cb5f5a82057e6babfb9b1e810bc284829a URL: https://gitlab.winehq.org/wine/wine/-/commit/2ca895cb5f5a82057e6babfb9b1e81… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 21:24:10 2023 -0500 ws2_32/tests: Wait for AFD_POLL_RESET in test_get_events_reset(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54113 --- dlls/ws2_32/tests/afd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index b856caee853..b011c0da69f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -2058,17 +2058,20 @@ static void test_get_events_reset(void) tcp_socketpair(&client, &server); - ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CONNECT | FD_CLOSE | FD_OOB | FD_READ | FD_WRITE); + ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CLOSE | FD_OOB | FD_READ); ok(!ret, "got error %lu\n", GetLastError()); close_with_rst(server); + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %d\n", ret); + memset(&params, 0xcc, sizeof(params)); memset(&io, 0xcc, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); ok(!ret, "got %#x\n", ret); - ok(params.flags == (AFD_POLL_RESET | AFD_POLL_CONNECT | AFD_POLL_WRITE), "got flags %#x\n", params.flags); + ok(params.flags == AFD_POLL_RESET, "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); @@ -2076,17 +2079,21 @@ static void test_get_events_reset(void) tcp_socketpair(&client, &server); - ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CONNECT | FD_CLOSE | FD_OOB | FD_READ | FD_WRITE); + ResetEvent(event); + ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CLOSE | FD_OOB | FD_READ); ok(!ret, "got error %lu\n", GetLastError()); close_with_rst(client); + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %d\n", ret); + memset(&params, 0xcc, sizeof(params)); memset(&io, 0xcc, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)server, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); ok(!ret, "got %#x\n", ret); - ok(params.flags == (AFD_POLL_RESET | AFD_POLL_WRITE), "got flags %#x\n", params.flags); + ok(params.flags == AFD_POLL_RESET, "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]);

1 0

Zebediah Figura : ws2_32/tests: Make sure that WSARecv() completes synchronously in test_WSARecv().
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 9d330d81a6af73220e08a93efa18a7cbf0cc9408 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d330d81a6af73220e08a93efa18a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 16:40:24 2023 -0500 ws2_32/tests: Make sure that WSARecv() completes synchronously in test_WSARecv(). Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54342 --- dlls/ws2_32/tests/sock.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fc3c7053aa1..9f6cd487777 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7626,24 +7626,29 @@ static void test_WSARecv(void) memset(&ov, 0, sizeof(ov)); flags = 0; - bufs[0].len = 2; + bufs[0].len = 1; bufs[0].buf = buf; - /* Send 4 bytes and receive in two calls of 2 */ + /* Send 2 bytes and receive in two calls of 1 */ SetLastError(0xdeadbeef); - iret = send(src, "test", 4, 0); - ok(iret == 4, "Expected 4, got %d\n", iret); + iret = send(src, "ab", 2, 0); + ok(iret == 2, "got %d\n", iret); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; + /* Non-overlapped WSARecv() performs an alertable wait (tested below), but + * not if it completes synchronously. Make sure it completes synchronously + * by polling for input. */ + check_poll_mask(dest, POLLRDNORM, POLLRDNORM); + apc_count = 0; dwret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); ok(dwret, "QueueUserAPC returned %lu\n", dwret); iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned == 2, "Expected 2, got %ld\n", bytesReturned); + ok(bytesReturned == 1, "got %ld\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); ok(!apc_count, "got apc_count %u.\n", apc_count); @@ -7654,7 +7659,7 @@ static void test_WSARecv(void) bytesReturned = 0xdeadbeef; iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned == 2, "Expected 2, got %ld\n", bytesReturned); + ok(bytesReturned == 1, "got %ld\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); bufs[0].len = 4;

1 0

Rémi Bernon : gitlab: Run tests with LP_NUM_THREADS=4 env var.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: d9ad68a1ef1bb9288f5f39199a6042f013e6b464 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9ad68a1ef1bb9288f5f39199a6042… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 00:19:53 2023 +0200 gitlab: Run tests with LP_NUM_THREADS=4 env var. This forces mesa LLVMPIPE driver to use a fixed number of threads, and greatly reduces its memory usage from the $(nproc) default. On Gitlab this is 32 threads, which often exhaust VM space in 32bit tests. --- tools/gitlab/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index aaae5671843..4e0b6d75983 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -21,6 +21,7 @@ - export PATH=$BASEDIR/usr/local/bin:$PATH - export DISPLAY=:0 - export LC_ALL=C.UTF-8 + - export LP_NUM_THREADS=4 - export WINEDEBUG=err-all,fixme-all - | cat >$HOME/xorg.conf << EOF

1 0

Hans Leidekker : advapi32/tests: Skip WoW64 registry tests on 32-bit.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 2ad2ad035dd206ef5f34121776df911a4a2b8248 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ad2ad035dd206ef5f34121776df91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 25 21:54:50 2023 +0200 advapi32/tests: Skip WoW64 registry tests on 32-bit. --- dlls/advapi32/tests/registry.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c45509ecddf..29b1aff6b74 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -62,6 +62,7 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, DYNAMIC_TIME_ZONE_INFORMATION*); static BOOL limited_user; +static const BOOL is_64bit = sizeof(void *) > sizeof(int); static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st) { @@ -1163,9 +1164,9 @@ static void test_reg_open_key(void) * the registry access check is performed correctly. Redirection isn't * being tested, so the tests don't care about whether the process is * running under WOW64. */ - if (!pIsWow64Process) + if (!is_64bit) { - win_skip("WOW64 flags are not recognized\n"); + skip("Not running WoW64 tests on 32-bit\n"); return; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2023