- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Store the nsevent listener descs in a table.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: bc286247c4af1b84aa831941af1ef31d4f12707d URL: https://gitlab.winehq.org/wine/wine/-/commit/bc286247c4af1b84aa831941af1ef3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Store the nsevent listener descs in a table. Rather than hardcoding them individually, so that it's all in one place when adding new ones. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsevents.c | 79 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 305a017d978..d70fea67ca4 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -37,16 +37,45 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define EVENTLISTENER_VTBL(handler) \ + { \ + nsDOMEventListener_QueryInterface, \ + nsDOMEventListener_AddRef, \ + nsDOMEventListener_Release, \ + handler, \ + } +static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener*,nsIIDRef,void**); +static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener*); +static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener*); + typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; } nsEventListener; +static nsresult NSAPI handle_blur(nsIDOMEventListener*,nsIDOMEvent*); +static nsresult NSAPI handle_focus(nsIDOMEventListener*,nsIDOMEvent*); +static nsresult NSAPI handle_keypress(nsIDOMEventListener*,nsIDOMEvent*); +static nsresult NSAPI handle_load(nsIDOMEventListener*,nsIDOMEvent*); + +enum doc_event_listener_flags { + BUBBLES = 0x0001, + OVERRIDE = 0x0002, +}; + +static const struct { + eventid_t id; + enum doc_event_listener_flags flags; + nsIDOMEventListenerVtbl vtbl; +} doc_event_listeners[] = { + { EVENTID_BLUR, 0, EVENTLISTENER_VTBL(handle_blur) }, + { EVENTID_FOCUS, 0, EVENTLISTENER_VTBL(handle_focus) }, + { EVENTID_KEYPRESS, BUBBLES, EVENTLISTENER_VTBL(handle_keypress) }, + { EVENTID_LOAD, OVERRIDE, EVENTLISTENER_VTBL(handle_load), }, +}; + struct nsDocumentEventListener { - nsEventListener blur_listener; - nsEventListener focus_listener; - nsEventListener keypress_listener; - nsEventListener load_listener; + nsEventListener listener[ARRAY_SIZE(doc_event_listeners)]; nsEventListener htmlevent_listener; LONG ref; @@ -346,18 +375,6 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } -#define EVENTLISTENER_VTBL(handler) \ - { \ - nsDOMEventListener_QueryInterface, \ - nsDOMEventListener_AddRef, \ - nsDOMEventListener_Release, \ - handler, \ - } - -static const nsIDOMEventListenerVtbl blur_vtbl = EVENTLISTENER_VTBL(handle_blur); -static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_focus); -static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); -static const nsIDOMEventListenerVtbl load_vtbl = EVENTLISTENER_VTBL(handle_load); static const nsIDOMEventListenerVtbl htmlevent_vtbl = EVENTLISTENER_VTBL(handle_htmlevent); static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, @@ -438,16 +455,15 @@ void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) void release_nsevents(HTMLDocumentNode *doc) { nsDocumentEventListener *listener = doc->nsevent_listener; + unsigned i; TRACE("%p %p\n", doc, doc->nsevent_listener); if(!listener) return; - detach_nslistener(doc, L"blur", &listener->blur_listener, TRUE); - detach_nslistener(doc, L"focus", &listener->focus_listener, TRUE); - detach_nslistener(doc, L"keypress", &listener->keypress_listener, FALSE); - detach_nslistener(doc, L"load", &listener->load_listener, TRUE); + for(i = 0; i < ARRAY_SIZE(doc_event_listeners); i++) + detach_nslistener(doc, get_event_name(doc_event_listeners[i].id), &listener->listener[i], !(doc_event_listeners[i].flags & BUBBLES)); listener->doc = NULL; release_listener(listener); @@ -458,6 +474,7 @@ void init_nsevents(HTMLDocumentNode *doc) { nsDocumentEventListener *listener; nsIDOMEventTarget *target; + unsigned i; listener = heap_alloc(sizeof(nsDocumentEventListener)); if(!listener) @@ -468,11 +485,9 @@ void init_nsevents(HTMLDocumentNode *doc) listener->ref = 1; listener->doc = doc; - init_listener(&listener->blur_listener, listener, &blur_vtbl); - init_listener(&listener->focus_listener, listener, &focus_vtbl); - init_listener(&listener->keypress_listener, listener, &keypress_vtbl); - init_listener(&listener->load_listener, listener, &load_vtbl); - init_listener(&listener->htmlevent_listener, listener, &htmlevent_vtbl); + for(i = 0; i < ARRAY_SIZE(doc_event_listeners); i++) + init_listener(&listener->listener[i], listener, &doc_event_listeners[i].vtbl); + init_listener(&listener->htmlevent_listener, listener, &htmlevent_vtbl); doc->nsevent_listener = listener; @@ -480,13 +495,13 @@ void init_nsevents(HTMLDocumentNode *doc) if(!target) return; - init_event(target, L"blur", &listener->blur_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, L"focus", &listener->focus_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, L"keypress", &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); - init_event(target, L"load", &listener->load_listener.nsIDOMEventListener_iface, TRUE); + for(i = 0; i < ARRAY_SIZE(doc_event_listeners); i++) { + init_event(target, get_event_name(doc_event_listeners[i].id), &listener->listener[i].nsIDOMEventListener_iface, + !(doc_event_listeners[i].flags & BUBBLES)); - nsIDOMEventTarget_Release(target); + if(doc_event_listeners[i].flags & OVERRIDE) + doc->event_vector[doc_event_listeners[i].id] = TRUE; + } - /* handle_load already takes care of dispatching the load event */ - doc->event_vector[EVENTID_LOAD] = TRUE; + nsIDOMEventTarget_Release(target); }

