March 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : winex11: Introduce a new get_vulkan_physical_device helper.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 3686a04cddde8a2c47f51a0fc87ddbbedfe9829b URL: https://gitlab.winehq.org/wine/wine/-/commit/3686a04cddde8a2c47f51a0fc87ddb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 14 10:02:57 2024 +0100 winex11: Introduce a new get_vulkan_physical_device helper. --- dlls/winex11.drv/x11drv_main.c | 98 ++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index d75f84fadb6..b3d83c9a884 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1022,15 +1022,49 @@ static BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid ) return FALSE; } +static VkPhysicalDevice get_vulkan_physical_device( const GUID *uuid ) +{ + VkPhysicalDevice *devices, device; + UINT device_count, i; + VkResult vr; + + if ((vr = pvkEnumeratePhysicalDevices( d3dkmt_vk_instance, &device_count, NULL ))) + { + WARN( "vkEnumeratePhysicalDevices returned %d\n", vr ); + return VK_NULL_HANDLE; + } + + if (!device_count || !(devices = malloc( device_count * sizeof(*devices) ))) + return VK_NULL_HANDLE; + + if ((vr = pvkEnumeratePhysicalDevices( d3dkmt_vk_instance, &device_count, devices ))) + { + WARN( "vkEnumeratePhysicalDevices returned %d\n", vr ); + free( devices ); + return VK_NULL_HANDLE; + } + + for (i = 0, device = VK_NULL_HANDLE; i < device_count; ++i) + { + VkPhysicalDeviceIDProperties id = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES}; + VkPhysicalDeviceProperties2 properties2 = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, .pNext = &id}; + + pvkGetPhysicalDeviceProperties2KHR( devices[i], &properties2 ); + if (IsEqualGUID( uuid, id.deviceUUID )) + { + device = devices[i]; + break; + } + } + + free( devices ); + return device; +} + NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) { - VkPhysicalDevice *vk_physical_devices = NULL; - VkPhysicalDeviceProperties2 properties2; - NTSTATUS status = STATUS_UNSUCCESSFUL; - UINT device_count, device_idx = 0; + VkPhysicalDevice device; struct x11_d3dkmt_adapter *adapter; - VkPhysicalDeviceIDProperties id; - VkResult vr; GUID uuid; if (!get_vulkan_uuid_from_luid(&desc->AdapterLuid, &uuid)) @@ -1047,53 +1081,15 @@ NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) return STATUS_UNSUCCESSFUL; } - pthread_mutex_lock(&d3dkmt_mutex); - - vr = pvkEnumeratePhysicalDevices(d3dkmt_vk_instance, &device_count, NULL); - if (vr != VK_SUCCESS || !device_count) - { - WARN("No Vulkan device found, vr %d, device_count %d.\n", vr, device_count); - goto done; - } - - if (!(vk_physical_devices = calloc(device_count, sizeof(*vk_physical_devices)))) - goto done; - - vr = pvkEnumeratePhysicalDevices(d3dkmt_vk_instance, &device_count, vk_physical_devices); - if (vr != VK_SUCCESS) - { - WARN("vkEnumeratePhysicalDevices failed, vr %d.\n", vr); - goto done; - } - - for (device_idx = 0; device_idx < device_count; ++device_idx) - { - memset(&id, 0, sizeof(id)); - id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; - properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - properties2.pNext = &id; - - pvkGetPhysicalDeviceProperties2KHR(vk_physical_devices[device_idx], &properties2); - if (!IsEqualGUID(&uuid, id.deviceUUID)) - continue; + if (!(device = get_vulkan_physical_device( &uuid ))) return STATUS_UNSUCCESSFUL; + if (!(adapter = malloc( sizeof(*adapter) ))) return STATUS_NO_MEMORY; + adapter->handle = desc->hAdapter; + adapter->vk_device = device; - if (!(adapter = malloc(sizeof(*adapter)))) - { - status = STATUS_NO_MEMORY; - goto done; - } - - adapter->handle = desc->hAdapter; - adapter->vk_device = vk_physical_devices[device_idx]; - list_add_head(&x11_d3dkmt_adapters, &adapter->entry); - status = STATUS_SUCCESS; - break; - } - -done: + pthread_mutex_lock(&d3dkmt_mutex); + list_add_head(&x11_d3dkmt_adapters, &adapter->entry); pthread_mutex_unlock(&d3dkmt_mutex); - free(vk_physical_devices); - return status; + return STATUS_SUCCESS; } NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc )

