November 2023 - Wine-commits

Bartosz Kosiorek : msvcrt: Add _mbsspnp_l implementation.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 65f7d5ec484111c27abcec6811d5a92aa4bbd7bf URL: https://gitlab.winehq.org/wine/wine/-/commit/65f7d5ec484111c27abcec6811d5a9… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Nov 11 23:32:38 2023 +0100 msvcrt: Add _mbsspnp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 15 +++++++++++++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f4baf442b53..79a201f4c17 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1186,7 +1186,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e9bdf422024..6a6d38db187 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1543,7 +1543,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 13dacc15744..13d7e401133 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1554,7 +1554,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91781c9c9e4..5b253b88234 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -858,7 +858,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2af41f8aea2..df989581d5e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -836,7 +836,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1a595a44ced..e6c0e944255 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2828,13 +2828,24 @@ size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) return _mbsspn_l(string, set, NULL); } +/********************************************************************* + * _mbsspnp_l (MSVCRT.@) + */ +unsigned char* CDECL _mbsspnp_l(const unsigned char* string, const unsigned char* set, _locale_t locale) +{ + if (!MSVCRT_CHECK_PMT(string && set)) + return 0; + + string += _mbsspn_l(string, set, locale); + return *string ? (unsigned char*)string : NULL; +} + /********************************************************************* * _mbsspnp (MSVCRT.@) */ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) { - string += _mbsspn( string, set ); - return *string ? (unsigned char*)string : NULL; + return _mbsspnp_l(string, set, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f54a437692f..72392a1847b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -807,7 +807,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -# stub _mbsspnp_l(str str ptr) +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) # stub _mbsstr_l(str str ptr) @ cdecl _mbstok(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7cf9b01aa4f..60ebe06ea82 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -702,7 +702,7 @@ @ cdecl _mbsspn(str str) @ cdecl _mbsspn_l(str str ptr) @ cdecl _mbsspnp(str str) -@ stub _mbsspnp_l +@ cdecl _mbsspnp_l(str str ptr) @ cdecl _mbsstr(str str) @ stub _mbsstr_l @ cdecl _mbstok(str str) @@ -1271,7 +1271,7 @@ @ cdecl _o__mbsspn(str str) _mbsspn @ cdecl _o__mbsspn_l(str str ptr) _mbsspn_l @ cdecl _o__mbsspnp(str str) _mbsspnp -@ stub _o__mbsspnp_l +@ cdecl _o__mbsspnp_l(str str ptr) _mbsspnp_l @ cdecl _o__mbsstr(str str) _mbsstr @ stub _o__mbsstr_l @ cdecl _o__mbstok(str str) _mbstok

1 0

Paul Gofman : gdiplus: Round width and height in gdip_format_string().
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 5415eb7c3747063b2b92692c987eebceb0107207 URL: https://gitlab.winehq.org/wine/wine/-/commit/5415eb7c3747063b2b92692c987eeb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 16 21:37:15 2023 -0600 gdiplus: Round width and height in gdip_format_string(). --- dlls/gdiplus/graphics.c | 4 ++-- dlls/gdiplus/tests/graphics.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 371629a5bef..cc8411d54f7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5179,8 +5179,8 @@ GpStatus gdip_format_string(HDC hdc, if (!format) format = &default_drawstring_format; - nwidth = rect->Width; - nheight = rect->Height; + nwidth = (int)(rect->Width + 0.005f); + nheight = (int)(rect->Height + 0.005f); if (ignore_empty_clip) { if (!nwidth) nwidth = INT_MAX; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index de174257994..d71bc78c2ae 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4770,7 +4770,7 @@ static void test_measure_string(void) set_rect_empty(&rect); rect.Height = height; - rect.Width = width_2 - 0.05; + rect.Width = width_2 - 0.006; set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); @@ -4781,6 +4781,19 @@ static void test_measure_string(void) expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + set_rect_empty(&rect); + rect.Height = height; + rect.Width = width_2 - 0.004; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(2, glyphs); + expect(1, lines); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(width_2, bounds.Width, 0.01); + expectf(height, bounds.Height); + /* Default (Near) alignment */ rect.X = 5.0; rect.Y = 5.0;

