July 2022 - Wine-commits - list.winehq.org

Zhiyi Zhang : ntdll: Restore the timezone bias cache.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 45b5661c69d73bd777485b1707e355e0088ea825 URL: https://gitlab.winehq.org/wine/wine/-/commit/45b5661c69d73bd777485b1707e355… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 25 12:01:07 2022 +0800 ntdll: Restore the timezone bias cache. After 7161dcd, the timezone bias is calculated every time when SystemTimeOfDayInformation is queried. This restores the cache for timezone bias. Improve HROT framerate from ~100fps to ~500fps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index f374fdec131..902b63c2b2f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -236,6 +236,8 @@ static unsigned int logical_proc_info_len, logical_proc_info_alloc_len; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *logical_proc_info_ex; static unsigned int logical_proc_info_ex_size, logical_proc_info_ex_alloc_size; +static pthread_mutex_t timezone_mutex = PTHREAD_MUTEX_INITIALIZER; + /******************************************************************************* * Architecture specific feature detection for CPUs * @@ -2562,17 +2564,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemTimeOfDayInformation: /* 3 */ { + static LONGLONG last_bias; + static time_t last_utc; struct tm *tm; - time_t now; + time_t utc; SYSTEM_TIMEOFDAY_INFORMATION sti = {{{ 0 }}}; sti.BootTime.QuadPart = server_start_time; - now = time( NULL ); - tm = gmtime( &now ); - sti.TimeZoneBias.QuadPart = mktime( tm ) - now; - tm = localtime( &now ); - if (tm->tm_isdst) sti.TimeZoneBias.QuadPart -= 3600; - sti.TimeZoneBias.QuadPart *= TICKSPERSEC; + + utc = time( NULL ); + pthread_mutex_lock( &timezone_mutex ); + if (utc != last_utc) + { + last_utc = utc; + tm = gmtime( &utc ); + last_bias = mktime( tm ) - utc; + tm = localtime( &utc ); + if (tm->tm_isdst) last_bias -= 3600; + last_bias *= TICKSPERSEC; + } + sti.TimeZoneBias.QuadPart = last_bias; + pthread_mutex_unlock( &timezone_mutex ); + NtQuerySystemTime( &sti.SystemTime ); if (size <= sizeof(sti))

1 0

Rémi Bernon : ntdll: Use a block member in large blocks.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 5c98b608e4c26e0216d0012c18374ae6b38511ab URL: https://gitlab.winehq.org/wine/wine/-/commit/5c98b608e4c26e0216d0012c18374a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 29 16:28:34 2022 +0200 ntdll: Use a block member in large blocks. --- dlls/kernel32/tests/heap.c | 1 - dlls/ntdll/heap.c | 120 +++++++++++++++++++++++++++------------------ 2 files changed, 71 insertions(+), 50 deletions(-)

1 0