1 0

Paul Gofman : win32u: Avoid leaking previous buffer in get_buffer_space().
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 568e90ad117c3de8d858beb990808a1e2e26a88f URL: https://gitlab.winehq.org/wine/wine/-/commit/568e90ad117c3de8d858beb990808a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 22 21:46:31 2024 -0600 win32u: Avoid leaking previous buffer in get_buffer_space(). --- dlls/win32u/message.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 3a17c4689ff..4a368ffb589 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -473,7 +473,10 @@ static inline void *get_buffer_space( void **buffer, size_t size, size_t *buffer { if (*buffer_size < size) { - *buffer = malloc( size ); + void *new; + + if (!(new = realloc( *buffer, size ))) return NULL; + *buffer = new; *buffer_size = size; } return *buffer;

1 0

Rémi Bernon : winex11: Introduce a new find_adapter_from_handle helper.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: dc9229e6fa09cae2dc56aa3ebf695ede26e81020 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc9229e6fa09cae2dc56aa3ebf695e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 8 13:59:29 2024 +0100 winex11: Introduce a new find_adapter_from_handle helper. --- dlls/winex11.drv/x11drv_main.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index b3d83c9a884..3c3dc22c067 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -871,6 +871,15 @@ BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, return FALSE; /* let user32 handle it */ } +/* d3dkmt_lock must be held */ +static struct x11_d3dkmt_adapter *find_adapter_from_handle( D3DKMT_HANDLE handle ) +{ + struct x11_d3dkmt_adapter *adapter; + LIST_FOR_EACH_ENTRY( adapter, &x11_d3dkmt_adapters, struct x11_d3dkmt_adapter, entry ) + if (adapter->handle == handle) return adapter; + return NULL; +} + NTSTATUS X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { struct x11_d3dkmt_adapter *adapter; @@ -879,16 +888,11 @@ NTSTATUS X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) return STATUS_UNSUCCESSFUL; pthread_mutex_lock(&d3dkmt_mutex); - LIST_FOR_EACH_ENTRY(adapter, &x11_d3dkmt_adapters, struct x11_d3dkmt_adapter, entry) - { - if (adapter->handle == desc->hAdapter) - { - list_remove(&adapter->entry); - free(adapter); - break; - } - } + if ((adapter = find_adapter_from_handle( desc->hAdapter ))) + list_remove( &adapter->entry ); pthread_mutex_unlock(&d3dkmt_mutex); + + free(adapter); return STATUS_SUCCESS; } @@ -1096,7 +1100,6 @@ NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) { VkPhysicalDeviceMemoryBudgetPropertiesEXT budget; VkPhysicalDeviceMemoryProperties2 properties2; - NTSTATUS status = STATUS_INVALID_PARAMETER; struct x11_d3dkmt_adapter *adapter; unsigned int i; @@ -1112,11 +1115,8 @@ NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) } pthread_mutex_lock(&d3dkmt_mutex); - LIST_FOR_EACH_ENTRY(adapter, &x11_d3dkmt_adapters, struct x11_d3dkmt_adapter, entry) + if ((adapter = find_adapter_from_handle(desc->hAdapter))) { - if (adapter->handle != desc->hAdapter) - continue; - memset(&budget, 0, sizeof(budget)); budget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT; properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2; @@ -1134,11 +1134,10 @@ NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) } } desc->AvailableForReservation = desc->Budget / 2; - status = STATUS_SUCCESS; - break; } pthread_mutex_unlock(&d3dkmt_mutex); - return status; + + return adapter ? STATUS_SUCCESS : STATUS_INVALID_PARAMETER; } NTSTATUS x11drv_client_func( enum x11drv_client_funcs id, const void *params, ULONG size )

1 0

