- Wine-Commits - list.winehq.org

Georg Lehmann : winevulkan: Skip features that are not part of Vulkan.
by Alexandre Julliard March 6, 2023

March 6, 2023

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

Brendan Shanks : loader: In macOS preloader, stop using mincore() to test if a region is empty.
by Alexandre Julliard March 6, 2023

March 6, 2023

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

Piotr Caban : gdiplus: Use transparency instead of background color if transparent color flag is set in GIF GCE.
by Alexandre Julliard March 6, 2023

March 6, 2023

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, move the top-down allocations area down.
by Alexandre Julliard March 6, 2023

March 6, 2023

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

Brendan Shanks : kernel32: Implement GetFirmwareType().
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: ac031bff9efb47ac883c062bc44bf60f68b44a1f URL: https://gitlab.winehq.org/wine/wine/-/commit/ac031bff9efb47ac883c062bc44bf6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 3 11:37:31 2023 -0800 kernel32: Implement GetFirmwareType(). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 12 ++++++++++++ include/winbase.h | 1 + include/winnt.h | 7 +++++++ 4 files changed, 21 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d6b0eb62a69..47ff251067a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -692,6 +692,7 @@ @ stdcall -import GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareType(ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4630043645c..e9e18925911 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -740,6 +740,18 @@ BOOL WINAPI SetFirmwareEnvironmentVariableW(const WCHAR *name, const WCHAR *guid return FALSE; } +/*********************************************************************** + * GetFirmwareType (KERNEL32.@) + */ +BOOL WINAPI GetFirmwareType(FIRMWARE_TYPE *type) +{ + if (!type) + return FALSE; + + *type = FirmwareTypeUnknown; + return TRUE; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 6b3048f795e..2829287a255 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2203,6 +2203,7 @@ WINBASEAPI DWORD WINAPI GetFileSize(HANDLE,LPDWORD); WINBASEAPI BOOL WINAPI GetFileSizeEx(HANDLE,PLARGE_INTEGER); WINBASEAPI BOOL WINAPI GetFileTime(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME); WINBASEAPI DWORD WINAPI GetFileType(HANDLE); +WINBASEAPI BOOL WINAPI GetFirmwareType(PFIRMWARE_TYPE); #define GetFreeSpace(w) (__MSABI_LONG(0x100000)) WINBASEAPI DWORD WINAPI GetFullPathNameA(LPCSTR,DWORD,LPSTR,LPSTR*); WINBASEAPI DWORD WINAPI GetFullPathNameW(LPCWSTR,DWORD,LPWSTR,LPWSTR*); diff --git a/include/winnt.h b/include/winnt.h index 17dce6e84e5..a7c69070a2c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6495,6 +6495,13 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; +typedef enum _FIRMWARE_TYPE +{ + FirmwareTypeUnknown, + FirmwareTypeBios, + FirmwareTypeUefi, + FirmwareTypeMax +} FIRMWARE_TYPE, *PFIRMWARE_TYPE; /* Intrinsic functions */

1 0