1 0

Jacek Caban : ole32/tests: Remove unused variable.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 1bd4bcaa4a524d5bcfc2f768d150e417dc28b032 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bd4bcaa4a524d5bcfc2f768d150e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:35:19 2023 +0100 ole32/tests: Remove unused variable. --- dlls/ole32/tests/moniker.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9c583d27c47..75d24681ab5 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1144,13 +1144,12 @@ static IParseDisplayName ParseDisplayName = { &ParseDisplayName_Vtbl }; static int count_moniker_matches(IBindCtx * pbc, IEnumMoniker * spEM) { IMoniker * spMoniker; - int monCnt=0, matchCnt=0; + int matchCnt = 0; while ((IEnumMoniker_Next(spEM, 1, &spMoniker, NULL)==S_OK)) { HRESULT hr; WCHAR * szDisplayn; - monCnt++; hr=IMoniker_GetDisplayName(spMoniker, pbc, NULL, &szDisplayn); if (SUCCEEDED(hr)) {

1 0

Tim Clem : winemac.drv: Move surface-related logs to the bitblt channel.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 7c45c7c5ebb59237d568a4e5b38626422e670b63 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c45c7c5ebb59237d568a4e5b38626… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Nov 17 10:17:24 2023 -0800 winemac.drv: Move surface-related logs to the bitblt channel. The logs in this file are very noisy. x11drv uses the bitblt channel for its analogous messages. --- dlls/winemac.drv/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 5306e3b619f..8b238ff4853 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -29,7 +29,7 @@ #include "macdrv.h" #include "winuser.h" -WINE_DEFAULT_DEBUG_CHANNEL(macdrv); +WINE_DEFAULT_DEBUG_CHANNEL(bitblt); /* only for use on sanitized BITMAPINFO structures */

1 0

Alistair Leslie-Hughes : msado15: Updating recordset EditMode when field value changes.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: a85055ee6c5d59ed4258a5501fa072ecae8816e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a85055ee6c5d59ed4258a5501fa072… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 12 12:23:21 2023 +1100 msado15: Updating recordset EditMode when field value changes. We need to know what type of Edit we are Performing, eg AddNew or Updated existing. --- dlls/msado15/recordset.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 2b936f5c096..d64ccdeee3d 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -298,6 +298,10 @@ static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) if ((hr = VariantCopy( &copy, &val )) != S_OK) return hr; field->recordset->data[row * col_count + col] = copy; + + if (field->recordset->editmode != adEditNone) + field->recordset->editmode = adEditInProgress; + return S_OK; }

1 0

Alexandros Frantzis : winewayland.drv: Add skeleton Vulkan driver.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: f6e800172b11a25ed8bb3a62e060559ccf3f97e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6e800172b11a25ed8bb3a62e06055… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 15 18:33:07 2021 +0300 winewayland.drv: Add skeleton Vulkan driver. --- dlls/winewayland.drv/Makefile.in | 1 + dlls/winewayland.drv/vulkan.c | 80 ++++++++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 3 +- 4 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/Makefile.in b/dlls/winewayland.drv/Makefile.in index 95ddbcedf8b..fa2beaad79c 100644 --- a/dlls/winewayland.drv/Makefile.in +++ b/dlls/winewayland.drv/Makefile.in @@ -8,6 +8,7 @@ SOURCES = \ dllmain.c \ version.rc \ viewporter.xml \ + vulkan.c \ wayland.c \ wayland_keyboard.c \ wayland_output.c \ diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c new file mode 100644 index 00000000000..f807256c9e4 --- /dev/null +++ b/dlls/winewayland.drv/vulkan.c @@ -0,0 +1,80 @@ +/* WAYLANDDRV Vulkan implementation + * + * Copyright 2017 Roderick Colenbrander + * Copyright 2021 Alexandros Frantzis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <dlfcn.h> + +#include "waylanddrv.h" +#include "wine/debug.h" + +#define VK_NO_PROTOTYPES +#define WINE_VK_HOST + +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vulkan); + +#ifdef SONAME_LIBVULKAN + +static void *vulkan_handle; + +static void wine_vk_init(void) +{ + if (!(vulkan_handle = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) + ERR("Failed to load %s.\n", SONAME_LIBVULKAN); +} + +static const struct vulkan_funcs vulkan_funcs; + +/********************************************************************** + * WAYLAND_wine_get_vulkan_driver + */ +const struct vulkan_funcs *WAYLAND_wine_get_vulkan_driver(UINT version) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + + if (version != WINE_VULKAN_DRIVER_VERSION) + { + ERR("version mismatch, vulkan wants %u but driver has %u\n", version, WINE_VULKAN_DRIVER_VERSION); + return NULL; + } + + pthread_once(&init_once, wine_vk_init); + if (vulkan_handle) + return &vulkan_funcs; + + return NULL; +} + +#else /* No vulkan */ + +const struct vulkan_funcs *WAYLAND_wine_get_vulkan_driver(UINT version) +{ + ERR("Wine was built without Vulkan support.\n"); + return NULL; +} + +#endif /* SONAME_LIBVULKAN */ diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 6bb30447f30..9bc6aedf356 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -297,5 +297,6 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, BOOL WAYLAND_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, struct window_surface **surface) DECLSPEC_HIDDEN; +const struct vulkan_funcs *WAYLAND_wine_get_vulkan_driver(UINT version) DECLSPEC_HIDDEN; #endif /* __WINE_WAYLANDDRV_H */ diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index 7151d7b931a..be898f9e2c3 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -38,7 +38,8 @@ static const struct user_driver_funcs waylanddrv_funcs = .pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices, .pWindowMessage = WAYLAND_WindowMessage, .pWindowPosChanged = WAYLAND_WindowPosChanged, - .pWindowPosChanging = WAYLAND_WindowPosChanging + .pWindowPosChanging = WAYLAND_WindowPosChanging, + .pwine_get_vulkan_driver = WAYLAND_wine_get_vulkan_driver, }; static NTSTATUS waylanddrv_unix_init(void *arg)