Rémi Bernon : win32u: Open adapters in NtGdiDdDDIEnumAdapters2 outside of the display devices lock.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: eb38f7418a922b09ab97112e06431be6568f4f65 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb38f7418a922b09ab97112e06431b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 28 10:46:00 2024 +0100 win32u: Open adapters in NtGdiDdDDIEnumAdapters2 outside of the display devices lock. --- dlls/win32u/sysparams.c | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d5ad97a2c33..779cbb8a64e 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -6607,11 +6607,10 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD NTSTATUS WINAPI NtGdiDdDDIEnumAdapters2( D3DKMT_ENUMADAPTERS2 *desc ) { D3DKMT_OPENADAPTERFROMLUID open_adapter_from_luid; - static const ULONG max_adapters = 34; + struct gpu *gpu, *current_gpus[34]; D3DKMT_CLOSEADAPTER close_adapter; NTSTATUS status = STATUS_SUCCESS; - ULONG idx = 0, count; - struct gpu *gpu; + UINT idx = 0, count = 0; TRACE( "(%p)\n", desc ); @@ -6619,18 +6618,22 @@ NTSTATUS WINAPI NtGdiDdDDIEnumAdapters2( D3DKMT_ENUMADAPTERS2 *desc ) if (!desc->pAdapters) { - desc->NumAdapters = max_adapters; + desc->NumAdapters = ARRAY_SIZE(current_gpus); return STATUS_SUCCESS; } if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; - - if ((count = list_count( &gpus )) > max_adapters) + LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) { - WARN( "Too many adapters (%u), only up to %u can be enumerated.\n", - (unsigned int)count, (unsigned int)max_adapters ); - count = max_adapters; + if (count >= ARRAY_SIZE(current_gpus)) + { + WARN( "Too many adapters (%u), only up to %zu can be enumerated.\n", + count, ARRAY_SIZE(current_gpus) ); + break; + } + current_gpus[count++] = gpu_acquire( gpu ); } + unlock_display_devices(); if (count > desc->NumAdapters) { @@ -6638,48 +6641,43 @@ NTSTATUS WINAPI NtGdiDdDDIEnumAdapters2( D3DKMT_ENUMADAPTERS2 *desc ) goto done; } - LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) + for (idx = 0; idx < count; idx++) { - if (gpu->luid.LowPart || gpu->luid.HighPart) + gpu = current_gpus[idx]; + if (!gpu->luid.LowPart && !gpu->luid.HighPart) { - open_adapter_from_luid.AdapterLuid = gpu->luid; - - /* give the GDI driver a chance to be notified about new adapter handle */ - if (NT_SUCCESS( NtGdiDdDDIOpenAdapterFromLuid( &open_adapter_from_luid ) )) - { - desc->pAdapters[idx].hAdapter = open_adapter_from_luid.hAdapter; - desc->pAdapters[idx].AdapterLuid = gpu->luid; - desc->pAdapters[idx].NumOfSources = gpu->adapter_count; - desc->pAdapters[idx].bPrecisePresentRegionsPreferred = FALSE; - idx += 1; - continue; - } - else - { - ERR( "Failed to open adapter %u from LUID.\n", (unsigned int)idx ); - } + ERR( "Adapter %u does not have a LUID.\n", idx ); + status = STATUS_UNSUCCESSFUL; + break; } - else + open_adapter_from_luid.AdapterLuid = gpu->luid; + + /* give the GDI driver a chance to be notified about new adapter handle */ + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &open_adapter_from_luid ))) { - ERR( "Adapter %u does not have a LUID.\n", (unsigned int)idx ); + ERR( "Failed to open adapter %u from LUID, status %#x.\n", idx, (UINT)status ); + break; } - while (idx--) + desc->pAdapters[idx].hAdapter = open_adapter_from_luid.hAdapter; + desc->pAdapters[idx].AdapterLuid = gpu->luid; + desc->pAdapters[idx].NumOfSources = gpu->adapter_count; + desc->pAdapters[idx].bPrecisePresentRegionsPreferred = FALSE; + } + + if (idx != count) + { + while (idx) { - close_adapter.hAdapter = desc->pAdapters[idx].hAdapter; + close_adapter.hAdapter = desc->pAdapters[--idx].hAdapter; NtGdiDdDDICloseAdapter( &close_adapter ); } memset( desc->pAdapters, 0, desc->NumAdapters * sizeof(D3DKMT_ADAPTERINFO) ); - status = STATUS_UNSUCCESSFUL; - break; } + desc->NumAdapters = idx; done: - if (status == STATUS_SUCCESS) - desc->NumAdapters = idx; - - unlock_display_devices(); - + while (count) gpu_release( current_gpus[--count] ); return status; }

1 0

