February 2023 - Wine-commits

Connor McAdams : uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Event GUIDs.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 01fb2a26d2649666d3879a223a2cf2b779898cfd URL: https://gitlab.winehq.org/wine/wine/-/commit/01fb2a26d2649666d3879a223a2cf2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 29 12:34:28 2022 -0500 uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Event GUIDs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 73 +++++++++++++++++--- dlls/uiautomationcore/uia_classes.idl | 6 ++ dlls/uiautomationcore/uia_ids.c | 107 ++++++++++++++++++++++++++++- include/uiautomationclient.idl | 2 + include/uiautomationcoreapi.h | 39 +++++++++++ 5 files changed, 216 insertions(+), 11 deletions(-)

1 0

Connor McAdams : include: Define UI Automation pattern provider interfaces.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 51aa53161a11a595a8d0b323ac2b1a84b50a9501 URL: https://gitlab.winehq.org/wine/wine/-/commit/51aa53161a11a595a8d0b323ac2b1a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jan 9 11:45:49 2023 -0500 include: Define UI Automation pattern provider interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 601 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 601 insertions(+)

1 0

Connor McAdams : uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Pattern GUIDs.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: abc1f7dadb1f71fc246fa36b6426233a43f98155 URL: https://gitlab.winehq.org/wine/wine/-/commit/abc1f7dadb1f71fc246fa36b642623… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jan 9 11:57:24 2023 -0500 uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Pattern GUIDs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 40 ++++++++++++ dlls/uiautomationcore/uia_classes.idl | 6 ++ dlls/uiautomationcore/uia_ids.c | 101 +++++++++++++++++++++++++++++ include/uiautomationcoreapi.h | 38 +++++++++++ 4 files changed, 185 insertions(+)

1 0