1 0

Alexandros Frantzis : winewayland.drv: Implement vkEnumerateInstanceExtensionProperties.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: a9ed32b0bf6566ecce948e7d95927ffb5a9cdefc URL: https://gitlab.winehq.org/wine/wine/-/commit/a9ed32b0bf6566ecce948e7d95927f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Sep 20 10:34:43 2021 +0300 winewayland.drv: Implement vkEnumerateInstanceExtensionProperties. Return the native instance extension properties, substituting VK_KHR_wayland_surface for VK_KHR_win32_surface. --- dlls/winewayland.drv/vulkan.c | 62 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index f807256c9e4..81d109acd8f 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -39,15 +39,75 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN +static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); + static void *vulkan_handle; +static VkResult wayland_vkEnumerateInstanceExtensionProperties(const char *layer_name, + uint32_t *count, + VkExtensionProperties* properties) +{ + unsigned int i; + VkResult res; + + TRACE("layer_name %s, count %p, properties %p\n", debugstr_a(layer_name), count, properties); + + /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ + if (layer_name) + { + ERR("Layer enumeration not supported from ICD.\n"); + return VK_ERROR_LAYER_NOT_PRESENT; + } + + /* We will return the same number of instance extensions reported by the host back to + * winevulkan. Along the way we may replace xlib extensions with their win32 equivalents. + * Winevulkan will perform more detailed filtering as it knows whether it has thunks + * for a particular extension. + */ + res = pvkEnumerateInstanceExtensionProperties(layer_name, count, properties); + if (!properties || res < 0) + return res; + + for (i = 0; i < *count; i++) + { + /* For now the only wayland extension we need to fixup. Long-term we may need an array. */ + if (!strcmp(properties[i].extensionName, "VK_KHR_wayland_surface")) + { + TRACE("Substituting VK_KHR_wayland_surface for VK_KHR_win32_surface\n"); + + snprintf(properties[i].extensionName, sizeof(properties[i].extensionName), + VK_KHR_WIN32_SURFACE_EXTENSION_NAME); + properties[i].specVersion = VK_KHR_WIN32_SURFACE_SPEC_VERSION; + } + } + + TRACE("Returning %u extensions.\n", *count); + return res; +} + static void wine_vk_init(void) { if (!(vulkan_handle = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) + { ERR("Failed to load %s.\n", SONAME_LIBVULKAN); + return; + } + +#define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail + LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); +#undef LOAD_FUNCPTR + + return; + +fail: + dlclose(vulkan_handle); + vulkan_handle = NULL; } -static const struct vulkan_funcs vulkan_funcs; +static const struct vulkan_funcs vulkan_funcs = +{ + .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, +}; /********************************************************************** * WAYLAND_wine_get_vulkan_driver