Francois Gouget : advapi32/tests: Fix the RegEnumValueA() tests in UTF-8 locales.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 95f2cc0f15b1dde0318e75e2a7f21957fa76af55 URL: https://gitlab.winehq.org/wine/wine/-/commit/95f2cc0f15b1dde0318e75e2a7f219… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 3 16:23:07 2023 +0100 advapi32/tests: Fix the RegEnumValueA() tests in UTF-8 locales. On Windows RegEnumValueA() is buggy such that when the value name buffer is too small, it may way overestimate the required data buffer size, sometimes returning more than the sufficiently large buffer it was provided, in which case that buffer is untouched and thus not NUL-terminated. So modify the tests to accept this broken result and avoid checking out-of-bounds data. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53172 --- dlls/advapi32/tests/registry.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 480e96ef6ee..524c3e0ef76 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -476,7 +476,7 @@ static void test_enum_value(void) { DWORD res; HKEY test_key; - char value[20], data[20]; + char value[20], data[30]; WCHAR valueW[20], dataW[20]; DWORD val_count, data_count, type; @@ -542,39 +542,50 @@ static void test_enum_value(void) /* overflow name */ val_count = 3; - data_count = 20; + data_count = 16; type = 1234; strcpy( value, "xxxxxxxxxx" ); memset( data, 'x', sizeof(data) ); + data[sizeof(data)-1] = '\0'; res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); ok( val_count == 3, "val_count set to %ld\n", val_count ); - /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + /* In double-byte and UTF-8 locales Windows 10 may set data_count > 7, + * potentially even more than the declared buffer size, in which case the + * buffer is not NUL-terminated. + */ ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); - /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ + /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in + * this case. Neither does Windows 10 21H1 in UTF-8 locales. + */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || - broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + broken( data_count > 7 && data_count < 16 && + strspn( data, "x" ) == data_count && data[data_count] == 0 ) || + broken( data_count >= 16 && strspn( data, "x" ) == sizeof(data) - 1 ), "data set to '%s' instead of 'foobar' or x's, data_count=%lu\n", data, data_count ); /* overflow empty name */ val_count = 0; - data_count = 20; + data_count = 16; type = 1234; strcpy( value, "xxxxxxxxxx" ); memset( data, 'x', sizeof(data) ); + data[sizeof(data)-1] = '\0'; res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); ok( val_count == 0, "val_count set to %ld\n", val_count ); - /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + /* See comment in 'overflow name' section */ ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); - /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ + /* See comment in 'overflow name' section */ ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || - broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + broken( data_count > 7 && data_count < 16 && + strspn( data, "x" ) == data_count && data[data_count] == 0 ) || + broken( data_count >= 16 && strspn( data, "x" ) == sizeof(data) - 1 ), "data set to '%s' instead of 'foobar' or x's, data_count=%lu\n", data, data_count ); /* overflow data */

1 0

Alexandre Julliard : Wine release 8.3
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: website Branch: master Commit: 68a726c06f3f79e39e5bf9236fc2950075b6d1dd URL: https://gitlab.winehq.org/winehq/winehq/-/commit/68a726c06f3f79e39e5bf9236f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:31:16 2023 +0100 Wine release 8.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023030301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023030301.xml b/news/en/2023030301.xml new file mode 100644 index 00000000..d1c50957 --- /dev/null +++ b/news/en/2023030301.xml @@ -0,0 +1,16 @@ +<news> +<date>March 3, 2023</date> +<title>Wine 8.3 Released</title> +<body> + The Wine development release 8.3 is now available. + <a href="{$root}/announce/8.3">What's new</a> in this release: +<ul> + <li>Support for the Low Fragmentation Heap.</li> + <li>Smard card support using PCSC-Lite.</li> + <li>Bundled Zydis library for more correct disassembly.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.3 : Alexandre Julliard : Release 8.3
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: refs/tags/wine-8.3 Tag: 343a857a2648ebe1c276e558ca238f0b8087a900 URL: https://gitlab.winehq.org/wine/wine/-/tags/343a857a2648ebe1c276e558ca238f0b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:28:42 2023 +0100 Release 8.3

1 0

Alexandre Julliard : Release 8.3.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: e796002ee61bf5dfb2718e8f4fb8fa928ccdc236 URL: https://gitlab.winehq.org/wine/wine/-/commit/e796002ee61bf5dfb2718e8f4fb8fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:25:34 2023 +0100 Release 8.3. --- ANNOUNCE | 701 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 346 insertions(+), 380 deletions(-)

1 0

Piotr Caban : windowscodecs: Don't reorder gif extension blocks in GetReaderByIndex.
by Alexandre Julliard March 3, 2023

March 3, 2023