Giovanni Mascellani : vkd3d: Do not read blocked_queue_count without holding the device mutex.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: e076fd9c77482a2c71314f923cde553c46940df2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e076fd9c77482a2c71314f923cde5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 8 12:55:05 2023 +0100 vkd3d: Do not read blocked_queue_count without holding the device mutex. --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 62fc5149..45620e86 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -642,6 +642,9 @@ static HRESULT d3d12_device_add_blocked_command_queues(struct d3d12_device *devi HRESULT hr = S_OK; unsigned int i; + if (count == 0) + return S_OK; + vkd3d_mutex_lock(&device->mutex); if ((i = ARRAY_SIZE(device->blocked_queues) - device->blocked_queue_count) < count) @@ -697,8 +700,6 @@ static HRESULT d3d12_device_flush_blocked_queues(struct d3d12_device *device) /* Executing an op on one queue may unblock another, so repeat until nothing is flushed. */ do { - if (!device->blocked_queue_count) - return S_OK; if (FAILED(hr = d3d12_device_flush_blocked_queues_once(device, &flushed_any))) return hr; }

1 0

Giovanni Mascellani : vkd3d: Do not read max_pending_value without holding the fence's mutex.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: df36026633a4f0949e2893638e481c829ac53247 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df36026633a4f0949e2893638e481… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 8 14:13:06 2023 +0100 vkd3d: Do not read max_pending_value without holding the fence's mutex. --- libs/vkd3d/command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 45620e86..9cf35831 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6801,13 +6801,14 @@ static bool d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, boo { case VKD3D_CS_OP_WAIT: fence = op->u.wait.fence; + vkd3d_mutex_lock(&fence->mutex); if (op->u.wait.value > fence->max_pending_value) { + vkd3d_mutex_unlock(&fence->mutex); queue->ops_count -= i; memmove(queue->ops, op, queue->ops_count * sizeof(*op)); goto done; } - vkd3d_mutex_lock(&fence->mutex); d3d12_command_queue_wait_locked(queue, fence, op->u.wait.value); d3d12_fence_decref(fence); break;

1 0

Giovanni Mascellani : vkd3d: Use a dedicated mutex to protect the blocked queues.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 8e087b0f17870c2f9637d6bf5adde547442159fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e087b0f17870c2f9637d6bf5adde… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 8 15:06:21 2023 +0100 vkd3d: Use a dedicated mutex to protect the blocked queues. --- libs/vkd3d/command.c | 8 ++++---- libs/vkd3d/device.c | 3 +++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9cf35831..158d0d9f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -645,7 +645,7 @@ static HRESULT d3d12_device_add_blocked_command_queues(struct d3d12_device *devi if (count == 0) return S_OK; - vkd3d_mutex_lock(&device->mutex); + vkd3d_mutex_lock(&device->blocked_queues_mutex); if ((i = ARRAY_SIZE(device->blocked_queues) - device->blocked_queue_count) < count) { @@ -657,7 +657,7 @@ static HRESULT d3d12_device_add_blocked_command_queues(struct d3d12_device *devi for (i = 0; i < count; ++i) device->blocked_queues[device->blocked_queue_count++] = command_queues[i]; - vkd3d_mutex_unlock(&device->mutex); + vkd3d_mutex_unlock(&device->blocked_queues_mutex); return hr; } @@ -668,7 +668,7 @@ static HRESULT d3d12_device_flush_blocked_queues_once(struct d3d12_device *devic *flushed_any = false; - vkd3d_mutex_lock(&device->mutex); + vkd3d_mutex_lock(&device->blocked_queues_mutex); /* Flush any ops unblocked by a new pending value. These cannot be flushed * with the device locked, so move the queue pointers to a local array. */ @@ -676,7 +676,7 @@ static HRESULT d3d12_device_flush_blocked_queues_once(struct d3d12_device *devic memcpy(blocked_queues, device->blocked_queues, blocked_queue_count * sizeof(blocked_queues[0])); device->blocked_queue_count = 0; - vkd3d_mutex_unlock(&device->mutex); + vkd3d_mutex_unlock(&device->blocked_queues_mutex); i = 0; while (i < blocked_queue_count) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 21dd17ea..d81adc55 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2462,6 +2462,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_mutex_destroy(&device->blocked_queues_mutex); + vkd3d_private_store_destroy(&device->private_store); vkd3d_cleanup_format_info(device); @@ -4119,6 +4121,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, vkd3d_time_domains_init(device); device->blocked_queue_count = 0; + vkd3d_mutex_init(&device->blocked_queues_mutex); for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) vkd3d_mutex_init(&device->desc_mutex[i]); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9c7bed39..56677648 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1512,6 +1512,7 @@ struct d3d12_device unsigned int queue_family_count; VkTimeDomainEXT vk_host_time_domain; + struct vkd3d_mutex blocked_queues_mutex; struct d3d12_command_queue *blocked_queues[VKD3D_MAX_DEVICE_BLOCKED_QUEUES]; unsigned int blocked_queue_count;

1 0

Paul Gofman : mf/session: Avoid dropping samples delivered from transform in session_request_sample_from_node().
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 9070f0d572e36645f5e5764ef40472f158513d48 URL: https://gitlab.winehq.org/wine/wine/-/commit/9070f0d572e36645f5e5764ef40472… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 24 17:52:14 2023 -0600 mf/session: Avoid dropping samples delivered from transform in session_request_sample_from_node(). session_request_sample() calls session_request_sample_from_node() and increments sink.requests only if that succeeds. But session_request_sample_from_node() calls session_deliver_sample_to_node() synchronously for MF_TOPOLOGY_TRANSFORM_NODE if there are output samples available. Then, if sink.requests is zero before this session_request_sample() call that sample is silently dropped. --- dlls/mf/session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b2371763150..85baf07d05a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3388,8 +3388,9 @@ static void session_request_sample(struct media_session *session, IMFStreamSink return; } - if (SUCCEEDED(session_request_sample_from_node(session, upstream_node, upstream_output))) - sink_node->u.sink.requests++; + sink_node->u.sink.requests++; + if (FAILED(session_request_sample_from_node(session, upstream_node, upstream_output))) + sink_node->u.sink.requests--; IMFTopologyNode_Release(upstream_node); }

1 0

Dmitry Timoshkov : rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer().
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 4ec4bdff7365193f71806f7fc0c31c0cbf724a57 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ec4bdff7365193f71806f7fc0c31c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 13 20:57:18 2022 -0600 rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer(). --- 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

Dmitry Timoshkov : rpcrt4: Avoid casting an object to IUnknown.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 70a847248feb7008b994588574a4aff320af93c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/70a847248feb7008b994588574a4af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 13 20:59:19 2022 -0600 rpcrt4: Avoid casting an object to IUnknown. Cast its interface member to IUnknown instead. --- 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 b51ba41a45f..80400422e41 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -332,7 +332,7 @@ HRESULT StdProxy_Construct(REFIID riid, This = calloc(1, sizeof(StdProxyImpl)); if (!This) return E_OUTOFMEMORY; - if (!pUnkOuter) pUnkOuter = (IUnknown *)This; + if (!pUnkOuter) pUnkOuter = (IUnknown *)&This->IRpcProxyBuffer_iface; This->IRpcProxyBuffer_iface.lpVtbl = &StdProxy_Vtbl; This->PVtbl = vtbl->Vtbl; /* one reference for the proxy */

1 0

Eric Pouech : dbghelp: Fix failing test on Windows 7.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 452041927f73a9496157c5e973b40269a51d383d URL: https://gitlab.winehq.org/wine/wine/-/commit/452041927f73a9496157c5e973b402… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 10 09:31:19 2023 +0100 dbghelp: Fix failing test on Windows 7. Using old versions of the module information structure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54465 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 95 ++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 713c93b0a02..bcae5c1f875 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -193,35 +193,58 @@ static void test_search_path(void) static USHORT get_module_machine(const char* path) { - BOOL ret; HANDLE hFile, hMap; void* mapping; IMAGE_NT_HEADERS *nthdr; - USHORT machine; + USHORT machine = IMAGE_FILE_MACHINE_UNKNOWN; hFile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok(hFile != INVALID_HANDLE_VALUE, "Couldn't open file %s (%lu)\n", path, GetLastError()); - hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); - ok(hMap != NULL, "Couldn't create map (%lu)\n", GetLastError()); - mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); - ok(mapping != NULL, "Couldn't map (%lu)\n", GetLastError()); - nthdr = RtlImageNtHeader(mapping); - ok(nthdr != NULL, "Cannot get NT headers out of %s\n", path); - machine = nthdr ? nthdr->FileHeader.Machine : IMAGE_FILE_MACHINE_UNKNOWN; - ret = UnmapViewOfFile(mapping); - ok(ret, "Couldn't unmap (%lu)\n", GetLastError()); - CloseHandle(hMap); - CloseHandle(hFile); + if (hFile != INVALID_HANDLE_VALUE) + { + hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + if (hMap != NULL) + { + mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); + if (mapping != NULL) + { + nthdr = RtlImageNtHeader(mapping); + if (nthdr != NULL) machine = nthdr->FileHeader.Machine; + UnmapViewOfFile(mapping); + } + CloseHandle(hMap); + } + CloseHandle(hFile); + } return machine; } +static BOOL skip_too_old_dbghelp(HANDLE proc, DWORD64 base) +{ + IMAGEHLP_MODULE im0 = {sizeof(im0)}; + BOOL ret; + + /* test if get module info succeeds with oldest structure format */ + ret = SymGetModuleInfo(proc, base, &im0); + if (ret) + { + skip("Too old dbghelp. Skipping module tests.\n"); + ret = SymCleanup(proc); + ok(ret, "SymCleanup failed: %lu\n", GetLastError()); + return TRUE; + } + ok(ret, "SymGetModuleInfo failed: %lu\n", GetLastError()); + return FALSE; +} + static void test_modules(void) { BOOL ret; - DWORD attr; + char file_system[MAX_PATH]; + char file_wow64[MAX_PATH]; const DWORD64 base1 = 0x00010000; const DWORD64 base2 = 0x08010000; IMAGEHLP_MODULEW64 im; + USHORT machine_wow, machine2; im.SizeOfStruct = sizeof(im); @@ -231,48 +254,42 @@ static void test_modules(void) ret = SymInitialize(GetCurrentProcess(), 0, FALSE); ok(ret, "SymInitialize failed: %lu\n", GetLastError()); + GetSystemWow64DirectoryA(file_wow64, MAX_PATH); + strcat(file_wow64, "\\notepad.exe"); + /* not always present */ - attr = GetFileAttributesA("C:\\windows\\syswow64\\notepad.exe"); - if (attr != INVALID_FILE_ATTRIBUTES) + machine_wow = get_module_machine(file_wow64); + if (machine_wow != IMAGE_FILE_MACHINE_UNKNOWN) { - ret = SymLoadModule(GetCurrentProcess(), NULL, "C:\\windows\\syswow64\\notepad.exe", NULL, base2, 0); + ret = SymLoadModule(GetCurrentProcess(), NULL, file_wow64, NULL, base2, 0); ok(ret, "SymLoadModule failed: %lu\n", GetLastError()); ret = SymGetModuleInfoW64(GetCurrentProcess(), base2, &im); + if (!ret && skip_too_old_dbghelp(GetCurrentProcess(), base2)) return; ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base2, "Wrong base address\n"); - ok(im.MachineType == get_module_machine("C:\\windows\\syswow64\\notepad.exe"), - "Wrong machine %lx\n", im.MachineType); + ok(im.MachineType == machine_wow, "Wrong machine %lx (expecting %u)\n", im.MachineType, machine_wow); } - ret = SymLoadModule(GetCurrentProcess(), NULL, "C:\\windows\\system32\\notepad.exe", NULL, base1, 0); + GetSystemDirectoryA(file_system, MAX_PATH); + strcat(file_system, "\\notepad.exe"); + + ret = SymLoadModule(GetCurrentProcess(), NULL, file_system, NULL, base1, 0); ok(ret, "SymLoadModule failed: %lu\n", GetLastError()); ret = SymGetModuleInfoW64(GetCurrentProcess(), base1, &im); - /* we want to access IMAGEHLP_MODULE.MachineType, so ensure that error stems from a too old - * dbghelp (on Windows), not supporting new enlarged IMAGEHLP_MODULE structures. - */ - if (broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER)) - { - IMAGEHLP_MODULE im0 = {sizeof(im0)}; - ret = SymGetModuleInfo(GetCurrentProcess(), base1, &im0); - ok(ret, "Unexpected error: %lu\n", GetLastError()); - skip("Too old dbghelp. Skipping module tests\n"); - ret = SymCleanup(GetCurrentProcess()); - ok(ret, "SymCleanup failed: %lu\n", GetLastError()); - return; - } + if (!ret && skip_too_old_dbghelp(GetCurrentProcess(), base1)) return; ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base1, "Wrong base address\n"); - ok(im.MachineType == get_module_machine("C:\\windows\\system32\\notepad.exe"), - "Wrong machine %lx\n", im.MachineType); + machine2 = get_module_machine(file_system); + ok(machine2 != IMAGE_FILE_MACHINE_UNKNOWN, "Unexpected machine %u\n", machine2); + ok(im.MachineType == machine2, "Wrong machine %lx (expecting %u)\n", im.MachineType, machine2); /* still can access first module after loading second */ - if (attr != INVALID_FILE_ATTRIBUTES) + if (machine_wow != IMAGE_FILE_MACHINE_UNKNOWN) { ret = SymGetModuleInfoW64(GetCurrentProcess(), base2, &im); ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base2, "Wrong base address\n"); - ok(im.MachineType == get_module_machine("C:\\windows\\syswow64\\notepad.exe"), - "Wrong machine %lx\n", im.MachineType); + ok(im.MachineType == machine_wow, "Wrong machine %lx (expecting %u)\n", im.MachineType, machine_wow); } ret = SymCleanup(GetCurrentProcess());

1 0