- Wine-Devel - list.winehq.org

[PATCH v2 2/2] user32: Fix a pop-up window is not visible when its owned window showed with SW_SHOWNOACTIVATE option.
by Haidong Yu June 28, 2020

June 28, 2020

2 1

[PATCH] winecfg: Pass correct font family through to font chooser.
by Mark Harmstone June 27, 2020

June 27, 2020

GetSystemMetrics returns the "full name" of the font, which is not necessarily what appears in the font picker, causing it to default to the first entry in the list. See for example the family "Renner*", which calls its Regular version "Renner* Book". Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- programs/winecfg/theme.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b38b2ff26d..1f004c7e0e 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1151,20 +1151,43 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) } } +static INT CALLBACK fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *ntm, DWORD type, LPARAM lparam) +{ + LOGFONTW *orig_lf = (LOGFONTW *)lparam; + + memcpy(orig_lf->lfFaceName, lf->lfFaceName, sizeof(lf->lfFaceName)); + + return 0; +} + static void on_select_font(HWND hDlg) { CHOOSEFONTW cf; + LOGFONTW lf; + HDC hdc; + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + memcpy(&lf, &metrics[index].lf, sizeof(LOGFONTW)); + + /* GetSystemMetrics returns the "full name" of the font - run it through + * EnumFontFamiliesExW in order to get the family name, which is what + * appears in the font chooser list. */ + hdc = GetDC(hDlg); + EnumFontFamiliesExW(hdc, &lf, fontname_proc, (LPARAM)&lf, 0); + ReleaseDC(hDlg, hdc); + ZeroMemory(&cf, sizeof(cf)); cf.lStructSize = sizeof(CHOOSEFONTW); cf.hwndOwner = hDlg; - cf.lpLogFont = &(metrics[index].lf); + cf.lpLogFont = &lf; cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL | CF_NOVERTFONTS; - if (ChooseFontW(&cf)) + if (ChooseFontW(&cf)) { + memcpy(&(metrics[index].lf), &lf, sizeof(LOGFONTW)); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); + } } static void init_mime_types(HWND hDlg) -- 2.26.2

1 0

[PATCH] ntoskrnl.exe: null initialize context.handle and context.irp
by Jefferson Carpenter June 27, 2020

June 27, 2020

Should prevent close_handle getting called with random data from the stack. thanks, Jefferson

1 0

[PATCH] wuaueng: Add stub DllRegisterServer and DllUnregisterServer functions.
by Vijay Kiran Kamuju June 27, 2020

June 27, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49459 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/3] include: Add xact3.h
by Vijay Kiran Kamuju June 27, 2020

June 27, 2020

Based on work by Ethan Lee and Alistair Leslie-Hughes Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 4

[PATCH 3/3] xactengine3_7:Register the com classes.
by Vijay Kiran Kamuju June 27, 2020

June 27, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju June 27, 2020

June 27, 2020

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] winevulkan: Don't initialize the Vulkan driver in DllMain().
by Brendan Shanks June 26, 2020

June 26, 2020

Fixes an issue where winevulkan would not be registered if no Vulkan driver was present during prefix creation (such as in a build VM). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- As a side benefit, this also better matches the official Vulkan loader's behavior (it never returns FALSE from DllMain: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/loader.c#L…) VK_ERROR_INITIALIZATION_FAILED is what the official Windows loader returns for vkCreateInstance() and vkEnumerateInstanceExtensionProperties() when no ICDs are present. Note that for vkEnumerateInstanceExtensionProperties(), VK_ERROR_INITIALIZATION_FAILED is not listed in the spec as a possible return code. I've opened an issue for the loader to get clarification: https://github.com/KhronosGroup/Vulkan-Loader/issues/421 dlls/winevulkan/vulkan.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index eb22e72ae36..d2da92cfa26 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -306,7 +306,7 @@ static void wine_vk_device_free(struct VkDevice_T *device) heap_free(device); } -static BOOL wine_vk_init(void) +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { HDC hdc; @@ -314,16 +314,20 @@ static BOOL wine_vk_init(void) vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); ReleaseDC(0, hdc); if (!vk_funcs) - { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - return FALSE; - } - - p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + else + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); return TRUE; } +static void wine_vk_init_once(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); +} + /* 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. @@ -653,6 +657,10 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -779,6 +787,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return VK_ERROR_LAYER_NOT_PRESENT; } + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) return res; @@ -847,6 +859,8 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); + wine_vk_init_once(); + if (p_vkEnumerateInstanceVersion) { res = p_vkEnumerateInstanceVersion(version); @@ -1367,13 +1381,14 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) case DLL_PROCESS_ATTACH: hinstance = hinst; DisableThreadLibraryCalls(hinst); - return wine_vk_init(); + break; } return TRUE; } static const struct vulkan_func vk_global_dispatch_table[] = { + /* These functions must call wine_vk_init_once() before accessing vk_funcs. */ {"vkCreateInstance", &wine_vkCreateInstance}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties}, -- 2.26.2

1 0

[PATCH V2] qdvd: Register DvdGraphBuilder class.
by Vijay Kiran Kamuju June 26, 2020

June 26, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49458 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] qdvd: Register DvdGraphBuilder class.
by Vijay Kiran Kamuju June 26, 2020

June 26, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49458 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0