wine-devel October 2020

wine-devel@winehq.org

82 participants
799 discussions

[PATCH 1/5] riched20: Pass a paragraph ptr to the table update flags function.
by Huw Davies 16 Oct '20

16 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/para.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 431f89faed3..2d5072e232e 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -211,23 +211,20 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); } -static void ME_UpdateTableFlags(ME_DisplayItem *para) +static void table_update_flags( ME_Paragraph *para ) { - para->member.para.fmt.dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; - if (para->member.para.pCell) { - para->member.para.nFlags |= MEPF_CELL; - } else { - para->member.para.nFlags &= ~MEPF_CELL; - } - if (para->member.para.nFlags & MEPF_ROWEND) { - para->member.para.fmt.wEffects |= PFE_TABLEROWDELIMITER; - } else { - para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER; - } - if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND)) - para->member.para.fmt.wEffects |= PFE_TABLE; - else - para->member.para.fmt.wEffects &= ~PFE_TABLE; + para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER; + + if (para->pCell) para->nFlags |= MEPF_CELL; + else para->nFlags &= ~MEPF_CELL; + + if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER; + else para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER; + + if (para->nFlags & (MEPF_ROWSTART | MEPF_CELL | MEPF_ROWEND)) + para->fmt.wEffects |= PFE_TABLE; + else + para->fmt.wEffects &= ~PFE_TABLE; } static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) @@ -638,8 +635,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, } else { new_para->member.para.pCell = run_para->member.para.pCell; } - ME_UpdateTableFlags(run_para); - ME_UpdateTableFlags(new_para); + table_update_flags( &run_para->member.para ); + table_update_flags( &new_para->member.para ); } /* force rewrap of the */ -- 2.23.0

1 0

[PATCH] winevulkan: Implement VK_EXT_debug_report.
by Georg Lehmann 16 Oct '20

16 Oct '20