Module: wine Branch: master Commit: fe7885be8002013499fdca426d0ac2ab254926ec URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7885be8002013499fdca426d0ac2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 3 13:33:55 2023 +0100 windowscodecs: Don't reorder gif extension blocks in GetReaderByIndex. --- dlls/windowscodecs/gifformat.c | 54 +++++++++++++++---------------------- dlls/windowscodecs/tests/metadata.c | 28 +++++++++---------- 2 files changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 4bd0772810d..f0048d12da9 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -947,7 +947,10 @@ static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockRea UINT index, IWICMetadataReader **reader) { GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); - int i, gce_index = -1, gce_skipped = 0; + class_constructor constructor; + ExtensionBlock *ext; + const void *data; + int data_size; TRACE("(%p,%u,%p)\n", iface, index, reader); @@ -959,40 +962,27 @@ static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockRea if (index >= This->frame->Extensions.ExtensionBlockCount + 1) return E_INVALIDARG; - for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++) + ext = This->frame->Extensions.ExtensionBlocks + index - 1; + if (ext->Function == GRAPHICS_EXT_FUNC_CODE) { - class_constructor constructor; - const void *data; - int data_size; - - if (index != i + 1 - gce_skipped) continue; - - if (This->frame->Extensions.ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE) - { - gce_index = i; - gce_skipped = 1; - continue; - } - else if (This->frame->Extensions.ExtensionBlocks[i].Function == COMMENT_EXT_FUNC_CODE) - { - constructor = GifCommentReader_CreateInstance; - data = This->frame->Extensions.ExtensionBlocks[i].Bytes; - data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; - } - else - { - constructor = UnknownMetadataReader_CreateInstance; - data = This->frame->Extensions.ExtensionBlocks[i].Bytes; - data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; - } - return create_metadata_reader(data, data_size, constructor, reader); + constructor = GCEReader_CreateInstance; + data = ext->Bytes + 3; + data_size = ext->ByteCount - 4; + } + else if (ext->Function == COMMENT_EXT_FUNC_CODE) + { + constructor = GifCommentReader_CreateInstance; + data = ext->Bytes; + data_size = ext->ByteCount; + } + else + { + constructor = UnknownMetadataReader_CreateInstance; + data = ext->Bytes; + data_size = ext->ByteCount; } - if (gce_index == -1) return E_INVALIDARG; - - return create_metadata_reader(This->frame->Extensions.ExtensionBlocks[gce_index].Bytes + 3, - This->frame->Extensions.ExtensionBlocks[gce_index].ByteCount - 4, - GCEReader_CreateInstance, reader); + return create_metadata_reader(data, data_size, constructor, reader); } static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 7902a5fcb8d..1deb09cfd19 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -188,10 +188,10 @@ static const char animatedgif[] = { 0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, 0xDE,0xDE,0xDE,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x4C,0x01,0x00, +0x21,0xF9,0x04,0x01,0x0A,0x00,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','1',0x00, 0x21,0x01,0x0C,'p','l','a','i','n','t','e','x','t',' ','#','1',0x00, -0x21,0xF9,0x04,0x01,0x0A,0x00,0x01,0x00,0x2C, -0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, +0x2C,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x81, 0x4D,0x4D,0x4D,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x02,0x44,0x01,0x00, 0x21,0xFE,0x08,'i','m','a','g','e',' ','#','2',0x00, @@ -1517,15 +1517,14 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#lx\n", hr); - ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ - "wrong metadata format %s\n", wine_dbgstr_guid(&format)); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), /* Graphic Control Extension */ + "wrong metadata format %s\n", wine_dbgstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#lx\n", hr); - ok(count == ARRAY_SIZE(animated_gif_comment_2), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_GCE), "unexpected count %u\n", count); - if (count == 1) - compare_metadata(reader, animated_gif_comment_2, count); + compare_metadata(reader, animated_gif_GCE, count); IWICMetadataReader_Release(reader); } @@ -1537,14 +1536,15 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#lx\n", hr); - ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), - "wrong metadata format %s\n", wine_dbgstr_guid(&format)); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), /* Comment Extension */ + "wrong metadata format %s\n", wine_dbgstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#lx\n", hr); - ok(count == ARRAY_SIZE(animated_gif_plain_2), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_comment_2), "unexpected count %u\n", count); - compare_metadata(reader, animated_gif_plain_2, count); + if (count == 1) + compare_metadata(reader, animated_gif_comment_2, count); IWICMetadataReader_Release(reader); } @@ -1556,14 +1556,14 @@ static void test_metadata_gif(void) { hr = IWICMetadataReader_GetMetadataFormat(reader, &format); ok(hr == S_OK, "GetMetadataFormat failed, hr=%#lx\n", hr); - ok(IsEqualGUID(&format, &GUID_MetadataFormatGCE), /* Graphic Control Extension */ + ok(IsEqualGUID(&format, &GUID_MetadataFormatUnknown), "wrong metadata format %s\n", wine_dbgstr_guid(&format)); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#lx\n", hr); - ok(count == ARRAY_SIZE(animated_gif_GCE), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_plain_2), "unexpected count %u\n", count); - compare_metadata(reader, animated_gif_GCE, count); + compare_metadata(reader, animated_gif_plain_2, count); IWICMetadataReader_Release(reader); }

1 0