Alexandre Julliard : wshom.ocx: Don't show a message box on ShellExecute error.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 47e4907c0d3b53e482cea79df90ec72eafad8c37 URL: https://gitlab.winehq.org/wine/wine/-/commit/47e4907c0d3b53e482cea79df90ec7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 26 22:24:09 2024 +0100 wshom.ocx: Don't show a message box on ShellExecute error. --- dlls/wshom.ocx/shell.c | 7 ++++--- dlls/wshom.ocx/tests/wshom.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index dd21e03b898..c538a6b4a74 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1374,7 +1374,8 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; + info.fMask = SEE_MASK_FLAG_NO_UI; + info.fMask |= waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; info.lpFile = file; info.lpParameters = params; info.nShow = show; @@ -1384,7 +1385,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, if (!ret) { TRACE("ShellExecute failed, %ld\n", GetLastError()); - return HRESULT_FROM_WIN32(GetLastError()); + *exit_code = GetLastError(); } else { @@ -1399,8 +1400,8 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, else *exit_code = 0; - return S_OK; } + return S_OK; } struct popup_thread_param diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 58736ff601f..15c00b2e489 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -284,7 +284,7 @@ static void test_wshshell(void) str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); + ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str); GetSystemDirectoryW(path, ARRAY_SIZE(path));

1 0

