June 2021 - Wine-Commits - list.winehq.org

Zhiyi Zhang : winex11.drv: Cache the current mode for detached outputs.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 0f820e9c942a3256cf62cd037fb16ea2c45a7ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f820e9c942a3256cf62cd03… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 21 17:09:18 2021 +0800 winex11.drv: Cache the current mode for detached outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index c3af35d8ec3..e3fa7a6e1d6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1390,6 +1390,7 @@ static void xrandr14_free_modes( DEVMODEW *modes ) static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) { + struct current_mode *mode_ptr = NULL; XRRScreenResources *screen_resources; XRROutputInfo *output_info = NULL; RROutput output = (RROutput)id; @@ -1406,13 +1407,15 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) continue; if (!current_modes[mode_idx].loaded) + { + mode_ptr = &current_modes[mode_idx]; break; + } memcpy( mode, &current_modes[mode_idx].mode, sizeof(*mode) ); LeaveCriticalSection( &current_modes_section ); return TRUE; } - LeaveCriticalSection( &current_modes_section ); screen_resources = xrandr_get_screen_resources(); if (!screen_resources) @@ -1473,21 +1476,15 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->u1.s2.dmPosition.y = crtc_info->y - primary.top; ret = TRUE; - EnterCriticalSection( &current_modes_section ); - for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) +done: + if (ret && mode_ptr) { - if (current_modes[mode_idx].id != id) - continue; - - memcpy( &current_modes[mode_idx].mode, mode, sizeof(*mode) ); - current_modes[mode_idx].mode.dmSize = sizeof(*mode); - current_modes[mode_idx].mode.dmDriverExtra = 0; - current_modes[mode_idx].loaded = TRUE; - break; + memcpy( &mode_ptr->mode, mode, sizeof(*mode) ); + mode_ptr->mode.dmSize = sizeof(*mode); + mode_ptr->mode.dmDriverExtra = 0; + mode_ptr->loaded = TRUE; } LeaveCriticalSection( &current_modes_section ); - -done: if (crtc_info) pXRRFreeCrtcInfo( crtc_info ); if (output_info)

1 0

Georg Lehmann : winevulkan: Unwrap params with objecttype.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 354370bdd6ea72ea7c74848b6920d80e25dcc8ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=354370bdd6ea72ea7c74848b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Jun 21 11:03:23 2021 +0200 winevulkan: Unwrap params with objecttype. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f758a58c935..662f1c8144e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1414,12 +1414,13 @@ class VkMember(object): class VkParam(object): """ Helper class which describes a parameter to a function call. """ - def __init__(self, type_info, const=None, pointer=None, name=None, array_len=None, dyn_array_len=None): + def __init__(self, type_info, const=None, pointer=None, name=None, array_len=None, dyn_array_len=None, object_type=None): self.const = const self.name = name self.array_len = array_len self.dyn_array_len = dyn_array_len self.pointer = pointer + self.object_type = object_type self.type_info = type_info self.type = type_info["name"] # For convenience self.handle = type_info["data"] if type_info["category"] == "handle" else None @@ -1457,12 +1458,15 @@ class VkParam(object): type_elem = param.find("type") pointer = type_elem.tail.strip() if type_elem.tail.strip() != "" else None + # Some uint64_t are actually handles with a separate type param + object_type = param.get("objecttype", None) + # Since we have parsed all types before hand, this should not happen. type_info = types.get(type_elem.text, None) if type_info is None: LOGGER.err("type info not found for: {0}".format(type_elem.text)) - return VkParam(type_info, const=const, pointer=pointer, name=name, array_len=array_len, dyn_array_len=dyn_array_len) + return VkParam(type_info, const=const, pointer=pointer, name=name, array_len=array_len, dyn_array_len=dyn_array_len, object_type=object_type) def _set_conversions(self): """ Internal helper function to configure any needed conversion functions. """ @@ -1790,6 +1794,9 @@ class VkParam(object): else: return "&{0}_host".format(self.name) else: + if self.object_type != None and self.type == "uint64_t": + return "wine_vk_unwrap_handle({0}, {1})".format(self.object_type, self.name) + # We need to pass the native handle to the native Vulkan calls and # the wine driver's handle to calls which are wrapped by the driver. driver_handle = self.handle.driver_handle(self.name) if self.is_handle() else None