1 0

Alexandros Frantzis : winewayland.drv: Implement vkCreateInstance.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: bd0d88261d3d8f9436d3a1c53ef7345640893ae5 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd0d88261d3d8f9436d3a1c53ef734… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 15 18:41:32 2021 +0300 winewayland.drv: Implement vkCreateInstance. Create a Vulkan instance, ensuring we use the proper (Wayland) SurfaceKHR extension when forwarding the request to the native Vulkan platform. --- dlls/winewayland.drv/vulkan.c | 75 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 81d109acd8f..7f0f5652f97 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -25,6 +25,7 @@ #include "config.h" #include <dlfcn.h> +#include <stdlib.h> #include "waylanddrv.h" #include "wine/debug.h" @@ -39,10 +40,82 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN +static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); static void *vulkan_handle; +/* Helper function for converting between win32 and Wayland compatible VkInstanceCreateInfo. + * Caller is responsible for allocation and cleanup of 'dst'. */ +static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, + VkInstanceCreateInfo *dst) +{ + unsigned int i; + const char **enabled_extensions = NULL; + + dst->sType = src->sType; + dst->flags = src->flags; + dst->pApplicationInfo = src->pApplicationInfo; + dst->pNext = src->pNext; + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + dst->enabledExtensionCount = 0; + dst->ppEnabledExtensionNames = NULL; + + if (src->enabledExtensionCount > 0) + { + enabled_extensions = calloc(src->enabledExtensionCount, + sizeof(*src->ppEnabledExtensionNames)); + if (!enabled_extensions) + { + ERR("Failed to allocate memory for enabled extensions\n"); + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + + for (i = 0; i < src->enabledExtensionCount; i++) + { + /* Substitute extension with Wayland ones else copy. Long-term, when we + * support more extensions, we should store these in a list. */ + if (!strcmp(src->ppEnabledExtensionNames[i], "VK_KHR_win32_surface")) + enabled_extensions[i] = "VK_KHR_wayland_surface"; + else + enabled_extensions[i] = src->ppEnabledExtensionNames[i]; + } + dst->ppEnabledExtensionNames = enabled_extensions; + dst->enabledExtensionCount = src->enabledExtensionCount; + } + + return VK_SUCCESS; +} + +static VkResult wayland_vkCreateInstance(const VkInstanceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, + VkInstance *instance) +{ + VkInstanceCreateInfo create_info_host; + VkResult res; + + TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + /* Perform a second pass on converting VkInstanceCreateInfo. Winevulkan + * performed a first pass in which it handles everything except for WSI + * functionality such as VK_KHR_win32_surface. Handle this now. */ + res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + ERR("Failed to convert instance create info, res=%d\n", res); + return res; + } + + res = pvkCreateInstance(&create_info_host, NULL /* allocator */, instance); + + free((void *)create_info_host.ppEnabledExtensionNames); + return res; +} + static VkResult wayland_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties* properties) @@ -94,6 +167,7 @@ static void wine_vk_init(void) } #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail + LOAD_FUNCPTR(vkCreateInstance); LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); #undef LOAD_FUNCPTR @@ -106,6 +180,7 @@ fail: static const struct vulkan_funcs vulkan_funcs = { + .p_vkCreateInstance = wayland_vkCreateInstance, .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, };