Rémi Bernon : ntdll: Pass a struct block to (find|validate)_large_block.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 0984389ca6cd58be02e8a1afd1e051c9cad50b73 URL: https://gitlab.winehq.org/wine/wine/-/commit/0984389ca6cd58be02e8a1afd1e051… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 25 15:43:54 2022 +0200 ntdll: Pass a struct block to (find|validate)_large_block. --- dlls/ntdll/heap.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b3c7c7701ec..4d39291bdb8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -869,22 +869,22 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct /*********************************************************************** * find_large_block */ -static ARENA_LARGE *find_large_block( const struct heap *heap, const void *ptr ) +static BOOL find_large_block( const struct heap *heap, const struct block *block ) { ARENA_LARGE *arena; LIST_FOR_EACH_ENTRY( arena, &heap->large_list, ARENA_LARGE, entry ) - if (ptr == arena + 1) return arena; + if (block == &arena->block) return TRUE; - return NULL; + return FALSE; } -static BOOL validate_large_arena( const struct heap *heap, const ARENA_LARGE *arena ) +static BOOL validate_large_block( const struct heap *heap, const struct block *block ) { - const struct block *block = &arena->block; + const ARENA_LARGE *arena = CONTAINING_RECORD( block, ARENA_LARGE, block ); const char *err = NULL; - if ((ULONG_PTR)arena & COMMIT_MASK) + if (ROUND_ADDR( block, COMMIT_MASK ) != arena) err = "invalid block alignment"; else if (block_get_size( block )) err = "invalid block size"; @@ -1193,21 +1193,20 @@ static BOOL validate_used_block( const struct heap *heap, const SUBHEAP *subheap static BOOL heap_validate_ptr( const struct heap *heap, const void *ptr, SUBHEAP **subheap ) { - const struct block *arena = (struct block *)ptr - 1; - const ARENA_LARGE *large_arena; + const struct block *block = (struct block *)ptr - 1; - if (!(*subheap = find_subheap( heap, arena, FALSE ))) + if (!(*subheap = find_subheap( heap, block, FALSE ))) { - if (!(large_arena = find_large_block( heap, ptr ))) + if (!find_large_block( heap, block )) { if (WARN_ON(heap)) WARN("heap %p, ptr %p: block region not found\n", heap, ptr ); return FALSE; } - return validate_large_arena( heap, large_arena ); + return validate_large_block( heap, block ); } - return validate_used_block( heap, *subheap, arena ); + return validate_used_block( heap, *subheap, block ); } static BOOL heap_validate( const struct heap *heap ) @@ -1239,7 +1238,7 @@ static BOOL heap_validate( const struct heap *heap ) } LIST_FOR_EACH_ENTRY( large_arena, &heap->large_list, ARENA_LARGE, entry ) - if (!validate_large_arena( heap, large_arena )) return FALSE; + if (!validate_large_block( heap, &large_arena->block )) return FALSE; return TRUE; } @@ -1263,7 +1262,7 @@ static inline struct block *unsafe_block_from_ptr( const struct heap *heap, cons if (!*subheap) { - if (find_large_block( heap, ptr )) return block; + if (find_large_block( heap, block )) return block; err = "block region not found"; } else if ((ULONG_PTR)ptr % ALIGNMENT) @@ -1860,14 +1859,18 @@ static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subhea static NTSTATUS heap_walk( const struct heap *heap, struct rtl_heap_entry *entry ) { - const ARENA_LARGE *large; + const struct block *block = (struct block *)entry->lpData - 1; + const ARENA_LARGE *large = NULL; const struct list *next; const SUBHEAP *subheap; NTSTATUS status; char *base; - if ((large = find_large_block( heap, entry->lpData ))) + if (find_large_block( heap, block )) + { + large = CONTAINING_RECORD( block, ARENA_LARGE, block ); next = &large->entry; + } else if ((subheap = find_subheap( heap, entry->lpData, TRUE ))) { if (!(status = heap_walk_blocks( heap, subheap, entry ))) return STATUS_SUCCESS;

1 0

