February 2024 - Wine-Commits

Rémi Bernon : winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceSupportKHR driver entry.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 70469abc0586b1d405216b673428bcddf2676555 URL: https://gitlab.winehq.org/wine/wine/-/commit/70469abc0586b1d405216b673428bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 4 15:17:18 2023 +0100 winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceSupportKHR driver entry. --- dlls/winemac.drv/vulkan.c | 14 -------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winewayland.drv/vulkan.c | 16 ---------------- dlls/winex11.drv/vulkan.c | 13 ------------- include/wine/vulkan_driver.h | 5 +---- 6 files changed, 4 insertions(+), 51 deletions(-)

1 0

Rémi Bernon : winevulkan: Keep the create_info HWND on the surface wrappers.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 982c2ede7a8e1bda5f10d5a662448948b04efbb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/982c2ede7a8e1bda5f10d5a6624489… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 25 01:44:49 2023 +0100 winevulkan: Keep the create_info HWND on the surface wrappers. --- dlls/winevulkan/vulkan.c | 16 ++++++---------- dlls/winevulkan/vulkan_private.h | 3 ++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c999363e268..95bce62cc8d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1450,24 +1450,20 @@ void wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice phy properties->externalSemaphoreFeatures = 0; } -VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCreateInfoKHR *createInfo, +VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_surface *object; VkResult res; - if (allocator) - FIXME("Support for allocation callbacks not implemented yet\n"); - - object = calloc(1, sizeof(*object)); - - if (!object) - return VK_ERROR_OUT_OF_HOST_MEMORY; + if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->host_instance, createInfo, NULL, - &object->driver_surface); + if (!(object = calloc(1, sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; + object->hwnd = create_info->hwnd; + res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->host_instance, create_info, + NULL /* allocator */, &object->driver_surface); if (res != VK_SUCCESS) { free(object); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 12664d361c0..6b01e99262e 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -222,7 +222,8 @@ static inline VkDebugReportCallbackEXT wine_debug_report_callback_to_handle( struct wine_surface { VkSurfaceKHR host_surface; - VkSurfaceKHR driver_surface; /* wine driver surface */ + VkSurfaceKHR driver_surface; + HWND hwnd; struct wine_vk_mapping mapping; };

1 0

Rémi Bernon : winevulkan: Return VK_ERROR_SURFACE_LOST_KHR from surface functions.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 844d4cd20604de4d9dcb68659e8dc25440221705 URL: https://gitlab.winehq.org/wine/wine/-/commit/844d4cd20604de4d9dcb68659e8dc2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 10:30:49 2023 +0100 winevulkan: Return VK_ERROR_SURFACE_LOST_KHR from surface functions. --- dlls/vulkan-1/tests/vulkan.c | 3 --- dlls/winevulkan/vulkan.c | 36 ++++++++++++++++-------------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 6142d73c903..5417585e00c 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -635,11 +635,8 @@ static void test_win32_surface_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_ if (IsWindow(hwnd)) ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); else - { - todo_wine ok(vr == VK_ERROR_SURFACE_LOST_KHR /* Nvidia */ || vr == VK_ERROR_UNKNOWN /* AMD */, "Got unexpected vr %d.\n", vr); - } } count = 0; diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 95bce62cc8d..240ba3e8618 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1746,40 +1746,36 @@ static inline void adjust_max_image_count(struct wine_phys_dev *phys_dev, VkSurf } } -VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice handle, VkSurfaceKHR surface_handle, +VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice device_handle, VkSurfaceKHR surface_handle, VkSurfaceCapabilitiesKHR *capabilities) { - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); + struct wine_phys_dev *physical_device = wine_phys_dev_from_handle(device_handle); struct wine_surface *surface = wine_surface_from_handle(surface_handle); + struct wine_instance *instance = physical_device->instance; VkResult res; - res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev->host_physical_device, - surface->driver_surface, capabilities); - - if (res == VK_SUCCESS) - adjust_max_image_count(phys_dev, capabilities); - + if (!NtUserIsWindow(surface->hwnd)) return VK_ERROR_SURFACE_LOST_KHR; + res = instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device->host_physical_device, + surface->driver_surface, capabilities); + if (res == VK_SUCCESS) adjust_max_image_count(physical_device, capabilities); return res; } -VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice handle, - const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, +VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice device_handle, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) { - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); + struct wine_phys_dev *physical_device = wine_phys_dev_from_handle(device_handle); struct wine_surface *surface = wine_surface_from_handle(surface_info->surface); - VkPhysicalDeviceSurfaceInfo2KHR host_info; + VkPhysicalDeviceSurfaceInfo2KHR surface_info_host = *surface_info; + struct wine_instance *instance = physical_device->instance; VkResult res; - host_info.sType = surface_info->sType; - host_info.pNext = surface_info->pNext; - host_info.surface = surface->driver_surface; - res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev->host_physical_device, - &host_info, capabilities); - - if (res == VK_SUCCESS) - adjust_max_image_count(phys_dev, &capabilities->surfaceCapabilities); + surface_info_host.surface = surface->driver_surface; + if (!NtUserIsWindow(surface->hwnd)) return VK_ERROR_SURFACE_LOST_KHR; + res = instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(physical_device->host_physical_device, + &surface_info_host, capabilities); + if (res == VK_SUCCESS) adjust_max_image_count(physical_device, &capabilities->surfaceCapabilities); return res; }

1 0

Rémi Bernon : winewayland: Remove now unnecessary VK_ERROR_SURFACE_LOST_KHR checks.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 19eba8d99104eb0f4f3f4abe10ccb4e24999dcdc URL: https://gitlab.winehq.org/wine/wine/-/commit/19eba8d99104eb0f4f3f4abe10ccb4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 25 01:44:49 2023 +0100 winewayland: Remove now unnecessary VK_ERROR_SURFACE_LOST_KHR checks. --- dlls/winewayland.drv/vulkan.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 294272a9788..51ddf42fc38 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -555,9 +555,6 @@ static VkResult wayland_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(surface), flags); - if (!wine_vk_surface_is_valid(wine_vk_surface)) - return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetDeviceGroupSurfacePresentModesKHR(device, wine_vk_surface->host_surface, flags); } @@ -675,9 +672,6 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice p TRACE("%p, %p, %p, %p\n", phys_dev, surface_info, count, formats); - if (!wine_vk_surface_is_valid(wine_vk_surface)) - return VK_ERROR_SURFACE_LOST_KHR; - surface_info_host = *surface_info; surface_info_host.surface = wine_vk_surface->host_surface; @@ -724,9 +718,6 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice ph TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, formats); - if (!wine_vk_surface_is_valid(wine_vk_surface)) - return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, wine_vk_surface->host_surface, count, formats); } @@ -740,9 +731,6 @@ static VkResult wayland_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevi TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, modes); - if (!wine_vk_surface_is_valid(wine_vk_surface)) - return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, wine_vk_surface->host_surface, count, modes); } @@ -756,9 +744,6 @@ static VkResult wayland_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice ph TRACE("%p, %u, 0x%s, %p\n", phys_dev, index, wine_dbgstr_longlong(surface), supported); - if (!wine_vk_surface_is_valid(wine_vk_surface)) - return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, wine_vk_surface->host_surface, supported); }

1 0

Daniel Lehman : oleaut32/tests: Add tests for VarBstrFromR4.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 62536d1645afd75965455f6bb8a03001106d57b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/62536d1645afd75965455f6bb8a030… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 31 21:42:36 2024 -0800 oleaut32/tests: Add tests for VarBstrFromR4. --- dlls/oleaut32/tests/vartype.c | 89 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 27348b4866e..e567f5a5fed 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4521,8 +4521,65 @@ static void test_VarBstrFromI4(void) } } +struct r4_test +{ + float val; + const wchar_t *expect; + BOOL todo; +}; + static void test_VarBstrFromR4(void) { + static const struct r4_test tests_en[] = + { + { 0.5, L"0.5" }, + { 0.05, L"0.05" }, + { 0.005, L"0.005" }, + { 0.0005, L"0.0005" }, + { 0.00005, L"0.00005", TRUE }, + { 0.000005, L"0.000005", TRUE }, + + { 1.0e8, L"1E+08" }, + { 1.0e12, L"1E+12" }, + { 1.0e14, L"1E+14" }, + { 999999999999999.0, L"1E+15" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1.2E+15" }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1.234E+16" }, + { M_PI, L"3.141593" }, + { 37.86626157, L"37.86626" }, + { 137.86626157, L"137.8663" }, + { 1137.86626157, L"1137.866" }, + + { 0.0, NULL } + }; + static const struct r4_test tests_es[] = + { + { 0.5, L"0,5" }, + { 0.05, L"0,05" }, + { 0.005, L"0,005" }, + { 0.0005, L"0,0005" }, + { 0.00005, L"0,00005", TRUE }, + { 0.000005, L"0,000005", TRUE }, + + { 1.0e8, L"1E+08" }, + { 1.0e12, L"1E+12" }, + { 1.0e14, L"1E+14" }, + { 999999999999999.0, L"1E+15" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1,234E+16", TRUE }, + { M_PI, L"3,141593" }, + + { 0.0, NULL } + }; + const struct r4_test *cur; static const WCHAR szNative[] = { '6','5','4','3','2','2','.','3','\0' }; static const WCHAR szZero[] = {'0', '\0'}; static const WCHAR szOneHalf_English[] = { '0','.','5','\0' }; /* uses period */ @@ -4574,6 +4631,38 @@ static void test_VarBstrFromR4(void) ok(memcmp(bstr, szOneHalf_Spanish, sizeof(szOneHalf_Spanish)) == 0, "Spanish locale failed (got %s)\n", wtoascii(bstr)); SysFreeString(bstr); } + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + cur = tests_en; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR4(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } + + lcid = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT); + cur = tests_es; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR4(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } } struct r8_test

1 0

Daniel Lehman : oleaut32/tests: Add tests for VarBstrFromR8.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 53f81aa1dd8e8e3e49458fe583f2df4af39058d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/53f81aa1dd8e8e3e49458fe583f2df… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jan 30 22:46:23 2024 -0800 oleaut32/tests: Add tests for VarBstrFromR8. --- dlls/oleaut32/tests/vartype.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 9426272d7be..27348b4866e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4576,6 +4576,97 @@ static void test_VarBstrFromR4(void) } } +struct r8_test +{ + double val; + const wchar_t *expect; + BOOL todo; +}; + +static void test_VarBstrFromR8(void) +{ + static const struct r8_test tests_en[] = + { + { 0.5, L"0.5" }, + { 0.05, L"0.05" }, + { 0.005, L"0.005" }, + { 0.0005, L"0.0005" }, + { 0.00005, L"0.00005", TRUE }, + { 0.000005, L"0.000005", TRUE }, + + { 1.0e8, L"100000000" }, + { 1.0e12, L"1000000000000" }, + { 1.0e14, L"100000000000000" }, + { 999999999999999.0, L"999999999999999" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1.2E+15" }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1.234E+16" }, + + { 0.0, NULL } + }; + static const struct r8_test tests_es[] = + { + { 0.5, L"0,5" }, + { 0.05, L"0,05" }, + { 0.005, L"0,005" }, + { 0.0005, L"0,0005" }, + { 0.00005, L"0,00005", TRUE }, + { 0.000005, L"0,000005", TRUE }, + + { 1.0e8, L"100000000" }, + { 1.0e12, L"1000000000000" }, + { 1.0e14, L"100000000000000" }, + { 999999999999999.0, L"999999999999999" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1,234E+16", TRUE }, + + { 0.0, NULL } + }; + const struct r8_test *cur; + HRESULT hres; + BSTR bstr; + LCID lcid; + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + cur = tests_en; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR8(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } + + lcid = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT); + cur = tests_es; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR8(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } +} + static void _BSTR_DATE(DATE dt, const char *str, int line) { LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); @@ -6325,6 +6416,7 @@ START_TEST(vartype) test_VarBstrFromI4(); test_VarBstrFromR4(); + test_VarBstrFromR8(); test_VarBstrFromDate(); test_VarBstrFromCy(); test_VarBstrFromDec();

1 0