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

Jacek Caban : winevulkan: Move wine_vk_init to loader.c.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: cc3c23c312f55a01316575474515234bfb5f9a69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc3c23c312f55a0131657547… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 14 17:58:45 2021 +0200 winevulkan: Move wine_vk_init to loader.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 67 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 53 ++++--------------------------- dlls/winevulkan/vulkan_private.h | 8 +++++ 3 files changed, 81 insertions(+), 47 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 0966e2d9468..746a25041d0 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -206,6 +206,73 @@ VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supporte return VK_SUCCESS; } +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) +{ + const struct vulkan_funcs *driver; + HDC hdc; + + hdc = GetDC(0); + driver = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); + if (!driver) + ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); + else + unix_vk_init(driver); + + return driver != NULL; +} + +static BOOL wine_vk_init_once(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + return InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); +} + +VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkInstance *instance) +{ + TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); + + if(!wine_vk_init_once()) + return VK_ERROR_INITIALIZATION_FAILED; + + return unix_vkCreateInstance(create_info, allocator, instance); +} + +VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, + uint32_t *count, VkExtensionProperties *properties) +{ + TRACE("%p, %p, %p\n", layer_name, count, properties); + + if (layer_name) + { + WARN("Layer enumeration not supported from ICD.\n"); + return VK_ERROR_LAYER_NOT_PRESENT; + } + + if (!wine_vk_init_once()) + { + *count = 0; + return VK_SUCCESS; + } + + return unix_vkEnumerateInstanceExtensionProperties(layer_name, count, properties); +} + +VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) +{ + TRACE("%p\n", version); + + if (!wine_vk_init_once()) + { + *version = VK_API_VERSION_1_0; + return VK_SUCCESS; + } + + return unix_vkEnumerateInstanceVersion(version); +} + static HANDLE get_display_device_init_mutex(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index fbcbe4721a3..b186e425edb 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -450,26 +450,10 @@ static void wine_vk_device_free(struct VkDevice_T *device) free(device); } -static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) +void unix_vk_init(const struct vulkan_funcs *driver) { - HDC hdc; - - hdc = GetDC(0); - vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); - ReleaseDC(0, hdc); - if (!vk_funcs) - ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - else - p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); - - return TRUE; -} - -static void wine_vk_init_once(void) -{ - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - - InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); + vk_funcs = driver; + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); } /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. @@ -845,7 +829,7 @@ fail: return res; } -VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, +VkResult WINAPI unix_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { VkInstanceCreateInfo create_info_host; @@ -853,12 +837,6 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, struct VkInstance_T *object; VkResult res; - TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); - - wine_vk_init_once(); - if (!vk_funcs) - return VK_ERROR_INITIALIZATION_FAILED; - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -975,7 +953,7 @@ VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_ return *count < phys_dev->extension_count ? VK_INCOMPLETE : VK_SUCCESS; } -VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, +VkResult WINAPI unix_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { uint32_t num_properties = 0, num_host_properties; @@ -983,21 +961,6 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na unsigned int i, j; VkResult res; - TRACE("%p, %p, %p\n", layer_name, count, properties); - - if (layer_name) - { - WARN("Layer enumeration not supported from ICD.\n"); - return VK_ERROR_LAYER_NOT_PRESENT; - } - - wine_vk_init_once(); - if (!vk_funcs) - { - *count = 0; - return VK_SUCCESS; - } - res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) return res; @@ -1055,14 +1018,10 @@ VkResult WINAPI wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice phys_dev, return VK_SUCCESS; } -VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) +VkResult WINAPI unix_vkEnumerateInstanceVersion(uint32_t *version) { VkResult res; - TRACE("%p\n", version); - - wine_vk_init_once(); - if (p_vkEnumerateInstanceVersion) { res = p_vkEnumerateInstanceVersion(version); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 6574d282eea..1a44edb3c26 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -243,4 +243,12 @@ BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; +void unix_vk_init(const struct vulkan_funcs *driver) DECLSPEC_HIDDEN; + +VkResult WINAPI unix_vkCreateInstance(const VkInstanceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkInstance *instance) DECLSPEC_HIDDEN; +VkResult WINAPI unix_vkEnumerateInstanceExtensionProperties(const char *layer_name, + uint32_t *count, VkExtensionProperties *properties) DECLSPEC_HIDDEN; +VkResult WINAPI unix_vkEnumerateInstanceVersion(uint32_t *version) DECLSPEC_HIDDEN; + #endif /* __WINE_VULKAN_PRIVATE_H */

1 0

Georg Lehmann : winevulkan: Fix queue creation with mixed queue flags.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 62cb6ace2cfe46358e6526868145a5bd8a7f990b URL: https://source.winehq.org/git/wine.git/?a=commit;h=62cb6ace2cfe46358e652686… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Apr 14 00:31:25 2021 +0200 winevulkan: Fix queue creation with mixed queue flags. The Vulkan spec says: The queueFamilyIndex member of each element of pQueueCreateInfos must be unique within pQueueCreateInfos, except that two members can share the same queueFamilyIndex if one is a protected-capable queue and one is not a protected-capable queue. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 84 +++++++++++++++++++++++----------------- dlls/winevulkan/vulkan_private.h | 6 ++- 2 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b186e425edb..9c322d75c76 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -310,25 +310,21 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, } } -static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, - uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) +static void wine_vk_device_get_queues(struct VkDevice_T *device, + uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags, + struct VkQueue_T* queues) { VkDeviceQueueInfo2 queue_info; - struct VkQueue_T *queues; unsigned int i; - if (!(queues = calloc(queue_count, sizeof(*queues)))) - { - ERR("Failed to allocate memory for queues\n"); - return NULL; - } - for (i = 0; i < queue_count; i++) { struct VkQueue_T *queue = &queues[i]; queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; queue->device = device; + queue->family_index = family_index; + queue->queue_index = i; queue->flags = flags; /* The Vulkan spec says: @@ -352,8 +348,6 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, WINE_VK_ADD_DISPATCHABLE_MAPPING(device->phys_dev->instance, queue, queue->queue); } - - return queues; } static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) @@ -425,17 +419,19 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src */ static void wine_vk_device_free(struct VkDevice_T *device) { + struct VkQueue_T *queue; + if (!device) return; if (device->queues) { unsigned int i; - for (i = 0; i < device->max_queue_families; i++) + for (i = 0; i < device->queue_count; i++) { - if (device->queues[i] && device->queues[i]->queue) - WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device->queues[i]); - free(device->queues[i]); + queue = &device->queues[i]; + if (queue && queue->queue) + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, queue); } free(device->queues); device->queues = NULL; @@ -736,7 +732,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkAllocationCallbacks *allocator, VkDevice *device) { VkDeviceCreateInfo create_info_host; - uint32_t max_queue_families; + struct VkQueue_T *next_queue; struct VkDevice_T *object; unsigned int i; VkResult res; @@ -791,17 +787,18 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, /* We need to cache all queues within the device as each requires wrapping since queues are * dispatchable objects. */ - phys_dev->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(phys_dev->phys_dev, - &max_queue_families, NULL); - object->max_queue_families = max_queue_families; - TRACE("Max queue families: %u.\n", object->max_queue_families); + for (i = 0; i < create_info_host.queueCreateInfoCount; i++) + { + object->queue_count += create_info_host.pQueueCreateInfos[i].queueCount; + } - if (!(object->queues = calloc(max_queue_families, sizeof(*object->queues)))) + if (!(object->queues = calloc(object->queue_count, sizeof(*object->queues)))) { res = VK_ERROR_OUT_OF_HOST_MEMORY; goto fail; } + next_queue = object->queues; for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { uint32_t flags = create_info_host.pQueueCreateInfos[i].flags; @@ -810,12 +807,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, TRACE("Queue family index %u, queue count %u.\n", family_index, queue_count); - if (!(object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count, flags))) - { - ERR("Failed to allocate memory for queues.\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto fail; - } + wine_vk_device_get_queues(object, family_index, queue_count, flags, next_queue); + next_queue += queue_count; } object->quirks = phys_dev->instance->quirks; @@ -1071,17 +1064,42 @@ void WINAPI wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool pool_handle wine_vk_free_command_buffers(device, pool, count, buffers); } +static VkQueue wine_vk_device_find_queue(VkDevice device, const VkDeviceQueueInfo2 *info) +{ + struct VkQueue_T* queue; + uint32_t i; + + for (i = 0; i < device->queue_count; i++) + { + queue = &device->queues[i]; + if (queue->family_index == info->queueFamilyIndex + && queue->queue_index == info->queueIndex + && queue->flags == info->flags) + { + return queue; + } + } + + return VK_NULL_HANDLE; +} + void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, uint32_t queue_index, VkQueue *queue) { + VkDeviceQueueInfo2 queue_info; TRACE("%p, %u, %u, %p\n", device, family_index, queue_index, queue); - *queue = &device->queues[family_index][queue_index]; + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2; + queue_info.pNext = NULL; + queue_info.flags = 0; + queue_info.queueFamilyIndex = family_index; + queue_info.queueIndex = queue_index; + + *queue = wine_vk_device_find_queue(device, &queue_info); } void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) { - struct VkQueue_T *matching_queue; const VkBaseInStructure *chain; TRACE("%p, %p, %p\n", device, info, queue); @@ -1089,13 +1107,7 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in if ((chain = info->pNext)) FIXME("Ignoring a linked structure of type %u.\n", chain->sType); - matching_queue = &device->queues[info->queueFamilyIndex][info->queueIndex]; - if (matching_queue->flags != info->flags) - { - WARN("No matching flags were specified %#x, %#x.\n", matching_queue->flags, info->flags); - matching_queue = VK_NULL_HANDLE; - } - *queue = matching_queue; + *queue = wine_vk_device_find_queue(device, info); } VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 1a44edb3c26..3f710a16a7b 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -89,8 +89,8 @@ struct VkDevice_T struct VkPhysicalDevice_T *phys_dev; /* parent */ VkDevice device; /* native device */ - struct VkQueue_T **queues; - uint32_t max_queue_families; + struct VkQueue_T* queues; + uint32_t queue_count; unsigned int quirks; @@ -155,6 +155,8 @@ struct VkQueue_T struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ + uint32_t family_index; + uint32_t queue_index; VkDeviceQueueCreateFlags flags; struct wine_vk_mapping mapping;

1 0

Rémi Bernon : user32/tests: Add more SendInput tests.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 2f8da3c12adcd29f69d568c4fbba37ddfecbded6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f8da3c12adcd29f69d568c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 9 13:11:31 2021 +0200 user32/tests: Add more SendInput tests. Validating that SendInput with INPUT_HARDWARE type should be no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 18 ++++++++ dlls/user32/tests/input.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8992c463c48..22e53585f00 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -182,6 +182,24 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) UINT i; NTSTATUS status; + if (size != sizeof(INPUT)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + if (!count) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + if (!inputs) + { + SetLastError( ERROR_NOACCESS ); + return 0; + } + for (i = 0; i < count; i++) { if (inputs[i].type == INPUT_MOUSE) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 646a9a66eb5..0bbd03c615e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4212,6 +4212,118 @@ static void test_UnregisterDeviceNotification(void) ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); } +static void test_SendInput(void) +{ + INPUT input[16]; + UINT res, i; + HWND hwnd; + MSG msg; + + hwnd = CreateWindowW( L"static", L"test", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, 0, 0 ); + ok( hwnd != 0, "CreateWindowW failed\n" ); + + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + SetForegroundWindow( hwnd ); + SetFocus( hwnd ); + empty_message_queue(); + + SetLastError( 0xdeadbeef ); + res = SendInput( 0, NULL, 0 ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 1, NULL, 0 ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 1, NULL, sizeof(*input) ); + ok( res == 0 && (GetLastError() == ERROR_NOACCESS || GetLastError() == ERROR_INVALID_PARAMETER), + "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 0, input, sizeof(*input) ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 0, NULL, sizeof(*input) ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + + memset( input, 0, sizeof(input) ); + SetLastError( 0xdeadbeef ); + res = SendInput( 1, input, sizeof(*input) ); + ok( res == 1 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 16, input, sizeof(*input) ); + ok( res == 16 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError() ); + + SetLastError( 0xdeadbeef ); + res = SendInput( 1, input, 0 ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 1, input, sizeof(*input) + 1 ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 1, input, sizeof(*input) - 1 ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + + for (i = 0; i < ARRAY_SIZE(input); ++i) input[i].type = INPUT_KEYBOARD; + SetLastError( 0xdeadbeef ); + res = SendInput( 16, input, offsetof( INPUT, ki ) + sizeof(KEYBDINPUT) ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + SetLastError( 0xdeadbeef ); + res = SendInput( 16, input, sizeof(*input) ); + ok( res == 16 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError() ); + empty_message_queue(); + + for (i = 0; i < ARRAY_SIZE(input); ++i) input[i].type = INPUT_HARDWARE; + SetLastError( 0xdeadbeef ); + res = SendInput( 16, input, offsetof( INPUT, hi ) + sizeof(HARDWAREINPUT) ); + ok( res == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "SendInput returned %u, error %#x\n", res, GetLastError() ); + + input[0].hi.uMsg = WM_KEYDOWN; + input[0].hi.wParamL = 0; + input[0].hi.wParamH = 'A'; + input[1].hi.uMsg = WM_KEYUP; + input[1].hi.wParamL = 0; + input[1].hi.wParamH = 'A' | 0xc000; + SetLastError( 0xdeadbeef ); + res = SendInput( 16, input, sizeof(*input) ); + todo_wine + ok( (res == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) || + broken(res == 16 && GetLastError() == 0xdeadbeef) /* 32bit */, + "SendInput returned %u, error %#x\n", res, GetLastError() ); + while ((res = wait_for_message(&msg)) && msg.message == WM_TIMER) DispatchMessageA(&msg); + todo_wine ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); + empty_message_queue(); + + memset( input, 0, sizeof(input) ); + input[0].type = INPUT_HARDWARE; + input[1].type = INPUT_KEYBOARD; + input[1].ki.wVk = 'A'; + input[1].ki.dwFlags = 0; + input[2].type = INPUT_KEYBOARD; + input[2].ki.wVk = 'A'; + input[2].ki.dwFlags = KEYEVENTF_KEYUP; + SetLastError( 0xdeadbeef ); + res = SendInput( 16, input, sizeof(*input) ); + todo_wine + ok( (res == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) || + broken(res == 16 && GetLastError() == 0xdeadbeef), + "SendInput returned %u, error %#x\n", res, GetLastError() ); + while ((res = wait_for_message(&msg)) && (msg.message == WM_TIMER || broken(msg.message == WM_KEYDOWN || msg.message == WM_KEYUP))) + DispatchMessageA(&msg); + todo_wine ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); + empty_message_queue(); + + for (i = 0; i < ARRAY_SIZE(input); ++i) input[i].type = INPUT_HARDWARE + 1; + SetLastError( 0xdeadbeef ); + res = SendInput( 16, input, sizeof(*input) ); + todo_wine ok( res == 16 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError() ); + while ((res = wait_for_message(&msg)) && msg.message == WM_TIMER) DispatchMessageA(&msg); + todo_wine ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); + empty_message_queue(); + + trace( "done\n" ); + DestroyWindow( hwnd ); +} + START_TEST(input) { char **argv; @@ -4234,6 +4346,7 @@ START_TEST(input) return; } + test_SendInput(); test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode();

1 0

Rémi Bernon : user32: Implement SendInput INPUT_HARDWARE check.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 092c7a09a5afde3f11b71b1816388e80d062e8ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=092c7a09a5afde3f11b71b18… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 9 13:11:32 2021 +0200 user32: Implement SendInput INPUT_HARDWARE check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 14 ++++++++++---- dlls/user32/tests/input.c | 10 ++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 22e53585f00..7cf7e53a6c8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -180,7 +180,7 @@ static void update_mouse_coords( INPUT *input ) UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) { UINT i; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; if (size != sizeof(INPUT)) { @@ -202,14 +202,20 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) for (i = 0; i < count; i++) { - if (inputs[i].type == INPUT_MOUSE) + INPUT input = inputs[i]; + switch (input.type) { + case INPUT_MOUSE: /* we need to update the coordinates to what the server expects */ - INPUT input = inputs[i]; update_mouse_coords( &input ); + /* fallthrough */ + case INPUT_KEYBOARD: status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ); + break; + case INPUT_HARDWARE: + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; } - else status = send_hardware_message( 0, &inputs[i], SEND_HWMSG_INJECTED ); if (status) { diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0bbd03c615e..2397b4104e4 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4285,12 +4285,11 @@ static void test_SendInput(void) input[1].hi.wParamH = 'A' | 0xc000; SetLastError( 0xdeadbeef ); res = SendInput( 16, input, sizeof(*input) ); - todo_wine ok( (res == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) || broken(res == 16 && GetLastError() == 0xdeadbeef) /* 32bit */, "SendInput returned %u, error %#x\n", res, GetLastError() ); while ((res = wait_for_message(&msg)) && msg.message == WM_TIMER) DispatchMessageA(&msg); - todo_wine ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); + ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); empty_message_queue(); memset( input, 0, sizeof(input) ); @@ -4303,21 +4302,20 @@ static void test_SendInput(void) input[2].ki.dwFlags = KEYEVENTF_KEYUP; SetLastError( 0xdeadbeef ); res = SendInput( 16, input, sizeof(*input) ); - todo_wine ok( (res == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) || broken(res == 16 && GetLastError() == 0xdeadbeef), "SendInput returned %u, error %#x\n", res, GetLastError() ); while ((res = wait_for_message(&msg)) && (msg.message == WM_TIMER || broken(msg.message == WM_KEYDOWN || msg.message == WM_KEYUP))) DispatchMessageA(&msg); - todo_wine ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); + ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); empty_message_queue(); for (i = 0; i < ARRAY_SIZE(input); ++i) input[i].type = INPUT_HARDWARE + 1; SetLastError( 0xdeadbeef ); res = SendInput( 16, input, sizeof(*input) ); - todo_wine ok( res == 16 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError() ); + ok( res == 16 && GetLastError() == 0xdeadbeef, "SendInput returned %u, error %#x\n", res, GetLastError() ); while ((res = wait_for_message(&msg)) && msg.message == WM_TIMER) DispatchMessageA(&msg); - todo_wine ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); + ok( !res, "SendInput triggered unexpected message %#x\n", msg.message ); empty_message_queue(); trace( "done\n" );

