wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Davide Beatrici : winecoreaudio: Return STATUS_SUCCESS for unused unixlib functions.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: ae3c2d7c5fb61ad2dcf6c2e12e43f9a57b129b25 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae3c2d7c5fb61ad2dcf6c2e12e43f9… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 3 01:56:39 2023 +0100 winecoreaudio: Return STATUS_SUCCESS for unused unixlib functions. --- dlls/winecoreaudio.drv/coreaudio.c | 41 +++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index b48a0c751fd..073dacf4bad 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -96,6 +96,11 @@ struct coreaudio_stream BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; }; +static NTSTATUS unix_not_implemented(void *args) +{ + return STATUS_SUCCESS; +} + static HRESULT osstatus_to_hresult(OSStatus sc) { switch(sc){ @@ -1647,23 +1652,23 @@ static NTSTATUS unix_set_volumes(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - NULL, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, + unix_not_implemented, unix_get_endpoint_ids, unix_create_stream, unix_release_stream, unix_start, unix_stop, unix_reset, - NULL, + unix_not_implemented, unix_get_render_buffer, unix_release_render_buffer, unix_get_capture_buffer, unix_release_capture_buffer, unix_is_format_supported, unix_get_mix_format, - NULL, + unix_not_implemented, unix_get_buffer_size, unix_get_latency, unix_get_current_padding, @@ -1671,16 +1676,16 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_get_frequency, unix_get_position, unix_set_volumes, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, unix_is_started, - NULL, + unix_not_implemented, unix_midi_init, unix_midi_release, unix_midi_out_message, unix_midi_in_message, unix_midi_notify_wait, - NULL, + unix_not_implemented, }; #ifdef _WIN64 @@ -1991,23 +1996,23 @@ static NTSTATUS unix_wow64_set_volumes(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - NULL, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, + unix_not_implemented, unix_wow64_get_endpoint_ids, unix_wow64_create_stream, unix_wow64_release_stream, unix_start, unix_stop, unix_reset, - NULL, + unix_not_implemented, unix_wow64_get_render_buffer, unix_release_render_buffer, unix_wow64_get_capture_buffer, unix_release_capture_buffer, unix_wow64_is_format_supported, unix_wow64_get_mix_format, - NULL, + unix_not_implemented, unix_wow64_get_buffer_size, unix_wow64_get_latency, unix_wow64_get_current_padding, @@ -2015,16 +2020,16 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_wow64_get_frequency, unix_wow64_get_position, unix_wow64_set_volumes, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, unix_is_started, - NULL, + unix_not_implemented, unix_wow64_midi_init, unix_midi_release, unix_wow64_midi_out_message, unix_wow64_midi_in_message, unix_wow64_midi_notify_wait, - NULL, + unix_not_implemented, }; #endif /* _WIN64 */

1 0

Davide Beatrici : winealsa: Return STATUS_SUCCESS for unused unixlib functions.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 0870956c7788a8bed4fc3db01f231a7eb908f842 URL: https://gitlab.winehq.org/wine/wine/-/commit/0870956c7788a8bed4fc3db01f231a… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 3 01:56:39 2023 +0100 winealsa: Return STATUS_SUCCESS for unused unixlib functions. --- dlls/winealsa.drv/alsa.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index ffa39f5e484..2b5f61eb213 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -88,6 +88,11 @@ static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v'}; +static NTSTATUS alsa_not_implemented(void *args) +{ + return STATUS_SUCCESS; +} + static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) { while (len--) *dst++ = (unsigned char)*src++; @@ -2431,9 +2436,9 @@ static NTSTATUS alsa_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - NULL, - NULL, - NULL, + alsa_not_implemented, + alsa_not_implemented, + alsa_not_implemented, alsa_get_endpoint_ids, alsa_create_stream, alsa_release_stream, @@ -2447,7 +2452,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, - NULL, + alsa_not_implemented, alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, @@ -2456,15 +2461,15 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_get_position, alsa_set_volumes, alsa_set_event_handle, - NULL, + alsa_not_implemented, alsa_is_started, alsa_get_prop_value, - NULL, + alsa_not_implemented, alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, - NULL, + alsa_not_implemented, }; #ifdef _WIN64 @@ -2852,9 +2857,9 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - NULL, - NULL, - NULL, + alsa_not_implemented, + alsa_not_implemented, + alsa_not_implemented, alsa_wow64_get_endpoint_ids, alsa_wow64_create_stream, alsa_wow64_release_stream, @@ -2868,7 +2873,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_release_capture_buffer, alsa_wow64_is_format_supported, alsa_wow64_get_mix_format, - NULL, + alsa_not_implemented, alsa_wow64_get_buffer_size, alsa_wow64_get_latency, alsa_wow64_get_current_padding, @@ -2877,15 +2882,15 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_wow64_get_position, alsa_wow64_set_volumes, alsa_wow64_set_event_handle, - NULL, + alsa_not_implemented, alsa_is_started, alsa_wow64_get_prop_value, - NULL, + alsa_not_implemented, alsa_midi_release, alsa_wow64_midi_out_message, alsa_wow64_midi_in_message, alsa_wow64_midi_notify_wait, - NULL, + alsa_not_implemented, }; #endif /* _WIN64 */

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.242.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 1eed39fffe86ec60dee0678ba2303fee7ad78aec URL: https://gitlab.winehq.org/wine/wine/-/commit/1eed39fffe86ec60dee0678ba2303f… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 21:34:37 2023 +0100 winevulkan: Update to VK spec version 1.3.242. --- dlls/vulkan-1/vulkan-1.spec | 4 +- dlls/winevulkan/loader_thunks.c | 31 ++++- dlls/winevulkan/loader_thunks.h | 25 +++- dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan_thunks.c | 271 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 8 +- dlls/winevulkan/winevulkan.json | 2 +- dlls/winevulkan/winevulkan.spec | 4 +- include/wine/vulkan.h | 105 ++++++++++++++-- include/wine/vulkan_driver.h | 2 +- 10 files changed, 435 insertions(+), 21 deletions(-)

1 0

Georg Lehmann : winevulkan: Add basic support for extension dependencies.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 421140b6246a5efd3352a21345f1b7b69b3cc980 URL: https://gitlab.winehq.org/wine/wine/-/commit/421140b6246a5efd3352a21345f1b7… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 21:26:31 2023 +0100 winevulkan: Add basic support for extension dependencies. --- dlls/winevulkan/make_vulkan | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 173de720443..95e65a087b6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3533,6 +3533,11 @@ class VkRegistry(object): if len(set(requires).intersection(skipped_exts)) > 0: skipped_exts.append(ext_name) return + elif "depends" in ext.attrib: + # The syntax for this is more complex, but this is good enough for now. + if any([sext in ext.attrib["depends"] for sext in skipped_exts]): + skipped_exts.append(ext_name) + return LOGGER.debug("Loading extension: {0}".format(ext_name))

1 0

Georg Lehmann : winevulkan: Skip features that are not part of Vulkan.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 8fc724927a739dcd62a298d4f93e59184575cf3c URL: https://gitlab.winehq.org/wine/wine/-/commit/8fc724927a739dcd62a298d4f93e59… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 20:54:40 2023 +0100 winevulkan: Skip features that are not part of Vulkan. --- dlls/winevulkan/make_vulkan | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d80b7ccc9c6..173de720443 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3584,6 +3584,8 @@ class VkRegistry(object): """ Parse the feature section, which describes Core commands and types needed. """ for feature in root.findall("./feature"): + if not api_is_vulkan(feature): + continue feature_name = feature.attrib["name"] for require in feature.findall("require"): LOGGER.info("Including features for {0}".format(require.attrib.get("comment")))

1 0

Georg Lehmann : winevulkan: Only parse extensions for Vulkan.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: e500ca7648438067778d7a33955cfc1da10f7a3d URL: https://gitlab.winehq.org/wine/wine/-/commit/e500ca7648438067778d7a33955cfc… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 20:53:07 2023 +0100 winevulkan: Only parse extensions for Vulkan. 242 adds VulkanSC only extensions --- dlls/winevulkan/make_vulkan | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e1ba431175e..d80b7ccc9c6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3490,8 +3490,9 @@ class VkRegistry(object): if cmd_name in self.funcs: self.funcs[cmd_name].extensions.add(ext_name) - # Some extensions are not ready or have numbers reserved as a place holder. - if ext.attrib["supported"] == "disabled": + # Some extensions are not ready or have numbers reserved as a place holder + # or are only supported for VulkanSC. + if not "vulkan" in ext.attrib["supported"].split(","): LOGGER.debug("Skipping disabled extension: {0}".format(ext_name)) skipped_exts.append(ext_name) return

1 0

Georg Lehmann : winevulkan: Deal with per api xml entries.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 53c7ccec44e2cac1f3d117b6fc81193e8c8388d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/53c7ccec44e2cac1f3d117b6fc8119… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 20:47:43 2023 +0100 winevulkan: Deal with per api xml entries. Otherwise we will have duplicate members/params with the new 242 xml. --- dlls/winevulkan/make_vulkan | 80 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 706f4df5853..e1ba431175e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -300,6 +300,8 @@ class Direction(Enum): INPUT = 1 OUTPUT = 2 +def api_is_vulkan(obj): + return "vulkan" in obj.get("api", "vulkan").split(",") class VkBaseType(object): def __init__(self, name, _type, alias=None, requires=None): @@ -350,6 +352,9 @@ class VkDefine(object): @staticmethod def from_xml(define): + if not api_is_vulkan(define): + return None + name_elem = define.find("name") if name_elem is None: @@ -426,6 +431,9 @@ class VkEnum(object): @staticmethod def from_xml(enum): + if not api_is_vulkan(enum): + return None + name = enum.attrib.get("name") bitwidth = int(enum.attrib.get("bitwidth", "32")) result = VkEnum(name, bitwidth) @@ -589,6 +597,9 @@ class VkFunction(object): Returns: VkFunction """ + if not api_is_vulkan(command): + return None + func_name = command.attrib.get("name") func_type = alias.type params = alias.params @@ -597,6 +608,9 @@ class VkFunction(object): @staticmethod def from_xml(command, types): + if not api_is_vulkan(command): + return None + proto = command.find("proto") func_name = proto.find("name").text func_type = proto.find("type").text @@ -604,7 +618,8 @@ class VkFunction(object): params = [] for param in command.findall("param"): vk_param = VkParam.from_xml(param, types, params) - params.append(vk_param) + if vk_param: + params.append(vk_param) return VkFunction(_type=func_type, name=func_name, params=params) @@ -950,6 +965,9 @@ class VkFunctionPointer(object): @staticmethod def from_xml(funcpointer): + if not api_is_vulkan(funcpointer): + return None + members = [] begin = None @@ -1030,6 +1048,9 @@ class VkHandle(object): @staticmethod def from_xml(handle): + if not api_is_vulkan(handle): + return None + name = handle.find("name").text _type = handle.find("type").text parent = handle.attrib.get("parent") # Most objects have a parent e.g. VkQueue has VkDevice. @@ -1370,6 +1391,9 @@ class VkMember(VkVariable): def from_xml(member, returnedonly, parent): """ Helper function for parsing a member tag within a struct or union. """ + if not api_is_vulkan(member): + return None + name_elem = member.find("name") type_elem = member.find("type") @@ -1608,6 +1632,9 @@ class VkParam(VkVariable): def from_xml(param, types, parent): """ Helper function to create VkParam from xml. """ + if not api_is_vulkan(param): + return None + # Parameter parsing is slightly tricky. All the data is contained within # a param tag, but some data is within subtags while others are text # before or after the type tag. @@ -1916,6 +1943,9 @@ class VkStruct(Sequence): @staticmethod def from_xml(struct): + if not api_is_vulkan(struct): + return None + # Unions and structs are the same parsing wise, but we need to # know which one we are dealing with later on for code generation. union = True if struct.attrib["category"] == "union" else False @@ -1944,7 +1974,8 @@ class VkStruct(Sequence): s = VkStruct(name, [], returnedonly, structextends, union=union) for member in struct.findall("member"): vk_member = VkMember.from_xml(member, returnedonly, s) - s.members.append(vk_member) + if vk_member: + s.members.append(vk_member) return s @@ -3303,13 +3334,15 @@ class VkRegistry(object): continue func = VkFunction.from_xml(command, self.types) - funcs[func.name] = func + if func: + funcs[func.name] = func for command in alias_commands: alias_name = command.attrib.get("alias") alias = funcs[alias_name] func = VkFunction.from_alias(command, alias) - funcs[func.name] = func + if func: + funcs[func.name] = func # To make life easy for the code generation, separate all function # calls out in the 4 types of Vulkan functions: @@ -3347,7 +3380,9 @@ class VkRegistry(object): _type = enum.attrib.get("type") if _type in ("enum", "bitmask"): - enums[name] = VkEnum.from_xml(enum) + enum_obj = VkEnum.from_xml(enum) + if enum_obj: + enums[name] = enum_obj else: # If no type is set, we are dealing with API constants. for value in enum.findall("enum"): @@ -3607,8 +3642,11 @@ class VkRegistry(object): if tail is not None: _type += tail.strip() basetype = VkBaseType(name, _type) - base_types.append(basetype) - type_info["data"] = basetype + if basetype: + base_types.append(basetype) + type_info["data"] = basetype + else: + continue # Basic C types don't need us to define them, but we do need data for them if type_info["requires"] == "vk_platform": @@ -3629,8 +3667,11 @@ class VkRegistry(object): if type_info["category"] == "define": define = VkDefine.from_xml(t) - defines.append(define) - type_info["data"] = define + if define: + defines.append(define) + type_info["data"] = define + else: + continue if type_info["category"] == "enum": name = t.attrib.get("name") @@ -3646,13 +3687,19 @@ class VkRegistry(object): if type_info["category"] == "funcpointer": funcpointer = VkFunctionPointer.from_xml(t) - funcpointers.append(funcpointer) - type_info["data"] = funcpointer + if funcpointer: + funcpointers.append(funcpointer) + type_info["data"] = funcpointer + else: + continue if type_info["category"] == "handle": handle = VkHandle.from_xml(t) - handles.append(handle) - type_info["data"] = handle + if handle: + handles.append(handle) + type_info["data"] = handle + else: + continue if type_info["category"] in ["struct", "union"]: # We store unions among structs as some structs depend @@ -3660,8 +3707,11 @@ class VkRegistry(object): # generation anyway. The official Vulkan scripts use # a similar kind of hack. struct = VkStruct.from_xml(t) - structs.append(struct) - type_info["data"] = struct + if struct: + structs.append(struct) + type_info["data"] = struct + else: + continue # Name is in general within a name tag else it is an optional # attribute on the type tag.

1 0

Piotr Caban : gdiplus: Use transparency instead of background color if transparent color flag is set in GIF GCE.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 333a63c456fec24f249a7096b1d858252c9a6bf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/333a63c456fec24f249a7096b1d858… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 3 15:56:29 2023 +0100 gdiplus: Use transparency instead of background color if transparent color flag is set in GIF GCE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54563 --- dlls/gdiplus/image.c | 16 +++--------- dlls/gdiplus/tests/image.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 101e7ae1c93..3b9ce3c14f1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3881,20 +3881,10 @@ static DWORD get_gif_background_color(GpBitmap *bitmap) UINT i; for(i=0; i<bitmap->prop_count; i++) { - if(bitmap->prop_item[i].id == PropertyTagIndexBackground) { + if(bitmap->prop_item[i].id == PropertyTagIndexBackground) bgcolor_idx = *(BYTE*)bitmap->prop_item[i].value; - break; - } - } - - for(i=0; i<bitmap->prop_count; i++) { - if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) { - BYTE transparent_idx; - transparent_idx = *(BYTE*)bitmap->prop_item[i].value; - - if(transparent_idx == bgcolor_idx) - return 0; - } + else if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) + return 0; } for(i=0; i<bitmap->prop_count; i++) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9e35cf33eb4..e32b4c81240 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2899,10 +2899,11 @@ static const unsigned char gifanimation[72] = { * -dispose previous -page +4+0 -size 2x2 xc:green \ * -dispose undefined -page +6+0 -size 2x2 xc:gray \ * test.gif + * Background color index changed to 1. */ static const unsigned char gifanimation2[] = { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, - 0x02, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, @@ -2937,6 +2938,43 @@ static ARGB gifanimation2_pixels[5][4] = { {0xffff0000, 0, 0, 0xff7e7e7e} }; +static const unsigned char gifanimation3[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, + 0x02, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, + 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, + 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, + 0x30, 0x03, 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x04, 0x84, 0x8f, 0x09, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x05, 0x64, 0x00, 0x10, 0x00, 0x2c, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x64, + 0x00, 0x10, 0x00, 0x2c, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x81, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x02, 0x03, 0x44, 0x34, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x0d, 0x64, 0x00, 0x10, 0x00, 0x2c, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x80, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, + 0x00, 0x10, 0x00, 0x2c, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x80, 0x7e, 0x7e, 0x7e, + 0x00, 0x00, 0x00, 0x02, 0x02, 0x84, 0x51, 0x00, + 0x3b +}; + +static ARGB gifanimation3_pixels[5][4] = { + {0xff000000, 0xff000000, 0xff000000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff000000, 0xff000000}, + {0xffff0000, 0xff0000ff, 0xff000000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff008000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff000000, 0xff7e7e7e} +}; + static void test_multiframegif(void) { LPSTREAM stream; @@ -3185,6 +3223,31 @@ static void test_multiframegif(void) } GdipDisposeImage((GpImage*)bmp); + + hglob = GlobalAlloc (0, sizeof(gifanimation3)); + data = GlobalLock (hglob); + memcpy(data, gifanimation3, sizeof(gifanimation3)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + IStream_Release(stream); + + for(i=0; i<6; i++) { + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, i%5); + expect(Ok, stat); + + for(j=0; j<4; j++) { + stat = GdipBitmapGetPixel(bmp, j*2, 0, &color); + expect(Ok, stat); + ok(gifanimation3_pixels[i%5][j] == color, "at %d,%d got %lx, expected %lx\n", i, j, color, gifanimation3_pixels[i%5][j]); + } + } + + GdipDisposeImage((GpImage*)bmp); } static void test_rotateflip(void)

1 0

Brendan Shanks : loader: In macOS preloader, stop using mincore() to test if a region is empty.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 93941d6ec67860778a2b26470ba06f7439b9992e URL: https://gitlab.winehq.org/wine/wine/-/commit/93941d6ec67860778a2b26470ba06f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 28 12:31:25 2023 -0800 loader: In macOS preloader, stop using mincore() to test if a region is empty. --- loader/preloader_mac.c | 58 +++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 61da37be775..8e249a7dc4d 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -48,6 +48,7 @@ #include "wine/asm.h" #include "main.h" +#if defined(__x86_64__) /* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) * before the preloader runs, which prevents any nonrelocatable EXEs with that * base address from running. @@ -55,8 +56,18 @@ * This empty linker section forces Rosetta's allocations (currently ~132 MB) * to start at 0x114000000, and they should end below 0x120000000. */ -#if defined(__x86_64__) __asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); + +static const struct wine_preload_info zerofill_sections[] = +{ + { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ + { 0, 0 } /* end of list */ +}; +#else +static const struct wine_preload_info zerofill_sections[] = +{ + { 0, 0 } /* end of list */ +}; #endif #ifndef LC_MAIN @@ -144,7 +155,6 @@ void __stack_chk_fail(void) { return; } #ifdef __i386__ -static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header #define target_segment_command segment_command @@ -219,7 +229,6 @@ __ASM_GLOBAL_FUNC( start, #elif defined(__x86_64__) -static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header_64 #define target_segment_command segment_command_64 @@ -302,9 +311,6 @@ SYSCALL_FUNC( wld_mmap, 197 /* SYS_mmap */ ); void *wld_munmap( void *start, size_t len ); SYSCALL_FUNC( wld_munmap, 73 /* SYS_munmap */ ); -int wld_mincore( void *addr, size_t length, unsigned char *vec ); -SYSCALL_FUNC( wld_mincore, 78 /* SYS_mincore */ ); - static intptr_t (*p_dyld_get_image_slide)( const struct target_mach_header* mh ); #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -556,28 +562,17 @@ static void *get_entry_point( struct target_mach_header *mh, intptr_t slide, int return NULL; }; -static int is_region_empty( struct wine_preload_info *info ) +static int is_zerofill( struct wine_preload_info *info ) { - unsigned char vec[1024]; - size_t pos, size, block = 1024 * page_size; int i; - for (pos = 0; pos < info->size; pos += size) + for (i = 0; zerofill_sections[i].size; i++) { - size = (pos + block <= info->size) ? block : (info->size - pos); - if (wld_mincore( (char *)info->addr + pos, size, vec ) == -1) - { - if (size <= page_size) continue; - block = page_size; size = 0; /* retry with smaller block size */ - } - else - { - for (i = 0; i < size / page_size; i++) - if (vec[i] & 1) return 0; - } + if ((zerofill_sections[i].addr == info->addr) && + (zerofill_sections[i].size == info->size)) + return 1; } - - return 1; + return 0; } static int map_region( struct wine_preload_info *info ) @@ -585,20 +580,11 @@ static int map_region( struct wine_preload_info *info ) int flags = MAP_PRIVATE | MAP_ANON; void *ret; - if (!info->addr) flags |= MAP_FIXED; + if (!info->addr || is_zerofill( info )) flags |= MAP_FIXED; - for (;;) - { - ret = wld_mmap( info->addr, info->size, PROT_NONE, flags, -1, 0 ); - if (ret == info->addr) return 1; - if (ret != (void *)-1) wld_munmap( ret, info->size ); - if (flags & MAP_FIXED) break; - - /* Some versions of macOS ignore the address hint passed to mmap - - * use mincore() to check if its empty and then use MAP_FIXED */ - if (!is_region_empty( info )) break; - flags |= MAP_FIXED; - } + ret = wld_mmap( info->addr, info->size, PROT_NONE, flags, -1, 0 ); + if (ret == info->addr) return 1; + if (ret != (void *)-1) wld_munmap( ret, info->size ); /* don't warn for zero page */ if (info->addr >= (void *)0x1000)

1 0

Brendan Shanks : loader: In macOS preloader, move the top-down allocations area down.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: c10207e2a7ed2d5fd8b7d3f5c35a632b209d442b URL: https://gitlab.winehq.org/wine/wine/-/commit/c10207e2a7ed2d5fd8b7d3f5c35a63… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 28 11:14:16 2023 -0800 loader: In macOS preloader, move the top-down allocations area down. On Ventura, the Rosetta runtime and dyld shared cache now reach down to 0x7ff7fffb8000 on my system. --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index ce7a14e17ae..61da37be775 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -85,7 +85,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ - { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ff000000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

← Newer
1
...
82
83
84
85
86
87
88
...
91
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-commits March 2023