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

Nikolay Sivov : mfplay: Set start/stop position on source nodes.
by Alexandre Julliard 21 Jun '21

21 Jun '21

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

Georg Lehmann : winevulkan: Update to VK spec version 1.2.182.
by Alexandre Julliard 21 Jun '21

21 Jun '21

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

Georg Lehmann : winevulkan: Unwrap params with objecttype.
by Alexandre Julliard 21 Jun '21

21 Jun '21

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 vkSetPrivateDataEXT.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: 741153114d0eaa5a6f31a08b4e67cbd61d5cb2de URL: https://source.winehq.org/git/wine.git/?a=commit;h=741153114d0eaa5a6f31a08b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Jun 21 11:03:24 2021 +0200 winevulkan: Automatically generate vkSetPrivateDataEXT. 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 | 10 ---------- dlls/winevulkan/vulkan_thunks.c | 6 ++++++ dlls/winevulkan/vulkan_thunks.h | 1 - 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 662f1c8144e..0acc6ca3b8e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -237,7 +237,6 @@ FUNCTION_OVERRIDES = { # VK_EXT_private_data "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, - "vkSetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index bdd9f2151c0..4553a1030c8 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1400,16 +1400,6 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } -VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, - VkPrivateDataSlotEXT private_data_slot, uint64_t data) -{ - TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, object_type, wine_dbgstr_longlong(object_handle), - wine_dbgstr_longlong(private_data_slot), wine_dbgstr_longlong(data)); - - object_handle = wine_vk_unwrap_handle(object_type, object_handle); - return device->funcs.p_vkSetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); -} - void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, VkPrivateDataSlotEXT private_data_slot, uint64_t *data) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 4d4779582ea..6f61d2a9767 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -7690,6 +7690,12 @@ static VkResult WINAPI wine_vkSetEvent(VkDevice device, VkEvent event) return device->funcs.p_vkSetEvent(device->device, event); } +static VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) +{ + TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, objectType, wine_dbgstr_longlong(objectHandle), wine_dbgstr_longlong(privateDataSlot), wine_dbgstr_longlong(data)); + return device->funcs.p_vkSetPrivateDataEXT(device->device, objectType, wine_vk_unwrap_handle(objectType, objectHandle), privateDataSlot, data); +} + static VkResult WINAPI wine_vkSignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo) { #if defined(USE_STRUCT_CONVERSION) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index ccf9491f064..3ac75417c16 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -59,7 +59,6 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice 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; -VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlotEXT privateDataSlot, uint64_t data) DECLSPEC_HIDDEN; void WINAPI wine_vkSubmitDebugUtilsMessageEXT(VkInstance instance, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageTypes, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData) DECLSPEC_HIDDEN; /* Private thunks */

1 0

Georg Lehmann : winevulkan: Automatically generate vkGetPrivateDataEXT.
by Alexandre Julliard 21 Jun '21

21 Jun '21

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

Georg Lehmann : winevulkan: Automatically generate vkDebugReportMessageEXT.
by Alexandre Julliard 21 Jun '21

21 Jun '21

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

Zebediah Figura : ws2_32/tests: Avoid some more test failures on Vista.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: wine Branch: master Commit: b3e9d0f88c5588ebbb67fa9ec7c03207a4047e5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3e9d0f88c5588ebbb67fa9e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 20 11:05:52 2021 -0500 ws2_32/tests: Avoid some more test failures on Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f67bc4efae5..b171e6c03e1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3816,6 +3816,9 @@ static void test_fionread_siocatmark(void) ret = recv(client, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask_todo(client, POLLRDBAND, POLLRDBAND); + check_fionread_siocatmark_todo(client, 2, FALSE); ret = recv(client, buffer, 5, 0); @@ -3831,6 +3834,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDBAND, POLLRDBAND); + ret = 1; ret = setsockopt(client, SOL_SOCKET, SO_OOBINLINE, (char *)&ret, sizeof(ret)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -3845,6 +3851,9 @@ static void test_fionread_siocatmark(void) ret = send(server, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, POLLRDNORM, POLLRDNORM); + check_fionread_siocatmark(client, 1, TRUE); closesocket(client);

1 0

Francois Gouget : include: Fix the spelling of a comment.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: faf78aae015f88b2058ff2574b31aefe6a82b944 URL: https://source.winehq.org/git/website.git/?a=commit;h=faf78aae015f88b2058ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:52:21 2021 +0200 include: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/htaccess.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index dbb7adf3..8de6b96d 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -89,7 +89,7 @@ RedirectMatch ^/(FAQ|Faq)$ https://wiki.winehq.org/FAQ RedirectMatch ^/(BUGS|Bugs|bugs)$ https://bugs.winehq.org/ RedirectMatch ^/(TROUBLE|Trouble|trouble)$ https://wiki.winehq.org/FAQ -# redirect soure website +# redirect source website RedirectMatch ^/WineAPI(.*)$ https://source.winehq.org/WineAPI$1 RedirectMatch ^/source(.*)$ https://source.winehq.org/source$1 RedirectMatch ^/cvsweb(.*)$ https://cvs.winehq.org/cvsweb$1

1 0

Francois Gouget : css: Fix the spelling of a comment.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: 446934b192e99e7f544ffffad434f96e74472f0e URL: https://source.winehq.org/git/website.git/?a=commit;h=446934b192e99e7f544ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:52:39 2021 +0200 css: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6dbda392..cf76dcc2 100644 --- a/css/styles.css +++ b/css/styles.css @@ -125,7 +125,7 @@ SPAN.link:active { color: #FF0000; text-decoration: none; } /* blockquote */ blockquote { font-size: inherit; } -/* horizonal rules */ +/* horizontal rules */ HR { border-top: 1px solid #d4d4d4; } /* DIV styles */ @@ -612,4 +612,4 @@ BODY.rtl { margin-left: 10px; } -} \ No newline at end of file +}

1 0

Francois Gouget : js: Fix the spelling of a comment.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: 6f43af5e6bbec99e6bfc70fc5e10f78ff3c5f7a1 URL: https://source.winehq.org/git/website.git/?a=commit;h=6f43af5e6bbec99e6bfc7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:52:28 2021 +0200 js: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- js/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/utils.js b/js/utils.js index a07fe62d..0aeb0efd 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,5 +1,5 @@ /* - Misc JavaScipt for WineHQ + Misc JavaScript for WineHQ */ // load the vars passed on the `src` line

1 0