1 0

Gabriel Ivăncescu : mshtml: Allow EVENT_BIND_TO_TARGET to bind to the window.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 574e207ab722b319d923294e5f431d0d615aa5d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/574e207ab722b319d923294e5f431d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Allow EVENT_BIND_TO_TARGET to bind to the window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f2c862c5b0a..e669afb7483 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3683,10 +3683,7 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, ev if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { nsnode = NULL; - }else if(event_info[eid].flags & EVENT_BIND_TO_TARGET) { - if(!nsnode) - nsnode = doc->node.nsnode; - }else { + }else if(!(event_info[eid].flags & EVENT_BIND_TO_TARGET)) { return S_OK; }

1 0

Gabriel Ivăncescu : mshtml: Do not register Gecko load event handler twice.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: f658f68d63c3feb4b5e3da111b1970c7f902565a URL: https://gitlab.winehq.org/wine/wine/-/commit/f658f68d63c3feb4b5e3da111b1970… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 18 17:20:27 2022 +0200 mshtml: Do not register Gecko load event handler twice. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsevents.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index a8e3d503921..65de8c8c2e3 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -482,4 +482,7 @@ void init_nsevents(HTMLDocumentNode *doc) init_event(target, L"load", &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); + + /* handle_load already takes care of dispatching the load event */ + doc->event_vector[EVENTID_LOAD] = TRUE; }

1 0