1 0

Hans Leidekker : wldap32: Move support for control functions to the Unix library.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 5bf1900dd0927bf0e4b85586241b1b297969bb15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf1900dd0927bf0e4b85586… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:29 2021 +0200 wldap32: Move support for control functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 150 +++++++++++++++++++------------------------------ dlls/wldap32/libldap.c | 18 ++++++ dlls/wldap32/libldap.h | 6 ++ 3 files changed, 81 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bf1900dd0927bf0e4b8…

1 0

Alexandre Julliard : ntdll: Allow a second backslash after the drive letter.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 060b28b9bafd5e0b344c847bc91e50140fbcfacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=060b28b9bafd5e0b344c847b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 11:46:46 2021 +0200 ntdll: Allow a second backslash after the drive letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 27 +++++++++++++++------------ dlls/ntdll/unix/file.c | 6 ++++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9b6eecbfbbe..f2588c0bd98 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -622,15 +622,16 @@ static void test_RtlDosPathNameToNtPathName_U(void) static void test_nt_names(void) { - static const struct { const WCHAR *root, *name; NTSTATUS expect; BOOL todo; } tests[] = + static const struct { const WCHAR *root, *name; NTSTATUS expect, broken; BOOL todo; } tests[] = { { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll", STATUS_SUCCESS }, - { NULL, L"\\??\\C:\\\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { NULL, L"\\??\\C:\\\\windows\\system32\\", STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\windows\\system32\\", STATUS_FILE_IS_A_DIRECTORY }, + { NULL, L"\\??\\C:\\\\\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, { NULL, L"\\??\\C:\\windows\\\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { NULL, L"\\??\\C:\\windows\\system32\\.\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\windows\\system32\\.\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\..\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { NULL, L"\\??\\C:\\.\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\.\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll ", STATUS_OBJECT_NAME_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll..", STATUS_OBJECT_NAME_NOT_FOUND }, { NULL, L"\\??\\C:\\windows \\system32 \\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, @@ -642,12 +643,12 @@ static void test_nt_names(void) { NULL, L"/??\\C:\\windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_SYNTAX_BAD }, { NULL, L"\\??" L"/C:\\windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:/windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, - { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, TRUE }, - { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, { NULL, L"\\??\\C:\\windows\\sys\001", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\", NULL, STATUS_SUCCESS }, - { L"\\??\\C:\\\\", NULL, STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\\\", NULL, STATUS_SUCCESS, STATUS_OBJECT_NAME_INVALID }, { L"/??\\C:\\", NULL, STATUS_OBJECT_PATH_SYNTAX_BAD }, { L"\\??\\C:/", NULL, STATUS_OBJECT_NAME_NOT_FOUND }, { L"\\??" L"/C:", NULL, STATUS_OBJECT_NAME_NOT_FOUND }, @@ -659,14 +660,15 @@ static void test_nt_names(void) { L"\\??\\C:\\windows\\..", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\..\\", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS }, + { L"\\??\\C:\\\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS }, { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll", STATUS_SUCCESS }, { L"\\??\\C:\\windows\\", L"system32\\", STATUS_FILE_IS_A_DIRECTORY }, - { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, TRUE }, - { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, { L"\\??\\C:\\windows\\", L"\\system32\\kernel32.dll", STATUS_INVALID_PARAMETER }, { L"\\??\\C:\\windows\\", L"/system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { L"\\??\\C:\\windows\\", L".\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\windows\\", L".\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, { L"\\??\\C:\\windows\\", L"..\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L".", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L"..", STATUS_OBJECT_NAME_INVALID }, @@ -703,7 +705,8 @@ static void test_nt_names(void) if (attr.RootDirectory) NtClose( attr.RootDirectory ); if (handle) NtClose( handle ); todo_wine_if( tests[i].todo ) - ok( status == tests[i].expect, "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + ok( status == tests[i].expect || broken( tests[i].broken && status == tests[i].broken ), + "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); } } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 166ee85ebb7..b87da541f1d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3372,8 +3372,10 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret } } - name += prefix_len + 1; - name_len -= prefix_len + 1; + prefix_len++; /* skip initial backslash */ + if (name_len > prefix_len && name[prefix_len] == '\\') prefix_len++; /* allow a second backslash */ + name += prefix_len; + name_len -= prefix_len; status = lookup_unix_name( name, name_len, &unix_name, unix_len, pos, disposition, is_unix ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE)

1 0

Alexandre Julliard : ntdll: Move nt_to_unix_file_name_attr() to avoid forward declarations.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 90024e492dcefd204c6c953a804c0d51544db5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90024e492dcefd204c6c953a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 16:19:50 2021 +0200 ntdll: Move nt_to_unix_file_name_attr() to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 126 ++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b87da541f1d..45c220a1d63 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3216,69 +3216,6 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer } -/****************************************************************************** - * nt_to_unix_file_name_attr - */ -static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char **name_ret, - UNICODE_STRING *nt_name, UINT disposition ) -{ - enum server_fd_type type; - int old_cwd, root_fd, needs_close; - const WCHAR *name; - char *unix_name; - int name_len, unix_len; - NTSTATUS status; - - if (!attr->RootDirectory) /* without root dir fall back to normal lookup */ - return nt_to_unix_file_name( attr->ObjectName, name_ret, nt_name, disposition ); - - name = attr->ObjectName->Buffer; - name_len = attr->ObjectName->Length / sizeof(WCHAR); - - if (name_len && name[0] == '\\') return STATUS_INVALID_PARAMETER; - - unix_len = name_len * 3 + MAX_DIR_ENTRY_LEN + 3; - if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; - unix_name[0] = '.'; - - if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) - { - if (type != FD_TYPE_DIR) - { - if (needs_close) close( root_fd ); - status = STATUS_BAD_DEVICE_TYPE; - } - else - { - mutex_lock( &dir_mutex ); - if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) - { - status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE ); - if (fchdir( old_cwd ) == -1) chdir( "/" ); - } - else status = errno_to_status( errno ); - mutex_unlock( &dir_mutex ); - if (old_cwd != -1) close( old_cwd ); - if (needs_close) close( root_fd ); - } - } - else if (status == STATUS_OBJECT_TYPE_MISMATCH) status = STATUS_BAD_DEVICE_TYPE; - - if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) - { - TRACE( "%s -> %s\n", debugstr_us(attr->ObjectName), debugstr_a(unix_name) ); - *name_ret = unix_name; - if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); - } - else - { - TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); - free( unix_name ); - } - return status; -} - - /****************************************************************************** * nt_to_unix_file_name * @@ -3393,6 +3330,69 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret } +/****************************************************************************** + * nt_to_unix_file_name_attr + */ +static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char **name_ret, + UNICODE_STRING *nt_name, UINT disposition ) +{ + enum server_fd_type type; + int old_cwd, root_fd, needs_close; + const WCHAR *name; + char *unix_name; + int name_len, unix_len; + NTSTATUS status; + + if (!attr->RootDirectory) /* without root dir fall back to normal lookup */ + return nt_to_unix_file_name( attr->ObjectName, name_ret, nt_name, disposition ); + + name = attr->ObjectName->Buffer; + name_len = attr->ObjectName->Length / sizeof(WCHAR); + + if (name_len && name[0] == '\\') return STATUS_INVALID_PARAMETER; + + unix_len = name_len * 3 + MAX_DIR_ENTRY_LEN + 3; + if (!(unix_name = malloc( unix_len ))) return STATUS_NO_MEMORY; + unix_name[0] = '.'; + + if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) + { + if (type != FD_TYPE_DIR) + { + if (needs_close) close( root_fd ); + status = STATUS_BAD_DEVICE_TYPE; + } + else + { + mutex_lock( &dir_mutex ); + if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) + { + status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE ); + if (fchdir( old_cwd ) == -1) chdir( "/" ); + } + else status = errno_to_status( errno ); + mutex_unlock( &dir_mutex ); + if (old_cwd != -1) close( old_cwd ); + if (needs_close) close( root_fd ); + } + } + else if (status == STATUS_OBJECT_TYPE_MISMATCH) status = STATUS_BAD_DEVICE_TYPE; + + if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) + { + TRACE( "%s -> %s\n", debugstr_us(attr->ObjectName), debugstr_a(unix_name) ); + *name_ret = unix_name; + if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); + } + else + { + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); + free( unix_name ); + } + return status; +} + + /****************************************************************************** * wine_nt_to_unix_file_name *

1 0

Alexandre Julliard : ntdll: Always pass object attributes to nt_to_unix_file_name().
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 35cd4115474db86f06ada73708765a4eb79b447a URL: https://source.winehq.org/git/wine.git/?a=commit;h=35cd4115474db86f06ada737… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 16:26:54 2021 +0200 ntdll: Always pass object attributes to nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 42 ++++++++++++++++------------- dlls/ntdll/unix/loader.c | 6 +++-- dlls/ntdll/unix/process.c | 61 +++++++++++++++++++++--------------------- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 58 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35cd4115474db86f06ad…

1 0

Zebediah Figura : wined3d: Issue queries through wined3d_device_context_ops.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 0bf689352be8a5ff74ea9b0748603ebcc7ce93c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf689352be8a5ff74ea9b07… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:23 2021 -0500 wined3d: Issue queries through wined3d_device_context_ops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +++++++--- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bb11851c1be..ae4d97873a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2213,16 +2213,18 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) InterlockedIncrement(&query->counter_retrieved); } -void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) +static void wined3d_cs_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_query_issue *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_QUERY_ISSUE; op->query = query; op->flags = flags; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = FALSE; } @@ -2796,6 +2798,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_st_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_issue_query, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2919,6 +2922,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_issue_query, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1ef83891ddf..ed66794c757 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -507,7 +507,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) if (flags & WINED3DISSUE_END) ++query->counter_main; - wined3d_cs_emit_query_issue(query->device->cs, query, flags); + query->device->cs->c.ops->issue_query(&query->device->cs->c, query, flags); if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d5f4765f57..0af1258e355 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4692,6 +4692,7 @@ struct wined3d_device_context_ops unsigned int flags); HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx); + void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); }; struct wined3d_device_context @@ -4737,7 +4738,6 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_issue_query().
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: effa2a7411701818ac4812e3c67b19520a628e7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=effa2a7411701818ac4812e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:24 2021 -0500 wined3d: Introduce wined3d_device_context_issue_query(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++++++++ dlls/wined3d/query.c | 10 +--------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9240bad9d27..2e129513501 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5324,6 +5324,22 @@ HRESULT CDECL wined3d_device_context_unmap(struct wined3d_device_context *contex return context->ops->unmap(context, resource, sub_resource_idx); } +void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags) +{ + TRACE("context %p, query %p, flags %#x.\n", context, query, flags); + + if (flags & WINED3DISSUE_END) + ++query->counter_main; + + query->device->cs->c.ops->issue_query(context, query, flags); + + if (flags & WINED3DISSUE_BEGIN) + query->state = QUERY_BUILDING; + else + query->state = QUERY_SIGNALLED; +} + struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ed66794c757..610a37b9269 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -504,15 +504,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - if (flags & WINED3DISSUE_END) - ++query->counter_main; - - query->device->cs->c.ops->issue_query(&query->device->cs->c, query, flags); - - if (flags & WINED3DISSUE_BEGIN) - query->state = QUERY_BUILDING; - else - query->state = QUERY_SIGNALLED; + wined3d_device_context_issue_query(&query->device->cs->c, query, flags); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7c81eff1593..1de62071aa0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e0a205f3dad..0b3120017c5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2566,6 +2566,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset, bool indexed); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags);

1 0