Rémi Bernon : winex11: Initialize D3DKMT vulkan instance only once.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 3f5d18b3b6590ff9ad1e7dc31404856fa0cddbc3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f5d18b3b6590ff9ad1e7dc3140485… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 8 13:44:20 2024 +0100 winex11: Initialize D3DKMT vulkan instance only once. Creating an instance is an expensive operation and we should avoid constantly re-creating one when opening then closing a D3DKMT adapter. --- dlls/winex11.drv/x11drv_main.c | 119 ++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 61 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 5d4ed065fb5..d75f84fadb6 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -107,9 +107,63 @@ struct x11_d3dkmt_adapter struct list entry; /* List entry */ }; -static VkInstance d3dkmt_vk_instance; /* Vulkan instance for D3DKMT functions */ static struct list x11_d3dkmt_adapters = LIST_INIT( x11_d3dkmt_adapters ); +static VkInstance d3dkmt_vk_instance; /* Vulkan instance for D3DKMT functions */ +static PFN_vkGetPhysicalDeviceMemoryProperties2KHR pvkGetPhysicalDeviceMemoryProperties2KHR; +static PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; +static PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; +static const struct vulkan_funcs *vulkan_funcs; + +static void d3dkmt_init_vulkan(void) +{ + static const char *extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, + }; + VkInstanceCreateInfo create_info = + { + .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + .enabledExtensionCount = ARRAY_SIZE( extensions ), + .ppEnabledExtensionNames = extensions, + }; + VkResult vr; + + if (!(vulkan_funcs = __wine_get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ))) + { + WARN( "Failed to open the Vulkan driver\n" ); + return; + } + + if ((vr = vulkan_funcs->p_vkCreateInstance( &create_info, NULL, &d3dkmt_vk_instance ))) + { + WARN( "Failed to create a Vulkan instance, vr %d.\n", vr ); + vulkan_funcs = NULL; + return; + } + +#define LOAD_VK_FUNC( f ) \ + if (!(p##f = (void *)vulkan_funcs->p_vkGetInstanceProcAddr( d3dkmt_vk_instance, #f ))) \ + { \ + WARN( "Failed to load " #f ".\n" ); \ + vulkan_funcs->p_vkDestroyInstance( d3dkmt_vk_instance, NULL ); \ + vulkan_funcs = NULL; \ + return; \ + } + LOAD_VK_FUNC( vkEnumeratePhysicalDevices ) + LOAD_VK_FUNC( vkGetPhysicalDeviceProperties2KHR ) + LOAD_VK_FUNC( vkGetPhysicalDeviceMemoryProperties2KHR ) +#undef LOAD_VK_FUNC +} + +static BOOL d3dkmt_use_vulkan(void) +{ + static pthread_once_t once = PTHREAD_ONCE_INIT; + pthread_once( &once, d3dkmt_init_vulkan ); + return !!vulkan_funcs; +} + #define IS_OPTION_TRUE(ch) \ ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') #define IS_OPTION_FALSE(ch) \ @@ -819,10 +873,9 @@ BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, NTSTATUS X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - const struct vulkan_funcs *vulkan_funcs = __wine_get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); struct x11_d3dkmt_adapter *adapter; - if (!vulkan_funcs) + if (!d3dkmt_use_vulkan()) return STATUS_UNSUCCESSFUL; pthread_mutex_lock(&d3dkmt_mutex); @@ -835,12 +888,6 @@ NTSTATUS X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) break; } } - - if (list_empty(&x11_d3dkmt_adapters)) - { - vulkan_funcs->p_vkDestroyInstance(d3dkmt_vk_instance, NULL); - d3dkmt_vk_instance = NULL; - } pthread_mutex_unlock(&d3dkmt_mutex); return STATUS_SUCCESS; } @@ -977,20 +1024,11 @@ static BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid ) NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) { - static const char *extensions[] = - { - VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, - VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, - }; - const struct vulkan_funcs *vulkan_funcs; - PFN_vkGetPhysicalDeviceProperties2KHR pvkGetPhysicalDeviceProperties2KHR; - PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; NTSTATUS status = STATUS_UNSUCCESSFUL; UINT device_count, device_idx = 0; struct x11_d3dkmt_adapter *adapter; - VkInstanceCreateInfo create_info; VkPhysicalDeviceIDProperties id; VkResult vr; GUID uuid; @@ -1003,7 +1041,7 @@ NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) } /* Find the Vulkan device with corresponding UUID */ - if (!(vulkan_funcs = __wine_get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ))) + if (!d3dkmt_use_vulkan()) { WARN("Vulkan is unavailable.\n"); return STATUS_UNSUCCESSFUL; @@ -1011,32 +1049,6 @@ NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) pthread_mutex_lock(&d3dkmt_mutex); - if (!d3dkmt_vk_instance) - { - memset(&create_info, 0, sizeof(create_info)); - create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - create_info.enabledExtensionCount = ARRAY_SIZE(extensions); - create_info.ppEnabledExtensionNames = extensions; - - vr = vulkan_funcs->p_vkCreateInstance(&create_info, NULL, &d3dkmt_vk_instance); - if (vr != VK_SUCCESS) - { - WARN("Failed to create a Vulkan instance, vr %d.\n", vr); - goto done; - } - } - -#define LOAD_VK_FUNC(f) \ - if (!(p##f = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(d3dkmt_vk_instance, #f))) \ - { \ - WARN("Failed to load " #f ".\n"); \ - goto done; \ - } - - LOAD_VK_FUNC(vkEnumeratePhysicalDevices) - LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) -#undef LOAD_VK_FUNC - vr = pvkEnumeratePhysicalDevices(d3dkmt_vk_instance, &device_count, NULL); if (vr != VK_SUCCESS || !device_count) { @@ -1079,11 +1091,6 @@ NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) } done: - if (d3dkmt_vk_instance && list_empty(&x11_d3dkmt_adapters)) - { - vulkan_funcs->p_vkDestroyInstance(d3dkmt_vk_instance, NULL); - d3dkmt_vk_instance = NULL; - } pthread_mutex_unlock(&d3dkmt_mutex); free(vk_physical_devices); return status; @@ -1091,8 +1098,6 @@ done: NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) { - const struct vulkan_funcs *vulkan_funcs = __wine_get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); - PFN_vkGetPhysicalDeviceMemoryProperties2KHR pvkGetPhysicalDeviceMemoryProperties2KHR; VkPhysicalDeviceMemoryBudgetPropertiesEXT budget; VkPhysicalDeviceMemoryProperties2 properties2; NTSTATUS status = STATUS_INVALID_PARAMETER; @@ -1104,7 +1109,7 @@ NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) desc->CurrentReservation = 0; desc->AvailableForReservation = 0; - if (!vulkan_funcs) + if (!d3dkmt_use_vulkan()) { WARN("Vulkan is unavailable.\n"); return STATUS_UNSUCCESSFUL; @@ -1116,13 +1121,6 @@ NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) if (adapter->handle != desc->hAdapter) continue; - if (!(pvkGetPhysicalDeviceMemoryProperties2KHR = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(d3dkmt_vk_instance, "vkGetPhysicalDeviceMemoryProperties2KHR"))) - { - WARN("Failed to load vkGetPhysicalDeviceMemoryProperties2KHR.\n"); - status = STATUS_UNSUCCESSFUL; - goto done; - } - memset(&budget, 0, sizeof(budget)); budget.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT; properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2; @@ -1143,7 +1141,6 @@ NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) status = STATUS_SUCCESS; break; } -done: pthread_mutex_unlock(&d3dkmt_mutex); return status; }