Jacek Caban : winevulkan: Return error if vkMapMemory would truncate pointer on wow64.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 87a3357900015b3da18fbdf216b2a0d4c90140a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/87a3357900015b3da18fbdf216b2a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 16 20:54:51 2022 +0100 winevulkan: Return error if vkMapMemory would truncate pointer on wow64. --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 21 +++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d02ebbe6b0d..71571bec180 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -209,6 +209,7 @@ FUNCTION_OVERRIDES = { "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkMapMemory" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.PRIVATE}, # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ac586c4dbf6..bd02edde4b6 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1441,6 +1441,27 @@ void wine_vkDestroySurfaceKHR(VkInstance handle, VkSurfaceKHR surface, free(object); } +VkResult wine_vkMapMemory(VkDevice handle, VkDeviceMemory memory, VkDeviceSize offset, + VkDeviceSize size, VkMemoryMapFlags flags, void **data) +{ + struct wine_device *device = wine_device_from_handle(handle); + VkResult result; + + result = device->funcs.p_vkMapMemory(device->device, memory, offset, size, flags, data); + +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset && result == VK_SUCCESS && (UINT_PTR)*data >> 32) + { + FIXME("returned mapping %p does not fit 32-bit pointer\n", *data); + device->funcs.p_vkUnmapMemory(device->device, memory); + *data = NULL; + result = VK_ERROR_OUT_OF_HOST_MEMORY; + } +#endif + + return result; +} + static inline void adjust_max_image_count(struct wine_phys_dev *phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 3cb8762f146..98dd8b5eb97 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -38235,7 +38235,7 @@ static NTSTATUS thunk64_vkMapMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); - params->result = wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); + params->result = wine_vkMapMemory(params->device, params->memory, params->offset, params->size, params->flags, params->ppData); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -38255,7 +38255,7 @@ static NTSTATUS thunk32_vkMapMemory(void *args) TRACE("%#x, 0x%s, 0x%s, 0x%s, %#x, %#x\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); - params->result = wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkMapMemory(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->device, params->memory, params->offset, params->size, params->flags, (void **)UlongToPtr(params->ppData)); + params->result = wine_vkMapMemory((VkDevice)UlongToPtr(params->device), params->memory, params->offset, params->size, params->flags, (void **)UlongToPtr(params->ppData)); return STATUS_SUCCESS; } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 24c94e2b5ee..62e92c8a59f 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -50,6 +50,7 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physica VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; +VkResult wine_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData) DECLSPEC_HIDDEN; /* For use by vkDevice and children */ struct vulkan_device_funcs

1 0

Akihiro Sagawa : include: Fix typo in IN4ADDR_LOOPBACK_INIT.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 6521c09d3a075759b3253d96f4503e6d557c10c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6521c09d3a075759b3253d96f4503e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 18 22:32:45 2022 +0900 include: Fix typo in IN4ADDR_LOOPBACK_INIT. --- include/mstcpip.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mstcpip.h b/include/mstcpip.h index 08201f4ea8f..c7dffd55f12 100644 --- a/include/mstcpip.h +++ b/include/mstcpip.h @@ -46,7 +46,7 @@ struct tcp_keepalive #define RCVALL_SOCKETLEVELONLY 2 #define IN4ADDR_ANY_INIT { 0, 0, 0, 0 } -#define IN4ADDR_LOOPBACK_INIT { 126, 0, 0, 1 } +#define IN4ADDR_LOOPBACK_INIT { 127, 0, 0, 1 } #define IN4ADDR_BROADCAST_INIT { 255, 255, 255, 255 } #define IN4ADDR_ALLNODESONLINK_INIT { 224, 0, 0, 1 } #define IN4ADDR_ALLROUTERSONLINK_INIT { 224, 0, 0, 2 } @@ -74,7 +74,7 @@ struct tcp_keepalive #define WS_RCVALL_SOCKETLEVELONLY 2 #define WS_IN4ADDR_ANY_INIT { 0, 0, 0, 0 } -#define WS_IN4ADDR_LOOPBACK_INIT { 126, 0, 0, 1 } +#define WS_IN4ADDR_LOOPBACK_INIT { 127, 0, 0, 1 } #define WS_IN4ADDR_BROADCAST_INIT { 255, 255, 255, 255 } #define WS_IN4ADDR_ALLNODESONLINK_INIT { 224, 0, 0, 1 } #define WS_IN4ADDR_ALLROUTERSONLINK_INIT { 224, 0, 0, 2 }

1 0

Jacek Caban : winevulkan: Add __wine_unix_call_wow64_funcs support.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 5135cabb0214ef1ce1ebaabb429dc883b3e10630 URL: https://gitlab.winehq.org/wine/wine/-/commit/5135cabb0214ef1ce1ebaabb429dc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 23 21:37:20 2022 +0200 winevulkan: Add __wine_unix_call_wow64_funcs support. --- dlls/winevulkan/make_vulkan | 47 +- dlls/winevulkan/vulkan_private.h | 4 - dlls/winevulkan/vulkan_thunks.c | 5118 ++++++++------------------------------ 3 files changed, 1120 insertions(+), 4049 deletions(-)