Needed for Quake2RTX. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 14 +++-- dlls/winevulkan/vulkan.c | 105 ++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 26 ++++++++ 3 files changed, 138 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f3f2da7548c..5304a139bae 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -86,12 +86,7 @@ EXT_BLOCK_SIZE = 1000 UNSUPPORTED_EXTENSIONS = [ # Instance extensions - "VK_EXT_debug_report", - # Handling of VK_EXT_debug_report requires some consideration. The win32 - # loader already provides it for us and it is somewhat usable. If we add - # plumbing down to the native layer, we will get each message twice as we - # use 2 loaders (win32+native), but we may get output from the driver. - # In any case callback conversion is required. + "VK_EXT_debug_marker", # Needs handle unwrapping "VK_EXT_validation_features", "VK_EXT_validation_flags", "VK_KHR_display", # Needs WSI work. @@ -231,6 +226,11 @@ FUNCTION_OVERRIDES = { "vkSubmitDebugUtilsMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, "vkSetDebugUtilsObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, "vkSetDebugUtilsObjectNameEXT" : {"dispatch": True, "driver" : False, "thunk" : True, "private_thunk" : True}, + + # VK_EXT_debug_report + "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkDebugReportMessageEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, } STRUCT_CHAIN_CONVERSIONS = [ @@ -952,6 +952,8 @@ class VkHandle(object): return "wine_cmd_pool_from_handle({0})->command_pool".format(name) if self.name == "VkDebugUtilsMessengerEXT": return "wine_debug_utils_messenger_from_handle({0})->debug_messenger".format(name) + if self.name == "VkDebugReportCallbackEXT": + return "wine_debug_report_callback_from_handle({0})->debug_callback".format(name) native_handle_name = None diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 92c26be1fc0..d486f43e66c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -190,6 +190,30 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB return result; } +static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type, + uint64_t object_handle, size_t location, int32_t code, const char *layer_prefix, const char *message, void *user_data) +{ + struct wine_debug_report_callback *object; + + TRACE("%#x, %#x, 0x%s, 0x%s, %d, %p, %p, %p\n", flags, object_type, wine_dbgstr_longlong(object_handle), + wine_dbgstr_longlong(location), code, layer_prefix, message, user_data); + + object = user_data; + + if (!object->instance->instance) + { + /* instance wasn't yet created, this is a message from the native loader */ + return VK_FALSE; + } + + object_handle = wine_vk_get_wrapper(object->instance, object_handle); + if (!object_handle) + object_type = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT; + + return object->user_callback( + flags, object_type, object_handle, location, code, layer_prefix, message, object->user_data); +} + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) @@ -471,6 +495,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo VkInstanceCreateInfo *dst, struct VkInstance_T *object) { VkDebugUtilsMessengerCreateInfoEXT *debug_utils_messenger; + VkDebugReportCallbackCreateInfoEXT *debug_report_callback; VkBaseInStructure *header; unsigned int i; VkResult res; @@ -503,6 +528,18 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo debug_utils_messenger->pUserData = &object->utils_messengers[i]; } + debug_report_callback = wine_vk_find_struct(header->pNext, DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT); + if (debug_report_callback) + { + object->default_callback.instance = object; + object->default_callback.debug_callback = VK_NULL_HANDLE; + object->default_callback.user_callback = debug_report_callback->pfnCallback; + object->default_callback.user_data = debug_report_callback->pUserData; + + debug_report_callback->pfnCallback = (void *) &debug_report_callback_conversion; + debug_report_callback->pUserData = &object->default_callback; + } + /* ICDs don't support any layers, so nothing to copy. Modern versions of the loader * filter this data out as well. */ @@ -526,7 +563,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo free_VkInstanceCreateInfo_struct_chain(dst); return VK_ERROR_EXTENSION_NOT_PRESENT; } - if (!strcmp(extension_name, "VK_EXT_debug_utils")) + if (!strcmp(extension_name, "VK_EXT_debug_utils") || !strcmp(extension_name, "VK_EXT_debug_report")) { object->enable_wrapper_list = VK_TRUE; } @@ -1880,6 +1917,72 @@ VkResult WINAPI wine_vkSetDebugUtilsObjectNameEXT(VkDevice device, const VkDebug return thunk_vkSetDebugUtilsObjectNameEXT(device, &wine_name_info); } +VkResult WINAPI wine_vkCreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *create_info, + const VkAllocationCallbacks *allocator, VkDebugReportCallbackEXT *callback) +{ + VkDebugReportCallbackCreateInfoEXT wine_create_info; + struct wine_debug_report_callback *object; + VkResult res; + + TRACE("%p, %p, %p, %p\n", instance, create_info, allocator, callback); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + object->instance = instance; + object->user_callback = create_info->pfnCallback; + object->user_data = create_info->pUserData; + + wine_create_info = *create_info; + + wine_create_info.pfnCallback = (void *) debug_report_callback_conversion; + wine_create_info.pUserData = object; + + res = instance->funcs.p_vkCreateDebugReportCallbackEXT(instance->instance, &wine_create_info, NULL, &object->debug_callback); + + if (res != VK_SUCCESS) + { + heap_free(object); + return res; + } + + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->debug_callback); + *callback = wine_debug_report_callback_to_handle(object); + + return VK_SUCCESS; +} + +void WINAPI wine_vkDestroyDebugReportCallbackEXT( + VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks *allocator) +{ + struct wine_debug_report_callback *object; + + TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(callback), allocator); + + object = wine_debug_report_callback_from_handle(callback); + + instance->funcs.p_vkDestroyDebugReportCallbackEXT(instance->instance, object->debug_callback, NULL); + + WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); + + heap_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); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index eec0ef595d0..92c04543587 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -97,6 +97,18 @@ struct VkDevice_T struct wine_debug_utils_messenger; +struct wine_debug_report_callback +{ + struct VkInstance_T *instance; /* parent */ + VkDebugReportCallbackEXT debug_callback; /* native callback object */ + + /* application callback + data */ + PFN_vkDebugReportCallbackEXT user_callback; + void *user_data; + + struct wine_vk_mapping mapping; +}; + struct VkInstance_T { struct wine_vk_base base; @@ -116,6 +128,8 @@ struct VkInstance_T struct wine_debug_utils_messenger *utils_messengers; uint32_t utils_messenger_count; + struct wine_debug_report_callback default_callback; + unsigned int quirks; struct wine_vk_mapping mapping; @@ -187,6 +201,18 @@ static inline VkDebugUtilsMessengerEXT wine_debug_utils_messenger_to_handle( return (VkDebugUtilsMessengerEXT)(uintptr_t)debug_messenger; } +static inline struct wine_debug_report_callback *wine_debug_report_callback_from_handle( + VkDebugReportCallbackEXT handle) +{ + return (struct wine_debug_report_callback *)(uintptr_t)handle; +} + +static inline VkDebugReportCallbackEXT wine_debug_report_callback_to_handle( + struct wine_debug_report_callback *debug_messenger) +{ + return (VkDebugReportCallbackEXT)(uintptr_t)debug_messenger; +} + void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; -- 2.28.0

2 1

[PATCH] msvfw32/tests: add a few tests for MCIWndCreate
by David Adam 16 Oct '20

16 Oct '20

2 2

[PATCH 2/2] taskmgr: SwitchToThisWindow() is available, remove alternate code path
by Michael Stefaniuc 15 Oct '20

15 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/applpage.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 6b2e04077c2..b35881c2323 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -47,8 +47,6 @@ static int nApplicationPageHeight; static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */ static BOOL bSortAscending = TRUE; -static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; - static void ApplicationPageUpdate(void) { /* Enable or disable the "End Task" & "Switch To" buttons */ @@ -743,19 +741,7 @@ void ApplicationPage_OnSwitchTo(void) } } if (pAPLI) { - typedef void (WINAPI *PROCSWITCHTOTHISWINDOW) (HWND, BOOL); - PROCSWITCHTOTHISWINDOW SwitchToThisWindow; - - HMODULE hUser32 = GetModuleHandleW(wszUser32); - SwitchToThisWindow = (PROCSWITCHTOTHISWINDOW)GetProcAddress(hUser32, "SwitchToThisWindow"); - if (SwitchToThisWindow) { - SwitchToThisWindow(pAPLI->hWnd, TRUE); - } else { - if (IsIconic(pAPLI->hWnd)) - ShowWindow(pAPLI->hWnd, SW_RESTORE); - BringWindowToTop(pAPLI->hWnd); - SetForegroundWindow(pAPLI->hWnd); - } + SwitchToThisWindow(pAPLI->hWnd, TRUE); if (TaskManagerSettings.MinimizeOnUse) ShowWindow(hMainWnd, SW_MINIMIZE); } -- 2.26.2

