March 2019 - Wine-devel - list.winehq.org

Re: Piotr Caban : kernel32: Restore C locale for LC_CTYPE category.
by Jactry Zeng 20 Mar '19

20 Mar '19

On Mon, Mar 18, 2019 at 9:24 PM Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: c8e195e1797bd513c91927743b3ed38fdfa86c2f > URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e195e1797bd513c9192774… > > Author: Piotr Caban <piotr(a)codeweavers.com> > Date: Mon Mar 18 20:03:40 2019 +0100 > > kernel32: Restore C locale for LC_CTYPE category. I found that this commit broke CJK input method on Wine, even with Sagawa's patch for bug 46851[1]. It seems that Fcitx needs a LC_CTYPE matched to local language. Reverting this commit and applying Sagawa's patch can fix the problem. I don't know if we can fix the input medthod problem in imm32 or some other components instead of reverting this commit. [1] https://source.winehq.org/patches/data/161088 -- Regards, Jactry Zeng

4 8

[PATCH 1/2] jscript: Support undefined context value in Array.prototype.forEach.
by Jacek Caban 20 Mar '19

20 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 17 +++++++++++------ dlls/mshtml/tests/es5.js | 7 +++++++ 2 files changed, 18 insertions(+), 6 deletions(-)

2 1

[PATCH v2] po: Fix German translation
by Oliver Henning 20 Mar '19

20 Mar '19

Fixes typo and some comma mistakes. Signed-off-by: Oliver Henning <oliver.henning(a)gmail.com> --- po/de.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index af4b1b8679..641441034e 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-02-27 09:09+0530\n" -"Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" +"PO-Revision-Date: 2019-03-19 15:03+0000\n" +"Last-Translator: Oliver Henning <oliver.henning(a)gmail.com>\n" "Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -1633,7 +1633,7 @@ msgstr "Unternehmensstamm-OID" #: crypt32.rc:122 msgid "Dummy Signer" -msgstr "Attrapenunterzeichner" +msgstr "Attrappenunterzeichner" #: crypt32.rc:123 msgid "Encrypted Private Key" @@ -2207,7 +2207,7 @@ msgstr "Zertifikatsspeicher wählen" #: cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "Zertifikatsspeicher wählen den Sie benutzen möchten:" +msgstr "Zertifikatsspeicher wählen, den Sie benutzen möchten:" #: cryptui.rc:279 msgid "&Show physical stores" @@ -2436,7 +2436,7 @@ msgstr "&Verstärkte Sicherheit aktivieren" #: cryptui.rc:427 msgid "Delete the private &key if the export is successful" -msgstr "Priva&ten Schlüssel löschen wenn der Export erfolgreich war" +msgstr "Priva&ten Schlüssel löschen, wenn der Export erfolgreich war" #: cryptui.rc:444 msgid "Completing the Certificate Export Wizard" @@ -2518,7 +2518,7 @@ msgstr "Dieses Zertifikat hat eine ungültige Signatur." #: cryptui.rc:43 msgid "This certificate has expired or is not yet valid." -msgstr "Dieses Zertifikat ist entweder abgelaufen, oder noch nicht gültig." +msgstr "Dieses Zertifikat ist entweder abgelaufen oder noch nicht gültig." #: cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." @@ -16950,7 +16950,7 @@ msgstr "Die Datei konnte nicht gespeichert werden." #: wordpad.rc:201 msgid "You do not have access to save the file." msgstr "" -"Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern." +"Sie haben keine ausreichende Zugriffsberechtigung, um die Datei zu speichern." #: wordpad.rc:202 msgid "Could not open the file." @@ -16959,7 +16959,7 @@ msgstr "Die Datei konnte nicht geöffnet werden." #: wordpad.rc:203 msgid "You do not have access to open the file." msgstr "" -"Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu öffnen." +"Sie haben keine ausreichende Zugriffsberechtigung, um die Datei zu öffnen." #: wordpad.rc:204 msgid "Printing not implemented." -- 2.21.0.windows.1

2 1

[PATCH v2] HID: Handle failure to create device by trying to open it instead
by Aric Stewart 20 Mar '19

20 Mar '19

v2: With input from Huw Davies Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 11 +++++------ dlls/winebus.sys/main.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-)

2 3

[PATCH v4] winebus.sys: Allow mapping of SDL controllers
by Aric Stewart 20 Mar '19