1 0

Paul Gofman : win32u: Avoid writing past allocated memory in peek_message().
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 054a95a817103b8536f1a096c080e030f7858633 URL: https://gitlab.winehq.org/wine/wine/-/commit/054a95a817103b8536f1a096c080e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 22 21:07:20 2024 -0600 win32u: Avoid writing past allocated memory in peek_message(). --- dlls/win32u/message.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 2b416f39241..3a17c4689ff 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -469,9 +469,13 @@ static inline void push_string( struct packed_message *data, LPCWSTR str ) } /* make sure that there is space for 'size' bytes in buffer, growing it if needed */ -static inline void *get_buffer_space( void **buffer, size_t size, size_t prev_size ) +static inline void *get_buffer_space( void **buffer, size_t size, size_t *buffer_size ) { - if (prev_size < size) *buffer = malloc( size ); + if (*buffer_size < size) + { + *buffer = malloc( size ); + *buffer_size = size; + } return *buffer; } @@ -522,7 +526,7 @@ BOOL set_keyboard_auto_repeat( BOOL enable ) * Unpack a message received from another process. */ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ) + void **buffer, size_t size, size_t *buffer_size ) { size_t minsize = 0; union packed_structs *ps = *buffer; @@ -585,7 +589,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa break; case WM_GETTEXT: case WM_ASKCBFORMATNAME: - if (!get_buffer_space( buffer, (*wparam * sizeof(WCHAR)), size )) return FALSE; + if (!get_buffer_space( buffer, (*wparam * sizeof(WCHAR)), buffer_size )) return FALSE; break; case WM_WININICHANGE: if (!*lparam) return TRUE; @@ -726,17 +730,17 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa minsize = sizeof(SCROLLINFO); break; case SBM_GETSCROLLINFO: - if (!get_buffer_space( buffer, sizeof(SCROLLINFO), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(SCROLLINFO), buffer_size )) return FALSE; break; case SBM_GETSCROLLBARINFO: - if (!get_buffer_space( buffer, sizeof(SCROLLBARINFO), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(SCROLLBARINFO), buffer_size )) return FALSE; break; case EM_GETSEL: case SBM_GETRANGE: case CB_GETEDITSEL: if (*wparam || *lparam) { - if (!get_buffer_space( buffer, 2 * sizeof(DWORD), size )) return FALSE; + if (!get_buffer_space( buffer, 2 * sizeof(DWORD), buffer_size )) return FALSE; if (*wparam) *wparam = (WPARAM)*buffer; if (*lparam) *lparam = (LPARAM)((DWORD *)*buffer + 1); } @@ -744,7 +748,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case EM_GETRECT: case LB_GETITEMRECT: case CB_GETDROPPEDCONTROLRECT: - if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(RECT), buffer_size )) return FALSE; break; case EM_SETRECT: case EM_SETRECTNP: @@ -755,7 +759,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa WORD *len_ptr, len; if (size < sizeof(WORD)) return FALSE; len = *(WORD *)*buffer; - if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), size )) return FALSE; + if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), buffer_size )) return FALSE; len_ptr = *buffer; len_ptr[0] = len_ptr[1] = len; *lparam = (LPARAM)(len_ptr + 1); @@ -780,26 +784,24 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa break; case CB_GETLBTEXT: { - size_t prev_size = size; if (combobox_has_strings( hwnd )) size = (send_message( hwnd, CB_GETLBTEXTLEN, *wparam, 0 ) + 1) * sizeof(WCHAR); else size = sizeof(ULONG_PTR); - if (!get_buffer_space( buffer, size, prev_size )) return FALSE; + if (!get_buffer_space( buffer, size, buffer_size )) return FALSE; break; } case LB_GETTEXT: { - size_t prev_size = size; if (listbox_has_strings( hwnd )) size = (send_message( hwnd, LB_GETTEXTLEN, *wparam, 0 ) + 1) * sizeof(WCHAR); else size = sizeof(ULONG_PTR); - if (!get_buffer_space( buffer, size, prev_size )) return FALSE; + if (!get_buffer_space( buffer, size, buffer_size )) return FALSE; break; } case LB_GETSELITEMS: - if (!get_buffer_space( buffer, *wparam * sizeof(UINT), size )) return FALSE; + if (!get_buffer_space( buffer, *wparam * sizeof(UINT), buffer_size )) return FALSE; break; case WM_NEXTMENU: { @@ -814,7 +816,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case WM_SIZING: case WM_MOVING: minsize = sizeof(RECT); - if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(RECT), buffer_size )) return FALSE; break; case WM_MDICREATE: { @@ -880,7 +882,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa } case WM_MDIGETACTIVE: if (!*lparam) return TRUE; - if (!get_buffer_space( buffer, sizeof(BOOL), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(BOOL), buffer_size )) return FALSE; break; case WM_DEVICECHANGE: if (!(*wparam & 0x8000)) return TRUE; @@ -2788,7 +2790,7 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) case MSG_NOTIFY: info.flags = ISMEX_NOTIFY; if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, - &info.msg.lParam, &buffer, size )) + &info.msg.lParam, &buffer, size, &buffer_size )) continue; break; case MSG_CALLBACK: @@ -2866,7 +2868,7 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) case MSG_OTHER_PROCESS: info.flags = ISMEX_SEND; if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, - &info.msg.lParam, &buffer, size )) + &info.msg.lParam, &buffer, size, &buffer_size )) { /* ignore it */ reply_message( &info, 0, &info.msg );