1 0

[PATCH 1/2] taskmgr: There's no need to GetProcAddress() IsHungAppWindow()
by Michael Stefaniuc 15 Oct '20

15 Oct '20

Its available since Win2K. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/taskmgr/applpage.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 5a005290be4..6b2e04077c2 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -238,10 +238,6 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) HICON hIcon; WCHAR wszText[256]; BOOL bLargeIcon = TaskManagerSettings.View_LargeIcons; - BOOL bHung = FALSE; - typedef int (__stdcall *IsHungAppWindowProc)(HWND); - IsHungAppWindowProc IsHungAppWindow; - /* Skip our window */ if (hWnd == hMainWnd) @@ -270,14 +266,7 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); - bHung = FALSE; - - IsHungAppWindow = (IsHungAppWindowProc)(FARPROC)GetProcAddress(GetModuleHandleW(wszUser32), "IsHungAppWindow"); - - if (IsHungAppWindow) - bHung = IsHungAppWindow(hWnd); - - AddOrUpdateHwnd(hWnd, wszText, hIcon, bHung); + AddOrUpdateHwnd(hWnd, wszText, hIcon, IsHungAppWindow(hWnd)); return TRUE; } -- 2.26.2

1 0

[PATCH 7/7] kernelbase: Move console code page validation to conhost.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 16 ++-------------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 8 insertions(+), 14 deletions(-)

2 1

[PATCH 6/7] conhost: Remove no longer needed non-blocking IOCTL_CONDRV_READ_INPUT.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 3 +-- programs/conhost/conhost.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-)

2 1

[PATCH 5/7] kernel32: Import FlushFileBuffers from kernelbase.
by Jacek Caban 15 Oct '20

15 Oct '20

Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 14 -------------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-)

2 1

[PATCH 4/7] server: Implement console input flush in server.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)

2 1

[PATCH 3/7] kernel32: Move FlushConsoleInputBuffer to kernelbase.
by Jacek Caban 15 Oct '20

15 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 9 --------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)

2 1

← Newer
1
...
31
32
33
34
35
36
37
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2020