20 Mar '19

v3:Updated based on suggesions Zebediah Figura v4:Use advapi32 reg enum functions Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_sdl.c | 72 ++++++++++++++++++++++++++++++++++-- 2 files changed, 70 insertions(+), 4 deletions(-)

1 0

[PATCH] xcopy: Fix punctuation in STRING_HELP string.
by Isira Seneviratne 20 Mar '19

20 Mar '19

1 0

[PATCH 7/7] winevulkan: Convert VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo chain.
by Józef Kucia 20 Mar '19

20 Mar '19

We should teach make_vulkan to handle pNext chains... Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 635c6a967b19..f86064c4b661 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -207,6 +207,20 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } +static void *convert_VkPhysicalDeviceFeatures2(const void *src) +{ + const VkPhysicalDeviceFeatures2 *in = src; + VkPhysicalDeviceFeatures2 *out; + + if (!(out = heap_alloc(sizeof(*out)))) + return NULL; + + *out = *in; + out->pNext = NULL; + + return out; +} + static void *convert_VkDeviceGroupDeviceCreateInfo(const void *src) { const VkDeviceGroupDeviceCreateInfo *in = src; @@ -248,12 +262,15 @@ static void *convert_VkPhysicalDeviceHostQueryResetFeaturesEXT(const void *src) static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) { VkPhysicalDeviceHostQueryResetFeaturesEXT *host_query_reset_features; + VkPhysicalDeviceFeatures2 *device_features; VkDeviceGroupDeviceCreateInfo *group_info; + device_features = wine_vk_find_struct(create_info, PHYSICAL_DEVICE_FEATURES_2); group_info = wine_vk_find_struct(create_info, DEVICE_GROUP_DEVICE_CREATE_INFO); host_query_reset_features = wine_vk_find_struct(create_info, PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT); create_info->pNext = NULL; + heap_free(device_features); if (group_info) { heap_free((void *)group_info->pPhysicalDevices); @@ -296,6 +313,12 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src dst_header = dst_header->pNext; break; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2: + if (!(dst_header->pNext = convert_VkPhysicalDeviceFeatures2(header))) + goto err; + dst_header = dst_header->pNext; + break; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT: if (!(dst_header->pNext = convert_VkPhysicalDeviceHostQueryResetFeaturesEXT(header))) goto err; -- 2.19.2

2 1

[PATCH 6/7] winevulkan: Trace structure types as decimal numbers.
by Józef Kucia 20 Mar '19

20 Mar '19

In Vulkan headers, structure types are specified as decimal numbers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4387aa8b0a22..635c6a967b19 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -303,7 +303,7 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src break; default: - FIXME("Application requested a linked structure of type %#x.\n", header->sType); + FIXME("Application requested a linked structure of type %u.\n", header->sType); } } } @@ -408,7 +408,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo break; default: - FIXME("Application requested a linked structure of type %#x.\n", header->sType); + FIXME("Application requested a linked structure of type %u.\n", header->sType); } } } @@ -1028,7 +1028,7 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in TRACE("%p, %p, %p\n", device, info, queue); if ((chain = info->pNext)) - FIXME("Ignoring a linked structure of type %#x.\n", chain->sType); + FIXME("Ignoring a linked structure of type %u.\n", chain->sType); matching_queue = &device->queues[info->queueFamilyIndex][info->queueIndex]; if (matching_queue->flags != info->flags) -- 2.19.2

2 1

[PATCH 5/7] winevulkan: Enable Vulkan 1.1.
by Józef Kucia 20 Mar '19

20 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d54cb0657171..20643fa1e34c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -65,7 +65,7 @@ LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) VK_XML_VERSION = "1.1.104" -WINE_VK_VERSION = (1, 0) +WINE_VK_VERSION = (1, 1) # Filenames to create. WINE_VULKAN_H = "../../include/wine/vulkan.h" diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 4e14ac796955..6d0ed45e3c3d 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -38,7 +38,7 @@ #ifndef __WINE_VULKAN_THUNKS_H #define __WINE_VULKAN_THUNKS_H -#define WINE_VK_VERSION VK_API_VERSION_1_0 +#define WINE_VK_VERSION VK_API_VERSION_1_1 /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers); -- 2.19.2

2 1

[PATCH 4/7] winevulkan: Enable a few extensions promoted to core in Vulkan 1.1.
by Józef Kucia 20 Mar '19