1 0

Paul Gofman : ddraw/tests: Add tests for multiple devices.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 8b7ac24752f3c2d29f6f44aa5da1cc1203d53e55 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b7ac24752f3c2d29f6f44aa5da1cc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 15 21:40:03 2024 -0600 ddraw/tests: Add tests for multiple devices. --- dlls/ddraw/tests/ddraw1.c | 104 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 160 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw4.c | 125 ++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 88 ++++++++++++++++++++++--- 4 files changed, 454 insertions(+), 23 deletions(-)

1 0

Paul Gofman : ddraw: Support multiple devices per ddraw object.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 9d95bd5f4b54a392d97f0b58db8f78d675495544 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d95bd5f4b54a392d97f0b58db8f78… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 15 20:12:04 2024 -0600 ddraw: Support multiple devices per ddraw object. --- dlls/ddraw/ddraw.c | 40 +++++++++++++++++++++++++++++----------- dlls/ddraw/ddraw_private.h | 6 +++++- dlls/ddraw/device.c | 10 ++-------- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/surface.c | 16 +++++++++++----- dlls/ddraw/tests/d3d.c | 9 ++------- dlls/ddraw/vertexbuffer.c | 2 +- 7 files changed, 52 insertions(+), 35 deletions(-)

1 0

Paul Gofman : ddraw: Don't apply state in ddraw_surface_blt().
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 2e088045b5ac4f3e0644b103d8c0346ba230c892 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e088045b5ac4f3e0644b103d8c034… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 14:01:59 2024 -0600 ddraw: Don't apply state in ddraw_surface_blt(). --- dlls/ddraw/surface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 46fefb2f727..1231fac05c8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1563,7 +1563,6 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { struct ddraw *ddraw = dst_surface->ddraw; - struct wined3d_device *wined3d_device = ddraw->wined3d_device; struct wined3d_color colour; DWORD wined3d_flags; HRESULT hr; @@ -1578,7 +1577,6 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; - wined3d_device_apply_stateblock(wined3d_device, ddraw->state); ddraw_surface_get_draw_texture(dst_surface, dst_rect ? DDRAW_SURFACE_RW : DDRAW_SURFACE_WRITE); hr = wined3d_device_context_clear_rendertarget_view(ddraw->immediate_context, ddraw_surface_get_rendertarget_view(dst_surface), @@ -1597,7 +1595,6 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; - wined3d_device_apply_stateblock(wined3d_device, ddraw->state); ddraw_surface_get_draw_texture(dst_surface, dst_rect ? DDRAW_SURFACE_RW : DDRAW_SURFACE_WRITE); return wined3d_device_context_clear_rendertarget_view(ddraw->immediate_context, ddraw_surface_get_rendertarget_view(dst_surface),

1 0