1 0

Georg Lehmann : winevulkan: Automatically generate vkDebugReportMessageEXT.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 221995a6838da5be2217735c3b1e1b1cd8f01e9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=221995a6838da5be2217735c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Jun 21 11:03:26 2021 +0200 winevulkan: Automatically generate vkDebugReportMessageEXT. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 12 ------------ dlls/winevulkan/vulkan_thunks.c | 6 ++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 23e831c08eb..627ceccfe02 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -249,7 +249,6 @@ FUNCTION_OVERRIDES = { # VK_EXT_debug_report "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkDebugReportMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_EXT_debug_marker "vkDebugMarkerSetObjectNameEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index abe0eceb57c..3c8c5d089ef 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1655,18 +1655,6 @@ void WINAPI wine_vkDestroyDebugReportCallbackEXT( free(object); } -void WINAPI wine_vkDebugReportMessageEXT(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type, - uint64_t object, size_t location, int32_t code, const char *layer_prefix, const char *message) -{ - TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", instance, flags, object_type, wine_dbgstr_longlong(object), - wine_dbgstr_longlong(location), code, layer_prefix, message); - - object = wine_vk_unwrap_handle(object_type, object); - - instance->funcs.p_vkDebugReportMessageEXT( - instance->instance, flags, object_type, object, location, code, layer_prefix, message); -} - VkResult WINAPI wine_vkDebugMarkerSetObjectTagEXT(VkDevice device, const VkDebugMarkerObjectTagInfoEXT *tag_info) { VkDebugMarkerObjectTagInfoEXT wine_tag_info; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index ac3c8120600..1216a05ddfa 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -6306,6 +6306,12 @@ VkResult thunk_vkDebugMarkerSetObjectTagEXT(VkDevice device, const VkDebugMarker #endif } +static void WINAPI wine_vkDebugReportMessageEXT(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, size_t location, int32_t messageCode, const char *pLayerPrefix, const char *pMessage) +{ + TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", instance, flags, objectType, wine_dbgstr_longlong(object), wine_dbgstr_longlong(location), messageCode, pLayerPrefix, pMessage); + instance->funcs.p_vkDebugReportMessageEXT(instance->instance, flags, objectType, wine_vk_unwrap_handle(objectType, object), location, messageCode, pLayerPrefix, pMessage); +} + static VkResult WINAPI wine_vkDeferredOperationJoinKHR(VkDevice device, VkDeferredOperationKHR operation) { TRACE("%p, 0x%s\n", device, wine_dbgstr_longlong(operation)); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index ccfb46c054b..6140d06a49f 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -24,7 +24,6 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *pCreateInfo, c VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface); VkResult WINAPI wine_vkDebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkDebugMarkerSetObjectTagEXT(VkDevice device, const VkDebugMarkerObjectTagInfoEXT *pTagInfo) DECLSPEC_HIDDEN; -void WINAPI wine_vkDebugReportMessageEXT(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, size_t location, int32_t messageCode, const char *pLayerPrefix, const char *pMessage) DECLSPEC_HIDDEN; void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator); void WINAPI wine_vkDestroyDebugReportCallbackEXT(VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; void WINAPI wine_vkDestroyDebugUtilsMessengerEXT(VkInstance instance, VkDebugUtilsMessengerEXT messenger, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mfplay: Set start/stop position on source nodes.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: d2354aa04d7b8594be290fa1b9e35f91c4a3985c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2354aa04d7b8594be290fa1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 21 11:43:14 2021 +0300 mfplay: Set start/stop position on source nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0e41656f0c8..959cf701b99 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1128,6 +1128,10 @@ static HRESULT media_item_create_source_node(struct media_item *item, IMFStreamD IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + if (item->start_position) + IMFTopologyNode_SetUINT64(*node, &MF_TOPONODE_MEDIASTART, item->start_position); + if (item->stop_position) + IMFTopologyNode_SetUINT64(*node, &MF_TOPONODE_MEDIASTOP, item->stop_position); } return hr;

1 0

Alexandre Julliard : ntdll: Go through the syscall return path for syscall faults.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: db26df5934b0b1ce153730f1f1e0137a278d8fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db26df5934b0b1ce153730f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 21 15:43:22 2021 +0200 ntdll: Go through the syscall return path for syscall faults. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 16 +++---------- dlls/ntdll/unix/signal_arm64.c | 9 +++---- dlls/ntdll/unix/signal_i386.c | 24 ++++++++++--------- dlls/ntdll/unix/signal_x86_64.c | 17 +++---------- dlls/ntdll/unix/unix_private.h | 1 + tools/winebuild/import.c | 53 ++++++++++++++++++++++++----------------- 6 files changed, 54 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db26df5934b0b1ce1537…

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_INFO.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 5bece995c33d51031c46826c2205c445a2546823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bece995c33d51031c46826c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:56 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_INFO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f8ba7025ec5..44c0690d535 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1433,41 +1433,29 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { + struct afd_get_info_params params; + IO_STATUS_BLOCK io; NTSTATUS status; - int address_family; - int socket_type; - int protocol; unsigned int i; *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); memset(buffer, 0, *size); - SERVER_START_REQ( get_socket_info ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - status = wine_server_call( req ); - if (!status) - { - address_family = reply->family; - socket_type = reply->type; - protocol = reply->protocol; - } - } - SERVER_END_REQ; - + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, + IOCTL_AFD_WINE_GET_INFO, NULL, 0, &params, sizeof(params) ); if (status) { - unsigned int err = NtStatusToWSAError( status ); - SetLastError( err == WSAEBADF ? WSAENOTSOCK : err ); + SetLastError( NtStatusToWSAError( status ) ); return FALSE; } for (i = 0; i < ARRAY_SIZE(supported_protocols); ++i) { const WSAPROTOCOL_INFOW *info = &supported_protocols[i]; - if (address_family == info->iAddressFamily && - socket_type == info->iSocketType && - protocol >= info->iProtocol && protocol <= info->iProtocol + info->iProtocolMaxOffset) + if (params.family == info->iAddressFamily && + params.type == info->iSocketType && + params.protocol >= info->iProtocol && + params.protocol <= info->iProtocol + info->iProtocolMaxOffset) { if (unicode) *buffer = *info; @@ -1478,12 +1466,12 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i WideCharToMultiByte( CP_ACP, 0, info->szProtocol, -1, bufferA->szProtocol, sizeof(bufferA->szProtocol), NULL, NULL ); } - buffer->iProtocol = protocol; + buffer->iProtocol = params.protocol; return TRUE; } } - FIXME("Could not fill protocol information for family %d, type %d, protocol %d.\n", - address_family, socket_type, protocol); + FIXME( "Could not fill protocol information for family %d, type %d, protocol %d.\n", + params.family, params.type, params.protocol ); return TRUE; }

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_INFO.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: a4b3ed9f2a2e207ccd05025a7c90ef31b351bfcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b3ed9f2a2e207ccd05025a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:55 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_INFO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 6 ++++++ server/sock.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 6f0a78ca933..e497eece0be 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -158,6 +158,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { @@ -218,4 +219,9 @@ struct afd_message_select_params int mask; }; +struct afd_get_info_params +{ + int family, type, protocol; +}; + #endif diff --git a/server/sock.c b/server/sock.c index 547287572d5..46018887692 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2515,6 +2515,23 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_GET_INFO: + { + struct afd_get_info_params params; + + if (get_reply_max_size() < sizeof(params)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + params.family = sock->family; + params.type = sock->type; + params.protocol = sock->proto; + set_reply_data( &params, sizeof(params) ); + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.182.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: 95612e297a9dfc1bb6bcd4fb43492684766f7b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95612e297a9dfc1bb6bcd4fb… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Jun 21 11:03:22 2021 +0200 winevulkan: Update to VK spec version 1.2.182. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 12 + dlls/winevulkan/loader_thunks.h | 2 + dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 67 + dlls/winevulkan/vulkan_thunks.h | 4 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2761 +++++++++++++++++++++------------------ 7 files changed, 1553 insertions(+), 1301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95612e297a9dfc1bb6bc…