20 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 37 +++++++++++++++++++-------------- dlls/winevulkan/vulkan_thunks.c | 4 ++++ include/wine/vulkan.h | 8 +++++++ 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8b0ed0c13ecb..d54cb0657171 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -85,45 +85,50 @@ EXT_BLOCK_SIZE = 1000 BLACKLISTED_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_utils", "VK_EXT_validation_features", "VK_EXT_validation_flags", - "VK_KHR_display", + "VK_KHR_display", # Needs WSI work. "VK_KHR_get_surface_capabilities2", "VK_KHR_surface_protected_capabilities", - "VK_NV_external_memory_capabilities", # Device extensions "VK_AMD_display_native_hdr", - "VK_AMD_memory_overallocation_behavior", - # 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_calibrated_timestamps", - "VK_EXT_debug_report", + "VK_AMD_memory_overallocation_behavior", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter - "VK_EXT_external_memory_dma_buf", # Linux specific + "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. - "VK_EXT_image_drm_format_modifier", "VK_EXT_memory_priority", "VK_EXT_pipeline_creation_feedback", "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_display_timing", - "VK_KHR_display", # Needs WSI work. - "VK_KHR_external_fence", - "VK_KHR_external_fence_fd", "VK_KHR_external_fence_win32", - "VK_KHR_external_memory", - "VK_KHR_external_semaphore", + "VK_KHR_external_memory_win32", + "VK_KHR_external_semaphore_win32", "VK_KHR_shader_float16_int8", # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", "VK_NV_cooperative_matrix", "VK_NV_dedicated_allocation_image_aliasing", + + # Extensions for other platforms + "VK_EXT_external_memory_dma_buf", + "VK_EXT_image_drm_format_modifier", + "VK_KHR_external_fence_fd", + "VK_KHR_external_memory_fd", + "VK_KHR_external_semaphore_fd", + + # Deprecated extensions + "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", ] diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index ae4bcb206059..e1df2aa72eae 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3637,6 +3637,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_memory_budget", "VK_EXT_pci_bus_info", "VK_EXT_post_depth_coverage", + "VK_EXT_queue_family_foreign", "VK_EXT_sample_locations", "VK_EXT_sampler_filter_minmax", "VK_EXT_scalar_block_layout", @@ -3662,6 +3663,9 @@ static const char * const vk_device_extensions[] = "VK_KHR_device_group", "VK_KHR_draw_indirect_count", "VK_KHR_driver_properties", + "VK_KHR_external_fence", + "VK_KHR_external_memory", + "VK_KHR_external_semaphore", "VK_KHR_get_memory_requirements2", "VK_KHR_image_format_list", "VK_KHR_incremental_present", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 0754b03c8395..2a86277fe204 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -148,8 +148,12 @@ #define VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME "VK_KHR_device_group_creation" #define VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME "VK_KHR_external_memory_capabilities" +#define VK_KHR_EXTERNAL_MEMORY_SPEC_VERSION 1 +#define VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME "VK_KHR_external_memory" #define VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME "VK_KHR_external_semaphore_capabilities" +#define VK_KHR_EXTERNAL_SEMAPHORE_SPEC_VERSION 1 +#define VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME "VK_KHR_external_semaphore" #define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 2 #define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor" #define VK_EXT_CONDITIONAL_RENDERING_SPEC_VERSION 1 @@ -182,10 +186,14 @@ #define VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME "VK_KHR_create_renderpass2" #define VK_KHR_EXTERNAL_FENCE_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME "VK_KHR_external_fence_capabilities" +#define VK_KHR_EXTERNAL_FENCE_SPEC_VERSION 1 +#define VK_KHR_EXTERNAL_FENCE_EXTENSION_NAME "VK_KHR_external_fence" #define VK_KHR_MAINTENANCE2_SPEC_VERSION 1 #define VK_KHR_MAINTENANCE2_EXTENSION_NAME "VK_KHR_maintenance2" #define VK_KHR_VARIABLE_POINTERS_SPEC_VERSION 1 #define VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME "VK_KHR_variable_pointers" +#define VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION 1 +#define VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME "VK_EXT_queue_family_foreign" #define VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION 3 #define VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_KHR_dedicated_allocation" #define VK_EXT_SAMPLER_FILTER_MINMAX_SPEC_VERSION 1 -- 2.19.2

2 1