1 0

Jacek Caban : winevulkan: Use separated implementations for all 32-bit Unix calls.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: eb062df5ba9bf259bec995cb0a0017544963311e URL: https://gitlab.winehq.org/wine/wine/-/commit/eb062df5ba9bf259bec995cb0a0017… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 23 20:19:00 2022 +0200 winevulkan: Use separated implementations for all 32-bit Unix calls. --- dlls/winevulkan/loader.c | 6 ++---- dlls/winevulkan/make_vulkan | 6 +++--- dlls/winevulkan/vulkan.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 3 +++ dlls/winevulkan/vulkan_thunks.c | 6 +++--- 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index cddcd0360ac..a86a35b0d40 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); -NTSTATUS (WINAPI *p_vk_direct_unix_call)(unixlib_handle_t handle, unsigned int code, void *args); +NTSTATUS (WINAPI *p_vk_direct_unix_call)(unixlib_handle_t handle, unsigned int code, void *args) = __wine_unix_call; unixlib_handle_t unix_handle; static HINSTANCE hinstance; @@ -239,9 +239,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) &unix_handle, sizeof(unix_handle), NULL)) return FALSE; - if (vk_unix_call(unix_init, &p_vk_direct_unix_call)) return FALSE; - if (!p_vk_direct_unix_call) p_vk_direct_unix_call = __wine_unix_call; - return TRUE; + return !vk_unix_call(unix_init, &p_vk_direct_unix_call); } static BOOL wine_vk_init_once(void) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8943be3e3e2..f8c87f27353 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2686,9 +2686,9 @@ class VkGenerator(object): f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") f.write("{\n") - f.write(" init_vulkan,\n") - f.write(" vk_is_available_instance_function,\n") - f.write(" vk_is_available_device_function,\n") + f.write(" init_vulkan32,\n") + f.write(" vk_is_available_instance_function32,\n") + f.write(" vk_is_available_device_function32,\n") for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4f949d0b42d..ac586c4dbf6 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -410,6 +410,8 @@ static void wine_vk_device_free(struct wine_device *device) free(device); } +#ifdef _WIN64 + NTSTATUS init_vulkan(void *args) { vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); @@ -424,6 +426,23 @@ NTSTATUS init_vulkan(void *args) return STATUS_SUCCESS; } +#endif /* _WIN64 */ + +NTSTATUS init_vulkan32(void *args) +{ + vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); + if (!vk_funcs) + { + ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); + return STATUS_UNSUCCESSFUL; + } + +#ifndef _WIN64 + *(void **)args = vk_direct_unix_call; +#endif + return STATUS_SUCCESS; +} + /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. @@ -1587,6 +1606,8 @@ void wine_vkDestroyDebugReportCallbackEXT(VkInstance handle, VkDebugReportCallba free(object); } +#ifdef _WIN64 + NTSTATUS vk_is_available_instance_function(void *arg) { struct is_available_instance_function_params *params = arg; @@ -1600,3 +1621,27 @@ NTSTATUS vk_is_available_device_function(void *arg) struct wine_device *device = wine_device_from_handle(params->device); return !!vk_funcs->p_vkGetDeviceProcAddr(device->device, params->name); } + +#endif /* _WIN64 */ + +NTSTATUS vk_is_available_instance_function32(void *arg) +{ + struct + { + UINT32 instance; + UINT32 name; + } *params = arg; + struct wine_instance *instance = wine_instance_from_handle(UlongToPtr(params->instance)); + return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, UlongToPtr(params->name)); +} + +NTSTATUS vk_is_available_device_function32(void *arg) +{ + struct + { + UINT32 device; + UINT32 name; + } *params = arg; + struct wine_device *device = wine_device_from_handle(UlongToPtr(params->device)); + return !!vk_funcs->p_vkGetDeviceProcAddr(device->device, UlongToPtr(params->name)); +} diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index dc90f3a0c59..5fcfc2a5978 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -233,11 +233,14 @@ BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; NTSTATUS init_vulkan(void *args) DECLSPEC_HIDDEN; +NTSTATUS init_vulkan32(void *args) DECLSPEC_HIDDEN; NTSTATUS WINAPI vk_direct_unix_call(unixlib_handle_t handle, unsigned int code, void *arg) DECLSPEC_HIDDEN; NTSTATUS vk_is_available_instance_function(void *arg) DECLSPEC_HIDDEN; NTSTATUS vk_is_available_device_function(void *arg) DECLSPEC_HIDDEN; +NTSTATUS vk_is_available_instance_function32(void *arg) DECLSPEC_HIDDEN; +NTSTATUS vk_is_available_device_function32(void *arg) DECLSPEC_HIDDEN; struct conversion_context { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index d1dac5fbe68..eb801be6fcd 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -42999,9 +42999,9 @@ C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count); const unixlib_entry_t __wine_unix_call_funcs[] = { - init_vulkan, - vk_is_available_instance_function, - vk_is_available_device_function, + init_vulkan32, + vk_is_available_instance_function32, + vk_is_available_device_function32, thunk32_vkAcquireNextImage2KHR, thunk32_vkAcquireNextImageKHR, thunk32_vkAcquirePerformanceConfigurationINTEL,

