January 2023 - Wine-commits

Jinoh Kang : ntdll: Check for delayed free block in heap_validate_ptr.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: b887e31d151be53324bc0670f01ebc5ee6349dac URL: https://gitlab.winehq.org/wine/wine/-/commit/b887e31d151be53324bc0670f01ebc… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Dec 31 22:55:12 2022 +0900 ntdll: Check for delayed free block in heap_validate_ptr. Today, the heap does not catch double free when both HEAP_VALIDATE and HEAP_FREE_CHECKING_ENABLED are on, since validate_used_block() accepts BLOCK_TYPE_DEAD as a valid (allocated) block type. Fix this by adding an explicit check that rejects BLOCK_TYPE_DEAD in heap_validate_ptr. --- dlls/ntdll/heap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index aafbbd0f523..523344fe0f5 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1067,7 +1067,8 @@ static BOOL validate_free_block( const struct heap *heap, const SUBHEAP *subheap } -static BOOL validate_used_block( const struct heap *heap, const SUBHEAP *subheap, const struct block *block ) +static BOOL validate_used_block( const struct heap *heap, const SUBHEAP *subheap, const struct block *block, + unsigned int expected_block_type ) { const char *err = NULL, *base = subheap_base( subheap ), *commit_end = subheap_commit_end( subheap ); DWORD flags = heap->flags; @@ -1078,6 +1079,8 @@ static BOOL validate_used_block( const struct heap *heap, const SUBHEAP *subheap err = "invalid block BLOCK_ALIGN"; else if (block_get_type( block ) != BLOCK_TYPE_USED && block_get_type( block ) != BLOCK_TYPE_DEAD) err = "invalid block header"; + else if (expected_block_type && block_get_type( block ) != expected_block_type) + err = "invalid block type"; else if (block_get_flags( block ) & BLOCK_FLAG_FREE) err = "invalid block flags"; else if (!contains( base, commit_end - base, block, block_get_size( block ) )) @@ -1138,7 +1141,7 @@ static BOOL heap_validate_ptr( const struct heap *heap, const void *ptr ) return validate_large_block( heap, block ); } - return validate_used_block( heap, subheap, block ); + return validate_used_block( heap, subheap, block, BLOCK_TYPE_USED ); } static BOOL heap_validate( const struct heap *heap ) @@ -1164,7 +1167,7 @@ static BOOL heap_validate( const struct heap *heap ) } else { - if (!validate_used_block( heap, subheap, block )) return FALSE; + if (!validate_used_block( heap, subheap, block, 0 )) return FALSE; } } }

1 0