1 0

Alexandros Frantzis : winewayland.drv: Implement vkDestroyInstance.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 36a2e6b1f1b4c1fe47d2c4af533c17704a1f2721 URL: https://gitlab.winehq.org/wine/wine/-/commit/36a2e6b1f1b4c1fe47d2c4af533c17… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 15 18:44:10 2021 +0300 winewayland.drv: Implement vkDestroyInstance. --- dlls/winewayland.drv/vulkan.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 7f0f5652f97..9b8ee6ee9e2 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBVULKAN static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); +static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); static void *vulkan_handle; @@ -116,6 +117,17 @@ static VkResult wayland_vkCreateInstance(const VkInstanceCreateInfo *create_info return res; } +static void wayland_vkDestroyInstance(VkInstance instance, + const VkAllocationCallbacks *allocator) +{ + TRACE("%p %p\n", instance, allocator); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + pvkDestroyInstance(instance, NULL /* allocator */); +} + static VkResult wayland_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties* properties) @@ -168,6 +180,7 @@ static void wine_vk_init(void) #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail LOAD_FUNCPTR(vkCreateInstance); + LOAD_FUNCPTR(vkDestroyInstance); LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); #undef LOAD_FUNCPTR @@ -181,6 +194,7 @@ fail: static const struct vulkan_funcs vulkan_funcs = { .p_vkCreateInstance = wayland_vkCreateInstance, + .p_vkDestroyInstance = wayland_vkDestroyInstance, .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, };

1 0

Alexandros Frantzis : winewayland.drv: Implement vkGetDeviceProcAddr and vkGetInstanceProcAddr.
by Alexandre Julliard 17 Nov '23

17 Nov '23

Module: wine Branch: master Commit: 902465f23603586fdb4f601c91618982f4071fe4 URL: https://gitlab.winehq.org/wine/wine/-/commit/902465f23603586fdb4f601c916189… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Sep 20 10:56:18 2021 +0300 winewayland.drv: Implement vkGetDeviceProcAddr and vkGetInstanceProcAddr. --- dlls/winewayland.drv/vulkan.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 9b8ee6ee9e2..d22b8401422 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -43,8 +43,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); +static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); +static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); static void *vulkan_handle; +static const struct vulkan_funcs vulkan_funcs; /* Helper function for converting between win32 and Wayland compatible VkInstanceCreateInfo. * Caller is responsible for allocation and cleanup of 'dst'. */ @@ -170,6 +173,30 @@ static VkResult wayland_vkEnumerateInstanceExtensionProperties(const char *layer return res; } +static void *wayland_vkGetDeviceProcAddr(VkDevice device, const char *name) +{ + void *proc_addr; + + TRACE("%p, %s\n", device, debugstr_a(name)); + + if ((proc_addr = get_vulkan_driver_device_proc_addr(&vulkan_funcs, name))) + return proc_addr; + + return pvkGetDeviceProcAddr(device, name); +} + +static void *wayland_vkGetInstanceProcAddr(VkInstance instance, const char *name) +{ + void *proc_addr; + + TRACE("%p, %s\n", instance, debugstr_a(name)); + + if ((proc_addr = get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name))) + return proc_addr; + + return pvkGetInstanceProcAddr(instance, name); +} + static void wine_vk_init(void) { if (!(vulkan_handle = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) @@ -182,6 +209,8 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkCreateInstance); LOAD_FUNCPTR(vkDestroyInstance); LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); + LOAD_FUNCPTR(vkGetDeviceProcAddr); + LOAD_FUNCPTR(vkGetInstanceProcAddr); #undef LOAD_FUNCPTR return; @@ -196,6 +225,8 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkCreateInstance = wayland_vkCreateInstance, .p_vkDestroyInstance = wayland_vkDestroyInstance, .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, + .p_vkGetDeviceProcAddr = wayland_vkGetDeviceProcAddr, + .p_vkGetInstanceProcAddr = wayland_vkGetInstanceProcAddr, }; /**********************************************************************

1 0