1 0

Jacek Caban : winevulkan: Always convert 32-bit pointer arrays.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 46f84ea226184d79401118b68f6b450fe2e531d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/46f84ea226184d79401118b68f6b45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 16:51:43 2022 +0100 winevulkan: Always convert 32-bit pointer arrays. --- dlls/winevulkan/make_vulkan | 23 ++++++++--------- dlls/winevulkan/vulkan_thunks.c | 55 +++++++++++++++++++++++++++++++++++------ 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 79cc1c8f4af..8943be3e3e2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1306,10 +1306,6 @@ class VkVariable(object): if not conv or not self.needs_ptr32_type() or (not self.is_pointer() and self.type == "size_t"): return prefix + self.name - # FIXME: Use conversion instead - if self.name in ["ppUsageCounts", "ppEnabledLayerNames", "ppEnabledExtensionNames"]: - return "UlongToPtr({0}{1})".format(prefix, self.name) - cast_type = "" if self.const: cast_type += "const " @@ -1533,6 +1529,9 @@ class VkMember(VkVariable): # returnedonly members don't needs input conversions if not self.is_pointer() and self.returnedonly: return False + # pointer arrays always need input conversion + if conv and self.is_dynamic_array() and self.pointer_array: + return True if self.is_handle(): if unwrap and self.handle.is_wrapped(): @@ -2457,21 +2456,21 @@ class ArrayConversionFunction(object): body += " convert_{0}_{1}({2}&in[i], &out[i]);\n".format( struct.name, conv_suffix, ctx_part) else: - body += " if (in[i])\n" - body += " {\n" - body += " out[i] = conversion_context_alloc(ctx, sizeof(*out[i]));\n" if struct.needs_conversion(self.conv, self.unwrap, self.direction, False): + body += " if (in[i])\n" + body += " {\n" + body += " out[i] = conversion_context_alloc(ctx, sizeof(*out[i]));\n" if self.conv: in_param = "({0} *)UlongToPtr(in[i])".format(win_type) else: in_param = "in[i]" body += " convert_{0}_{1}({2}{3}, out[i]);\n".format( struct.name, conv_suffix, ctx_part, in_param) + body += " }\n" + body += " else\n" + body += " out[i] = NULL;\n" else: - body += " *out[i] = *in[i];\n".format(win_type) - body += " }\n" - body += " else\n" - body += " out[i] = NULL;\n" + body += " out[i] = UlongToPtr(in[i]);\n".format(win_type) elif self.array.is_handle(): if self.array.pointer_array: LOGGER.error("Unhandled handle pointer arrays") @@ -2489,6 +2488,8 @@ class ArrayConversionFunction(object): body += " out[i] = " + handle.driver_handle(input) + ";\n" else: LOGGER.warning("Unhandled handle output conversion") + elif self.array.pointer_array: + body += " out[i] = UlongToPtr(in[i]);\n" else: body += " out[i] = in[i];\n" diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 303f3c640c4..d1dac5fbe68 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -6485,7 +6485,25 @@ static inline const VkAccelerationStructureBuildGeometryInfoKHR *convert_VkAccel #endif /* USE_STRUCT_CONVERSION */ #if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromapBuildInfoEXT32 *in, VkMicromapBuildInfoEXT *out) +static inline const VkMicromapUsageEXT * const*convert_VkMicromapUsageEXT_pointer_array_win32_to_host(struct conversion_context *ctx, const PTR32 *in, uint32_t count) +{ + VkMicromapUsageEXT **out; + unsigned int i; + + if (!in || !count) return NULL; + + out = conversion_context_alloc(ctx, count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i] = UlongToPtr(in[i]); + } + + return (void *)out; +} +#endif /* USE_STRUCT_CONVERSION */ + +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(struct conversion_context *ctx, const VkMicromapBuildInfoEXT32 *in, VkMicromapBuildInfoEXT *out) { if (!in) return; @@ -6497,7 +6515,7 @@ static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(const VkMicromap out->dstMicromap = in->dstMicromap; out->usageCountsCount = in->usageCountsCount; out->pUsageCounts = (const VkMicromapUsageEXT *)UlongToPtr(in->pUsageCounts); - out->ppUsageCounts = UlongToPtr(in->ppUsageCounts); + out->ppUsageCounts = convert_VkMicromapUsageEXT_pointer_array_win32_to_host(ctx, (const PTR32 *)UlongToPtr(in->ppUsageCounts), in->usageCountsCount); out->data = in->data; out->scratchData = in->scratchData; out->triangleArray = in->triangleArray; @@ -6516,7 +6534,7 @@ static inline const VkMicromapBuildInfoEXT *convert_VkMicromapBuildInfoEXT_array out = conversion_context_alloc(ctx, count * sizeof(*out)); for (i = 0; i < count; i++) { - convert_VkMicromapBuildInfoEXT_win32_to_host(&in[i], &out[i]); + convert_VkMicromapBuildInfoEXT_win32_to_host(ctx, &in[i], &out[i]); } return out; @@ -9156,6 +9174,24 @@ static inline const VkDeviceQueueCreateInfo *convert_VkDeviceQueueCreateInfo_arr } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline const char * const*convert_char_pointer_array_win32_to_host(struct conversion_context *ctx, const PTR32 *in, uint32_t count) +{ + char **out; + unsigned int i; + + if (!in || !count) return NULL; + + out = conversion_context_alloc(ctx, count * sizeof(*out)); + for (i = 0; i < count; i++) + { + out[i] = UlongToPtr(in[i]); + } + + return (void *)out; +} +#endif /* USE_STRUCT_CONVERSION */ + #if !defined(USE_STRUCT_CONVERSION) static inline void convert_VkDeviceCreateInfo_win64_to_host(struct conversion_context *ctx, const VkDeviceCreateInfo *in, VkDeviceCreateInfo *out) { @@ -10985,9 +11021,9 @@ static inline void convert_VkDeviceCreateInfo_win32_to_host(struct conversion_co out->queueCreateInfoCount = in->queueCreateInfoCount; out->pQueueCreateInfos = convert_VkDeviceQueueCreateInfo_array_win32_to_host(ctx, (const VkDeviceQueueCreateInfo32 *)UlongToPtr(in->pQueueCreateInfos), in->queueCreateInfoCount); out->enabledLayerCount = in->enabledLayerCount; - out->ppEnabledLayerNames = UlongToPtr(in->ppEnabledLayerNames); + out->ppEnabledLayerNames = convert_char_pointer_array_win32_to_host(ctx, (const PTR32 *)UlongToPtr(in->ppEnabledLayerNames), in->enabledLayerCount); out->enabledExtensionCount = in->enabledExtensionCount; - out->ppEnabledExtensionNames = UlongToPtr(in->ppEnabledExtensionNames); + out->ppEnabledExtensionNames = convert_char_pointer_array_win32_to_host(ctx, (const PTR32 *)UlongToPtr(in->ppEnabledExtensionNames), in->enabledExtensionCount); out->pEnabledFeatures = (const VkPhysicalDeviceFeatures *)UlongToPtr(in->pEnabledFeatures); for (in_header = UlongToPtr(in->pNext); in_header; in_header = UlongToPtr(in_header->pNext)) @@ -14519,9 +14555,9 @@ static inline void convert_VkInstanceCreateInfo_win32_to_host(struct conversion_ out->flags = in->flags; out->pApplicationInfo = convert_VkApplicationInfo_array_win32_to_host(ctx, (const VkApplicationInfo32 *)UlongToPtr(in->pApplicationInfo), 1); out->enabledLayerCount = in->enabledLayerCount; - out->ppEnabledLayerNames = UlongToPtr(in->ppEnabledLayerNames); + out->ppEnabledLayerNames = convert_char_pointer_array_win32_to_host(ctx, (const PTR32 *)UlongToPtr(in->ppEnabledLayerNames), in->enabledLayerCount); out->enabledExtensionCount = in->enabledExtensionCount; - out->ppEnabledExtensionNames = UlongToPtr(in->ppEnabledExtensionNames); + out->ppEnabledExtensionNames = convert_char_pointer_array_win32_to_host(ctx, (const PTR32 *)UlongToPtr(in->ppEnabledExtensionNames), in->enabledExtensionCount); for (in_header = UlongToPtr(in->pNext); in_header; in_header = UlongToPtr(in_header->pNext)) { @@ -38175,13 +38211,16 @@ static NTSTATUS thunk32_vkGetMicromapBuildSizesEXT(void *args) } *params = args; VkMicromapBuildInfoEXT pBuildInfo_host; VkMicromapBuildSizesInfoEXT pSizeInfo_host; + struct conversion_context ctx; TRACE("%#x, %#x, %#x, %#x\n", params->device, params->buildType, params->pBuildInfo, params->pSizeInfo); - convert_VkMicromapBuildInfoEXT_win32_to_host((const VkMicromapBuildInfoEXT32 *)UlongToPtr(params->pBuildInfo), &pBuildInfo_host); + init_conversion_context(&ctx); + convert_VkMicromapBuildInfoEXT_win32_to_host(&ctx, (const VkMicromapBuildInfoEXT32 *)UlongToPtr(params->pBuildInfo), &pBuildInfo_host); convert_VkMicromapBuildSizesInfoEXT_win32_to_host((VkMicromapBuildSizesInfoEXT32 *)UlongToPtr(params->pSizeInfo), &pSizeInfo_host); wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkGetMicromapBuildSizesEXT(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->device, params->buildType, &pBuildInfo_host, &pSizeInfo_host); convert_VkMicromapBuildSizesInfoEXT_host_to_win32(&pSizeInfo_host, (VkMicromapBuildSizesInfoEXT32 *)UlongToPtr(params->pSizeInfo)); + free_conversion_context(&ctx); return STATUS_SUCCESS; }

1 0

Jacek Caban : winevulkan: Use PTR32 for pointer-size variables in 32-bit structs.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 3eccac388dc5549acb5694f46adcd5061a21efc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3eccac388dc5549acb5694f46adcd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 15:19:13 2022 +0100 winevulkan: Use PTR32 for pointer-size variables in 32-bit structs. --- dlls/winevulkan/make_vulkan | 167 +- dlls/winevulkan/vulkan_thunks.c | 7436 +++++++++++++++++++-------------------- 2 files changed, 3844 insertions(+), 3759 deletions(-)

1 0

Jacek Caban : winevulkan: Never copy pNext pointer in 32-bit struct conversion functions.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 1396f04f024519c45eaf9bf84953b9f815336ea4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1396f04f024519c45eaf9bf84953b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 17:26:09 2022 +0100 winevulkan: Never copy pNext pointer in 32-bit struct conversion functions. --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 564 ++++++++++++++++++++++++++++++---------- 2 files changed, 427 insertions(+), 142 deletions(-)

1 0