Jinoh Kang : ntdll: Validate subheap's owner heap when validating heap.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 8cc5e89267163dbdff89b8a84b6d92c756904305 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cc5e89267163dbdff89b8a84b6d92… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Dec 31 22:56:53 2022 +0900 ntdll: Validate subheap's owner heap when validating heap. --- dlls/ntdll/heap.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 523344fe0f5..c8eec050b1a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -338,8 +338,10 @@ static inline struct block *next_block( const SUBHEAP *subheap, const struct blo return (struct block *)next; } -static inline BOOL check_subheap( const SUBHEAP *subheap ) +static inline BOOL check_subheap( const SUBHEAP *subheap, const struct heap *heap ) { + if (subheap->user_value != heap) return FALSE; + return contains( &subheap->block, subheap->block_size, subheap + 1, subheap->data_size ); } @@ -447,13 +449,13 @@ static inline void valgrind_notify_resize( void const *ptr, SIZE_T size_old, SIZ #endif } -static void valgrind_notify_free_all( SUBHEAP *subheap ) +static void valgrind_notify_free_all( SUBHEAP *subheap, const struct heap *heap ) { #ifdef VALGRIND_FREELIKE_BLOCK struct block *block; if (!RUNNING_ON_VALGRIND) return; - if (!check_subheap( subheap )) return; + if (!check_subheap( subheap, heap )) return; for (block = first_block( subheap ); block; block = next_block( subheap, block )) { @@ -549,7 +551,7 @@ static void heap_dump( const struct heap *heap ) TRACE( " %p: base %p first %p last %p end %p\n", subheap, base, first_block( subheap ), last_block( subheap ), base + subheap_size( subheap ) ); - if (!check_subheap( subheap )) return; + if (!check_subheap( subheap, heap )) return; overhead += subheap_overhead( subheap ); for (block = first_block( subheap ); block; block = next_block( subheap, block )) @@ -648,7 +650,7 @@ static SUBHEAP *find_subheap( const struct heap *heap, const struct block *block LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { SIZE_T blocks_size = (char *)last_block( subheap ) - (char *)first_block( subheap ); - if (!check_subheap( subheap )) return NULL; + if (!check_subheap( subheap, heap )) return NULL; if (contains( first_block( subheap ), blocks_size, block, sizeof(*block) )) return subheap; /* outside of blocks region, possible corruption or heap_walk */ if (contains( subheap_base( subheap ), subheap_size( subheap ), block, 0 )) return heap_walk ? subheap : NULL; @@ -1152,9 +1154,9 @@ static BOOL heap_validate( const struct heap *heap ) LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { - if (!check_subheap( subheap )) + if (!check_subheap( subheap, heap )) { - ERR( "heap %p, subheap %p corrupted sizes\n", heap, subheap ); + ERR( "heap %p, subheap %p corrupted sizes or user_value\n", heap, subheap ); if (TRACE_ON(heap)) heap_dump( heap ); return FALSE; } @@ -1271,7 +1273,7 @@ static void heap_set_debug_flags( HANDLE handle ) { const char *commit_end = subheap_commit_end( subheap ); - if (!check_subheap( subheap )) break; + if (!check_subheap( subheap, heap )) break; for (block = first_block( subheap ); block; block = next_block( subheap, block )) { @@ -1467,13 +1469,13 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE handle ) LIST_FOR_EACH_ENTRY_SAFE( subheap, next, &heap->subheap_list, SUBHEAP, entry ) { if (subheap == &heap->subheap) continue; /* do this one last */ - valgrind_notify_free_all( subheap ); + valgrind_notify_free_all( subheap, heap ); list_remove( &subheap->entry ); size = 0; addr = ROUND_ADDR( subheap, REGION_ALIGN - 1 ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - valgrind_notify_free_all( &heap->subheap ); + valgrind_notify_free_all( &heap->subheap, heap ); size = 0; addr = heap; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE );

1 0

Jinoh Kang : ntdll: Validate blocks in the heap pending free request list.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: af557f0cbc644e5a46af0b13acef8eae59e1cbea URL: https://gitlab.winehq.org/wine/wine/-/commit/af557f0cbc644e5a46af0b13acef8e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Dec 31 22:57:17 2022 +0900 ntdll: Validate blocks in the heap pending free request list. --- dlls/ntdll/heap.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index c8eec050b1a..2097a557789 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1174,6 +1174,36 @@ static BOOL heap_validate( const struct heap *heap ) } } + if (heap->pending_free) + { + unsigned int i; + + for (i = 0; i < MAX_FREE_PENDING; i++) + { + if (!(block = heap->pending_free[i])) break; + + subheap = find_subheap( heap, block, FALSE ); + if (!subheap) + { + ERR( "heap %p: cannot find valid subheap for delayed freed block %p\n", heap, block ); + if (TRACE_ON(heap)) heap_dump( heap ); + return FALSE; + } + + if (!validate_used_block( heap, subheap, block, BLOCK_TYPE_DEAD )) return FALSE; + } + + for (; i < MAX_FREE_PENDING; i++) + { + if ((block = heap->pending_free[i])) + { + ERR( "heap %p: unexpected delayed freed block %p at slot %u\n", heap, block, i ); + if (TRACE_ON(heap)) heap_dump( heap ); + return FALSE; + } + } + } + LIST_FOR_EACH_ENTRY( large_arena, &heap->large_list, ARENA_LARGE, entry ) if (!validate_large_block( heap, &large_arena->block )) return FALSE;

1 0

Jinoh Kang : ntdll: Remove redundant WARN_ON(heap) check.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: f9ab9292e7e23674c32a3af7a292732698058c68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9ab9292e7e23674c32a3af7a29273… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jan 2 20:07:13 2023 +0900 ntdll: Remove redundant WARN_ON(heap) check. --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2097a557789..9403c83e92c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1136,7 +1136,7 @@ static BOOL heap_validate_ptr( const struct heap *heap, const void *ptr ) { if (!find_large_block( heap, block )) { - if (WARN_ON(heap)) WARN("heap %p, ptr %p: block region not found\n", heap, ptr ); + WARN("heap %p, ptr %p: block region not found\n", heap, ptr ); return FALSE; }

1 0

Jinoh Kang : ntoskrnl.exe/tests: Use loopback address in test_wsk_listen_socket.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: cfbe8aed4823275aa3724d3eb4c266ca1f5d0bbc URL: https://gitlab.winehq.org/wine/wine/-/commit/cfbe8aed4823275aa3724d3eb4c266… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jan 21 11:17:38 2023 +0900 ntoskrnl.exe/tests: Use loopback address in test_wsk_listen_socket. Today, the driver_netio test server binds to the wildcard address (0.0.0.0). This may trigger a firewall alert on Windows 7, and the alert UI window may interfere with user32:msg tests. Fix this by binding to the loopback address (127.0.0.1) instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53891 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54202 --- dlls/ntoskrnl.exe/tests/driver_netio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index e406f49eacb..9f9478d75b0 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -235,6 +235,7 @@ static void test_wsk_listen_socket(void) memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_port = htons(SERVER_LISTEN_PORT); + addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE);

1 0

Tag wine-8.0 : Alexandre Julliard : Release 8.0
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: refs/tags/wine-8.0 Tag: c125f9021a3ffbab45650f0e8495df07276ec4ee URL: https://gitlab.winehq.org/wine/wine/-/tags/c125f9021a3ffbab45650f0e8495df07… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 16:10:03 2023 +0100 Release 8.0

1 0

Alexandre Julliard : Wine release 8.0
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: website Branch: master Commit: 64cf69f13b13e9d762fa596138cb788664ca536e URL: https://gitlab.winehq.org/winehq/winehq/-/commit/64cf69f13b13e9d762fa596138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 16:12:17 2023 +0100 Wine release 8.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023012401.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/news/en/2023012401.xml b/news/en/2023012401.xml new file mode 100644 index 00000000..d7b5355c --- /dev/null +++ b/news/en/2023012401.xml @@ -0,0 +1,9 @@ +<news> +<date>January 24, 2023</date> +<title>Wine 8.0 Released</title> +<body> + The Wine team is proud to announce that the stable release Wine 8.0 is now available. + This release represents a year of development effort and over 8,600 individual changes. It contains a large number of improvements that are listed in the <a href="{$root}/announce/8.0">release notes</a> below. The main achievement is the completion of the conversion to PE format. +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0.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

Alexandre Julliard : gitlab: Don't force the date of the release.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: b73081edb8b25e66edfba2e544c3ce1ff42e7573 URL: https://gitlab.winehq.org/wine/wine/-/commit/b73081edb8b25e66edfba2e544c3ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 12:46:39 2023 +0100 gitlab: Don't force the date of the release. --- tools/gitlab/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/gitlab/release.yml b/tools/gitlab/release.yml index 9a09e654513..b7af1daa86a 100644 --- a/tools/gitlab/release.yml +++ b/tools/gitlab/release.yml @@ -17,6 +17,5 @@ create-release: - release-cli create --name "Wine $VERSION" --tag-name "$CI_COMMIT_TAG" - --released-at "$CI_COMMIT_TIMESTAMP" --description announce.md --assets-link "{\"name\":\"Source code\",\"url\":\"$URL\",\"link_type\":\"other\",\"filepath\":\"$FILEPATH\"}"

1 0

Alexandre Julliard : Release 8.0.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 6677c044abb711f423fadfb61f2c9a37da6ff686 URL: https://gitlab.winehq.org/wine/wine/-/commit/6677c044abb711f423fadfb61f2c9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 16:06:25 2023 +0100 Release 8.0. --- ANNOUNCE | 373 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- VERSION | 2 +- configure | 18 +-- 3 files changed, 335 insertions(+), 58 deletions(-)

1 0

Floris Renaud : loader: Document the WINE_D3D_CONFIG environment variable.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 11bd4b53a95dfb678a3f6958e8d3c5f38088efb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/11bd4b53a95dfb678a3f6958e8d3c5… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Jan 24 13:06:02 2023 +0100 loader: Document the WINE_D3D_CONFIG environment variable. --- loader/wine.man.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/loader/wine.man.in b/loader/wine.man.in index ff37586d5fa..e04a76cd261 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -228,6 +228,18 @@ existing prefix, Wine will refuse to start if .B WINEARCH doesn't match the prefix architecture. .TP +.B WINE_D3D_CONFIG +Specifies Direct3D configuration options. It can be used instead of +modifying the +.B HKEY_CURRENT_USER\\\\Software\\\\Wine\\\\Direct3D +registry key. The value is a comma- or semicolon-separated list +of key-value pairs. For example: +.IP +WINE_D3D_CONFIG="renderer=vulkan;VideoPciVendorID=0xc0de" +.IP +If an individual setting is specified in both +the environment variable and the registry, the former takes precedence. +.TP .B DISPLAY Specifies the X11 display to use. .TP

1 0