- Wine-Commits - list.winehq.org

Alex Henrie : ws2_32: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 8630a0c84d7d74a433685538f91c299d2125c765 URL: https://gitlab.winehq.org/wine/wine/-/commit/8630a0c84d7d74a433685538f91c29… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:54:07 2023 -0700 ws2_32: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/ws2_32/socket.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2a8fcf01ed8..5eb926a408b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3823,7 +3823,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, { struct afd_create_params create_params; OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; + UNICODE_STRING string = RTL_CONSTANT_STRING(L"\\Device\\Afd"); IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle; @@ -3901,7 +3901,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } - RtlInitUnicodeString(&string, L"\\Device\\Afd"); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT)))

1 0

Alex Henrie : win32u: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 33ddf019f7cb13f05aaeec984f3b9f3ca3411da9 URL: https://gitlab.winehq.org/wine/wine/-/commit/33ddf019f7cb13f05aaeec984f3b9f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:52:28 2023 -0700 win32u: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/win32u/imm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 54e1ef3662a..513f116f80f 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -277,12 +277,11 @@ BOOL register_imm_window( HWND hwnd ) /* Create default IME window */ if (!thread_data->window_cnt++) { - UNICODE_STRING class_name, name; static const WCHAR imeW[] = {'I','M','E',0}; static const WCHAR default_imeW[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; + UNICODE_STRING class_name = RTL_CONSTANT_STRING( imeW ); + UNICODE_STRING name = RTL_CONSTANT_STRING( default_imeW ); - RtlInitUnicodeString( &class_name, imeW ); - RtlInitUnicodeString( &name, default_imeW ); thread_data->default_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, &name, WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, FALSE );

1 0

Alex Henrie : mountmgr: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 3549ae75dd3761cea63bdf843b632ef60599890f URL: https://gitlab.winehq.org/wine/wine/-/commit/3549ae75dd3761cea63bdf843b632e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 11 12:47:54 2023 -0700 mountmgr: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/mountmgr.sys/mountmgr.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 9f72eedb33b..ec22a8eb9bc 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -618,7 +618,11 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) #ifdef _WIN64 HKEY wow64_ports_key = NULL; #endif - UNICODE_STRING nameW, linkW; + UNICODE_STRING device_mount_point_manager = RTL_CONSTANT_STRING( L"\\Device\\MountPointManager" ); + UNICODE_STRING object_mount_point_manager = RTL_CONSTANT_STRING( L"\\??\\MountPointManager" ); + UNICODE_STRING driver_harddisk = RTL_CONSTANT_STRING( L"\\Driver\\Harddisk" ); + UNICODE_STRING driver_serial = RTL_CONSTANT_STRING( L"\\Driver\\Serial" ); + UNICODE_STRING driver_parallel = RTL_CONSTANT_STRING( L"\\Driver\\Parallel" ); DEVICE_OBJECT *device; HKEY devicemap_key; NTSTATUS status; @@ -631,10 +635,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl; - RtlInitUnicodeString( &nameW, L"\\Device\\MountPointManager" ); - RtlInitUnicodeString( &linkW, L"\\??\\MountPointManager" ); - if (!(status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) - status = IoCreateSymbolicLink( &linkW, &nameW ); + if (!(status = IoCreateDevice( driver, 0, &device_mount_point_manager, 0, 0, FALSE, &device ))) + status = IoCreateSymbolicLink( &object_mount_point_manager, &device_mount_point_manager ); if (status) { FIXME( "failed to create device error %lx\n", status ); @@ -648,8 +650,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) KEY_ALL_ACCESS, NULL, &devicemap_key, NULL )) RegCloseKey( devicemap_key ); - RtlInitUnicodeString( &nameW, L"\\Driver\\Harddisk" ); - status = IoCreateDriver( &nameW, harddisk_driver_entry ); + status = IoCreateDriver( &driver_harddisk, harddisk_driver_entry ); thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL ); CloseHandle( CreateThread( NULL, 0, run_loop_thread, thread, 0, NULL )); @@ -664,11 +665,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RegCloseKey( wow64_ports_key ); #endif - RtlInitUnicodeString( &nameW, L"\\Driver\\Serial" ); - IoCreateDriver( &nameW, serial_driver_entry ); - - RtlInitUnicodeString( &nameW, L"\\Driver\\Parallel" ); - IoCreateDriver( &nameW, parallel_driver_entry ); + IoCreateDriver( &driver_serial, serial_driver_entry ); + IoCreateDriver( &driver_parallel, parallel_driver_entry ); return status; }

1 0

Connor McAdams : uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Pattern GUIDs.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

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

Connor McAdams : uiautomationcore: Implement UiaLookupId for AutomationIdentifierType_Event GUIDs.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

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 Feb. 13, 2023

Feb. 13, 2023

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 : include: Fully define uiautomationclient interfaces.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: f02ee34d3ae09be8fa12cf6a04d4200d65bf032d URL: https://gitlab.winehq.org/wine/wine/-/commit/f02ee34d3ae09be8fa12cf6a04d420… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Dec 13 12:59:48 2022 -0500 include: Fully define uiautomationclient interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationclient.idl | 730 ++++++++++++++++++++++++++++++++++++++--- include/uiautomationcore.idl | 92 ++++++ 2 files changed, 782 insertions(+), 40 deletions(-)

1 0

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

Feb. 13, 2023

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 Feb. 13, 2023

Feb. 13, 2023

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

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

Feb. 13, 2023

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