1 0

Nikolay Sivov : include: Add MFP_POSITIONTYPE_100NS symbol.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: b090a169a3f4e8905a29081d058db9b4a3e31035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b090a169a3f4e8905a29081d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 21 11:43:12 2021 +0300 include: Add MFP_POSITIONTYPE_100NS symbol. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfuuid/mfplay.c | 4 ++++ include/mfplay.idl | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c index 1d28306fe4f..d73e52607c4 100644 --- a/dlls/mfuuid/mfplay.c +++ b/dlls/mfuuid/mfplay.c @@ -17,5 +17,9 @@ */ #include "evr.h" + +#undef EXTERN_GUID +#define EXTERN_GUID DEFINE_GUID + #include "initguid.h" #include "mfplay.h" diff --git a/include/mfplay.idl b/include/mfplay.idl index 7d4345e69e7..42591439a0b 100644 --- a/include/mfplay.idl +++ b/include/mfplay.idl @@ -197,6 +197,8 @@ cpp_quote("#define MFP_GET_ERROR_EVENT(hdr) __MFP_CAST_EVENT(h cpp_quote("#define MFP_GET_PLAYBACK_ENDED_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAYBACK_ENDED)") cpp_quote("#define MFP_GET_ACQUIRE_USER_CREDENTIAL_EVENT(hdr) __MFP_CAST_EVENT(hdr, ACQUIRE_USER_CREDENTIAL)") +cpp_quote("EXTERN_GUID(MFP_POSITIONTYPE_100NS, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0);") + [ object, uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd),