Rémi Bernon : ntdll: Fixup the RtlWalkHeap entry pointer before subheap lookup.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 1d65bc06b303dc19307c1a1c26603d690ffa7f12 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d65bc06b303dc19307c1a1c26603d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 25 18:35:56 2022 +0200 ntdll: Fixup the RtlWalkHeap entry pointer before subheap lookup. The commit end of a subheap may be equal to the beginning of another subheap, in which case find_subheap() will return that one, when we pass it the previously returned uncommitted range lpData, and we may effectively skip backwards in the subheap list. This fixes a hang on starting or loading a game with Bloodrayne: Terminal Cut. Based on a patch from Zebediah Figura. --- dlls/ntdll/heap.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4d39291bdb8..ef91096f258 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1812,17 +1812,13 @@ BOOLEAN WINAPI RtlValidateHeap( HANDLE handle, ULONG flags, const void *ptr ) } -static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subheap, struct rtl_heap_entry *entry ) +static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subheap, + const struct block *block, struct rtl_heap_entry *entry ) { const char *base = subheap_base( subheap ), *commit_end = subheap_commit_end( subheap ), *end = base + subheap_size( subheap ); - const struct block *block, *blocks = first_block( subheap ); - char *data = entry->lpData; + const struct block *blocks = first_block( subheap ); if (entry->lpData == commit_end) return STATUS_NO_MORE_ENTRIES; - - if (entry->wFlags & RTL_HEAP_ENTRY_BUSY) block = (struct block *)data - 1; - else block = (struct block *)(data - sizeof(struct list)) - 1; - if (entry->lpData == base) block = blocks; else if (!(block = next_block( subheap, block ))) { @@ -1859,21 +1855,26 @@ static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subhea static NTSTATUS heap_walk( const struct heap *heap, struct rtl_heap_entry *entry ) { - const struct block *block = (struct block *)entry->lpData - 1; + const char *data = entry->lpData; const ARENA_LARGE *large = NULL; + const struct block *block; const struct list *next; const SUBHEAP *subheap; NTSTATUS status; char *base; + if (!data || entry->wFlags & RTL_HEAP_ENTRY_REGION) block = (struct block *)data; + else if (entry->wFlags & RTL_HEAP_ENTRY_BUSY) block = (struct block *)data - 1; + else block = (struct block *)(data - sizeof(struct list)) - 1; + if (find_large_block( heap, block )) { large = CONTAINING_RECORD( block, ARENA_LARGE, block ); next = &large->entry; } - else if ((subheap = find_subheap( heap, entry->lpData, TRUE ))) + else if ((subheap = find_subheap( heap, block, TRUE ))) { - if (!(status = heap_walk_blocks( heap, subheap, entry ))) return STATUS_SUCCESS; + if (!(status = heap_walk_blocks( heap, subheap, block, entry ))) return STATUS_SUCCESS; else if (status != STATUS_NO_MORE_ENTRIES) return status; next = &subheap->entry; }

1 0

Brendan Shanks : ntdll/tests: Add tests for the address limit of NtQueryVirtualMemory(MemoryBasicInformation).
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: fb1bfebb691996a7c90a0d8b87a4143a50b7d250 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb1bfebb691996a7c90a0d8b87a414… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 25 16:22:50 2022 -0700 ntdll/tests: Add tests for the address limit of NtQueryVirtualMemory(MemoryBasicInformation). --- dlls/ntdll/tests/info.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c367b4f372e..53f42d5a897 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2773,6 +2773,7 @@ static void test_queryvirtualmemory(void) void *user_shared_data = (void *)0x7ffe0000; char buffer[1024]; MEMORY_SECTION_NAME *name = (MEMORY_SECTION_NAME *)buffer; + SYSTEM_BASIC_INFORMATION sbi; module = GetModuleHandleA( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); @@ -2849,9 +2850,20 @@ static void test_queryvirtualmemory(void) ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_PRIVATE); ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%Ix, expected 0x%x\n", mbi.RegionSize, 0x1000); - /* check error code when addr is higher than working set limit */ + /* check error code when addr is higher than user space limit */ + status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), sbi.LowestUserAddress, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)sbi.LowestUserAddress-1, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), sbi.HighestUserAddress, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)sbi.HighestUserAddress+1, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); + /* check error code when len is less than MEMORY_BASIC_INFORMATION size */ status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);

1 0

Brendan Shanks : wow64: Return error from NtQueryVirtualMemory(MemoryBasicInformation) for a too-large address.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: ebb7d316f89f290f56d0f58a5a03951167c3cbc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebb7d316f89f290f56d0f58a5a0395… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 25 12:20:18 2022 -0700 wow64: Return error from NtQueryVirtualMemory(MemoryBasicInformation) for a too-large address. --- dlls/wow64/syscall.c | 2 ++ dlls/wow64/virtual.c | 7 +++++-- dlls/wow64/wow64_private.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 80c4bf73d8b..bc6d46258ed 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; ULONG_PTR args_alignment = 0; +ULONG_PTR highest_user_address = 0x7ffeffff; ULONG_PTR default_zero_bits = 0x7fffffff; typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); @@ -573,6 +574,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex if (!current_machine) current_machine = native_machine; args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ); + highest_user_address = (ULONG_PTR)info.HighestUserAddress; default_zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 8b69432829d..8b7d022301f 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -381,7 +381,11 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) switch (class) { case MemoryBasicInformation: /* MEMORY_BASIC_INFORMATION */ - if (len >= sizeof(MEMORY_BASIC_INFORMATION32)) + if (len < sizeof(MEMORY_BASIC_INFORMATION32)) + status = STATUS_INFO_LENGTH_MISMATCH; + else if ((ULONG_PTR)addr > highest_user_address) + status = STATUS_INVALID_PARAMETER; + else { MEMORY_BASIC_INFORMATION info; MEMORY_BASIC_INFORMATION32 *info32 = ptr; @@ -397,7 +401,6 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) info32->Type = info.Type; } } - else status = STATUS_INFO_LENGTH_MISMATCH; res_len = sizeof(MEMORY_BASIC_INFORMATION32); break; diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index c089a6ec4aa..f2c405bb2c6 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -39,6 +39,7 @@ extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; +extern ULONG_PTR highest_user_address DECLSPEC_HIDDEN; extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN;