1 0

Georg Lehmann : winevulkan: Automatically generate vkGetPrivateDataEXT.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: wine Branch: master Commit: f46c4a3920ce8e96b37b606c207add7f596f1950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46c4a3920ce8e96b37b606c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Jun 21 11:03:25 2021 +0200 winevulkan: Automatically generate vkGetPrivateDataEXT. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 --- dlls/winevulkan/vulkan.c | 10 ---------- dlls/winevulkan/vulkan_thunks.c | 6 ++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0acc6ca3b8e..23e831c08eb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -235,9 +235,6 @@ FUNCTION_OVERRIDES = { "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, - # VK_EXT_private_data - "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, - # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4553a1030c8..abe0eceb57c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1400,16 +1400,6 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } -void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, - VkPrivateDataSlotEXT private_data_slot, uint64_t *data) -{ - TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, object_type, wine_dbgstr_longlong(object_handle), - wine_dbgstr_longlong(private_data_slot), data); - - object_handle = wine_vk_unwrap_handle(object_type, object_handle); - device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); -} - VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *createInfo, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 6f61d2a9767..ac3c8120600 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -7390,6 +7390,12 @@ static VkResult WINAPI wine_vkGetPipelineExecutableStatisticsKHR(VkDevice device #endif } +static void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) +{ + TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, objectType, wine_dbgstr_longlong(objectHandle), wine_dbgstr_longlong(privateDataSlot), pData); + device->funcs.p_vkGetPrivateDataEXT(device->device, objectType, wine_vk_unwrap_handle(objectType, objectHandle), privateDataSlot, pData); +} + static VkResult WINAPI wine_vkGetQueryPoolResults(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void *pData, VkDeviceSize stride, VkQueryResultFlags flags) { TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", device, wine_dbgstr_longlong(queryPool), firstQuery, queryCount, wine_dbgstr_longlong(dataSize), pData, wine_dbgstr_longlong(stride), flags); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 3ac75417c16..ccfb46c054b 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -56,7 +56,6 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); -void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t *pData) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetDebugUtilsObjectNameEXT(VkDevice device, const VkDebugUtilsObjectNameInfoEXT *pNameInfo) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkSetDebugUtilsObjectTagEXT(VkDevice device, const VkDebugUtilsObjectTagInfoEXT *pTagInfo) DECLSPEC_HIDDEN; void WINAPI wine_vkSubmitDebugUtilsMessageEXT(VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) DECLSPEC_HIDDEN;

1 0