1 0

Giovanni Mascellani : mfplat/tests: Mark some tests as broken on Win 8 and 10 v1507.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 51835957d029d0b82f1a043e3e221f8b13ec2043 URL: https://gitlab.winehq.org/wine/wine/-/commit/51835957d029d0b82f1a043e3e221f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 29 12:35:17 2022 +0200 mfplat/tests: Mark some tests as broken on Win 8 and 10 v1507. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7b5e4d1c680..375947da028 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6431,6 +6431,7 @@ static void test_MFCreateDXSurfaceBuffer(void) DWORD length, max_length; IDirect3DDevice9 *device; IMF2DBuffer2 *_2dbuffer2; + BOOL value, broken_test; IMFMediaBuffer *buffer; IMF2DBuffer *_2dbuffer; BYTE *data, *data2; @@ -6439,7 +6440,6 @@ static void test_MFCreateDXSurfaceBuffer(void) HWND window; HRESULT hr; LONG pitch; - BOOL value; if (!pMFCreateDXSurfaceBuffer) { @@ -6512,7 +6512,9 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(length == max_length, "Unexpected length %lu instead of %lu.\n", length, max_length); + /* Broken on Windows 8 and 10 v1507 */ + broken_test = length == 0; + ok(length == max_length || broken(broken_test), "Unexpected length %lu instead of %lu.\n", length, max_length); /* You can lock the surface while the media buffer is locked. */ hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); @@ -6529,7 +6531,7 @@ static void test_MFCreateDXSurfaceBuffer(void) /* Unlock twice. */ hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); @@ -6546,7 +6548,7 @@ static void test_MFCreateDXSurfaceBuffer(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -6618,9 +6620,9 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(data[0] == 0xab, "Unexpected leading byte.\n"); + ok(data[0] == 0xab || broken(broken_test), "Unexpected leading byte.\n"); hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Giovanni Mascellani : mfplat/tests: Merge and reorganize image format tests.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: a04e890f3751a3c324303b178f45444605351abb URL: https://gitlab.winehq.org/wine/wine/-/commit/a04e890f3751a3c324303b178f4544… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 14 12:43:26 2022 +0200 mfplat/tests: Merge and reorganize image format tests. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 262 +++++++++++++++++++-------------------------- 1 file changed, 113 insertions(+), 149 deletions(-)

1 0

Hugh McMaster : gitlab: Build-Depend on libfreetype-dev.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 3d0358fa546146182a7fb7887b230144917b1a1f URL: https://gitlab.winehq.org/wine/wine/-/commit/3d0358fa546146182a7fb7887b2301… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 26 18:36:26 2022 +1000 gitlab: Build-Depend on libfreetype-dev. libfreetype6-dev is a transitional package on Debian Bullseye. --- tools/gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index b1835d6dd55..b3191079dee 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -19,7 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libcups2-dev:amd64 libcups2-dev:i386 \ libdbus-1-dev:amd64 libdbus-1-dev:i386 \ libfontconfig-dev:amd64 libfontconfig-dev:i386 \ - libfreetype6-dev:amd64 libfreetype6-dev:i386 \ + libfreetype-dev:amd64 libfreetype-dev:i386 \ libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ libgnutls28-dev:amd64 libgnutls28-dev:i386 \ libgphoto2-dev:amd64 libgphoto2-dev:i386 \

1 0

David Kahurani : riched20: Remove duplicate code.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 3588479e1a674e5f43f1acb9e7c0aa8cecf98f25 URL: https://gitlab.winehq.org/wine/wine/-/commit/3588479e1a674e5f43f1acb9e7c0aa… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jul 25 22:18:22 2022 +0300 riched20: Remove duplicate code. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/riched20/run.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index f6e6f08d12a..f01f61c181a 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -902,9 +902,8 @@ void ME_GetCharFormat( ME_TextEditor *editor, const ME_Cursor *from, run_copy_char_fmt( run, &tmp ); assert((tmp.dwMask & dwAttribs) == dwAttribs); - /* reset flags that differ */ - if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + /* reset flags that differ */ if (fmt->dwMask & CFM_FACE) { if (!(tmp.dwMask & CFM_FACE))

1 0