April 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Store the debug info for the initial thread next to the PEB.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 616415a6df9e23ed0dfa83b74de90b95f7fabbc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=616415a6df9e23ed0dfa83b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 12:41:10 2021 +0200 ntdll: Store the debug info for the initial thread next to the PEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 1 - dlls/ntdll/unix/virtual.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 368baac46f4..e6c3f67523e 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -294,6 +294,5 @@ void dbg_init(void) { setbuf( stdout, NULL ); setbuf( stderr, NULL ); - ntdll_get_thread_data()->debug_info = &initial_info; init_done = TRUE; } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 14c984b27bf..f3e6b612b93 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2890,6 +2890,7 @@ static TEB *init_teb( void *ptr, PEB *peb ) */ TEB *virtual_alloc_first_teb(void) { + struct ntdll_thread_data *thread_data; TEB *teb; PEB *peb; void *ptr; @@ -2916,6 +2917,8 @@ TEB *virtual_alloc_first_teb(void) peb = init_peb( (char *)teb_block + 31 * block_size ); teb = init_teb( ptr, peb ); *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + thread_data->debug_info = (struct debug_info *)((char *)teb_block + 31 * block_size + 2 * page_size); return teb; }

1 0

Alexandre Julliard : ntdll: Allocate TEBs and stacks in the low 2G.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 789c1db18a4e192425da3771cac4726cda77130b URL: https://source.winehq.org/git/wine.git/?a=commit;h=789c1db18a4e192425da3771… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 13:00:40 2021 +0200 ntdll: Allocate TEBs and stacks in the low 2G. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 182f9089dbf..14c984b27bf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2907,7 +2907,7 @@ TEB *virtual_alloc_first_teb(void) exit(1); } - NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, 0, &total, + NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? 0x7fffffff : 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; ptr = (char *)teb_block + 30 * block_size; @@ -2944,8 +2944,8 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, &total, - MEM_RESERVE, PAGE_READWRITE ))) + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); return status; @@ -3060,7 +3060,7 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SI server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = map_view( &view, NULL, size + extra_size, FALSE, - VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, 0 )) != STATUS_SUCCESS) + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, 33 )) != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER

1 0

Alexandre Julliard : ntdll: Always allocate space for both 32- and 64-bit TEB.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 6a9e19344dae44e97361041996f237f4bfd905c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a9e19344dae44e973610419… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 12:21:47 2021 +0200 ntdll: Always allocate space for both 32- and 64-bit TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ++++ dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/unix_private.h | 12 +++--------- dlls/ntdll/unix/virtual.c | 37 +++++++++++++++++++++++++------------ 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 3a71a9f245c..b68edfa64dc 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3096,6 +3096,10 @@ static void test_wow64(void) "wrong WowTebOffset %x (%p/%p)\n", NtCurrentTeb()->WowTebOffset, teb64, NtCurrentTeb() ); ok( (char *)teb64 + 0x2000 == (char *)NtCurrentTeb(), "unexpected diff %p / %p\n", teb64, NtCurrentTeb() ); + ok( (char *)teb64 + teb64->WowTebOffset == (char *)NtCurrentTeb() || + broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ + "wrong WowTebOffset %x (%p/%p)\n", teb64->WowTebOffset, teb64, NtCurrentTeb() ); + ok( !teb64->GdiBatchCount, "GdiBatchCount set %x\n", teb64->GdiBatchCount ); ok( teb64->Tib.ExceptionList == PtrToUlong( NtCurrentTeb() ), "wrong Tib.ExceptionList %s / %p\n", wine_dbgstr_longlong(teb64->Tib.ExceptionList), NtCurrentTeb() ); ok( teb64->Tib.Self == PtrToUlong( teb64 ), "wrong Tib.Self %s / %p\n", diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1ee903e1bf4..b13e2997962 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1459,6 +1459,7 @@ static void init_teb64( TEB *teb ) teb->WowTebOffset = -teb_offset; teb64->ClientId.UniqueProcess = PtrToUlong( teb->ClientId.UniqueProcess ); teb64->ClientId.UniqueThread = PtrToUlong( teb->ClientId.UniqueThread ); + teb64->WowTebOffset = teb_offset; #endif } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9a7e9ca01d6..a5bade02b8a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -70,16 +70,10 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) } static const SIZE_T page_size = 0x1000; +static const SIZE_T teb_size = 0x3000; /* TEB64 + TEB32 */ static const SIZE_T signal_stack_mask = 0xffff; -#ifdef _WIN64 -static const SIZE_T teb_size = 0x2000; -static const SIZE_T teb_offset = 0; -static const SIZE_T signal_stack_size = 0x10000 - 0x2000; -#else -static const SIZE_T teb_size = 0x3000; /* TEB64 + TEB */ -static const SIZE_T teb_offset = 0x2000; static const SIZE_T signal_stack_size = 0x10000 - 0x3000; -#endif +static const LONG teb_offset = 0x2000; /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; @@ -298,7 +292,7 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) static inline void *get_signal_stack(void) { - return (char *)NtCurrentTeb() + teb_size - teb_offset; + return (void *)(((ULONG_PTR)NtCurrentTeb() & ~signal_stack_mask) + teb_size); } static inline void mutex_lock( pthread_mutex_t *mutex ) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bb630765c3e..182f9089dbf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2837,16 +2837,29 @@ static PEB *init_peb( void *ptr ) /* set some initial values in a new TEB */ -static void init_teb( TEB *teb, PEB *peb ) +static TEB *init_teb( void *ptr, PEB *peb ) { - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - -#ifndef _WIN64 - TEB64 *teb64 = (TEB64 *)((char *)teb - teb_offset); + struct ntdll_thread_data *thread_data; + TEB *teb; + TEB64 *teb64 = ptr; + TEB32 *teb32 = (TEB32 *)((char *)ptr + teb_offset); +#ifdef _WIN64 + teb = (TEB *)teb64; + teb32->Peb = PtrToUlong( (char *)peb - page_size ); + teb32->Tib.Self = PtrToUlong( teb32 ); + teb32->Tib.ExceptionList = ~0u; + teb32->ActivationContextStackPointer = PtrToUlong( &teb32->ActivationContextStack ); + teb32->ActivationContextStack.FrameListCache.Flink = + teb32->ActivationContextStack.FrameListCache.Blink = + PtrToUlong( &teb32->ActivationContextStack.FrameListCache ); + teb32->StaticUnicodeString.Buffer = PtrToUlong( teb32->StaticUnicodeBuffer ); + teb32->StaticUnicodeString.MaximumLength = sizeof( teb32->StaticUnicodeBuffer ); +#else + teb = (TEB *)teb32; teb64->Peb = PtrToUlong( (char *)peb + page_size ); teb64->Tib.Self = PtrToUlong( teb64 ); - teb64->Tib.ExceptionList = PtrToUlong( teb ); + teb64->Tib.ExceptionList = PtrToUlong( teb32 ); teb64->ActivationContextStackPointer = PtrToUlong( &teb64->ActivationContextStack ); teb64->ActivationContextStack.FrameListCache.Flink = teb64->ActivationContextStack.FrameListCache.Blink = @@ -2862,11 +2875,13 @@ static void init_teb( TEB *teb, PEB *peb ) InitializeListHead( &teb->ActivationContextStack.FrameListCache ); teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); + thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = -1; thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; list_add_head( &teb_list, &thread_data->entry ); + return teb; } @@ -2896,11 +2911,10 @@ TEB *virtual_alloc_first_teb(void) MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; ptr = (char *)teb_block + 30 * block_size; - teb = (TEB *)((char *)ptr + teb_offset); data_size = 2 * block_size; NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &data_size, MEM_COMMIT, PAGE_READWRITE ); peb = init_peb( (char *)teb_block + 31 * block_size ); - init_teb( teb, peb ); + teb = init_teb( ptr, peb ); *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); return teb; } @@ -2943,8 +2957,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = (TEB *)((char *)ptr + teb_offset); - init_teb( teb, NtCurrentTeb()->Peb ); + *ret_teb = teb = init_teb( ptr, NtCurrentTeb()->Peb ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb ))) @@ -2964,7 +2977,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void virtual_free_teb( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - void *ptr; + void *ptr = teb; SIZE_T size; sigset_t sigset; @@ -2982,7 +2995,7 @@ void virtual_free_teb( TEB *teb ) server_enter_uninterrupted_section( &virtual_mutex, &sigset ); list_remove( &thread_data->entry ); - ptr = (char *)teb - teb_offset; + if (!is_win64) ptr = (char *)ptr - teb_offset; *(void **)ptr = next_free_teb; next_free_teb = ptr; server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Paul Gofman : kernel32: Do not impose 32 bit limits on Win64 in GlobalMemoryStatus().
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: wine Branch: master Commit: 72c562ce9c481e73a01f50e17b624095aab11bdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c562ce9c481e73a01f50e1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 21 17:58:26 2021 +0300 kernel32: Do not impose 32 bit limits on Win64 in GlobalMemoryStatus(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 21 +++++++++++---------- dlls/kernel32/tests/heap.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b7bd6f5f91d..02f4587d43b 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -543,7 +543,9 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { MEMORYSTATUSEX memstatus; OSVERSIONINFOW osver; +#ifndef _WIN64 IMAGE_NT_HEADERS *nt = RtlImageNtHeader( GetModuleHandleW(0) ); +#endif /* Because GlobalMemoryStatus is identical to GlobalMemoryStatusEX save for one extra field in the struct, and the lack of a bug, we simply @@ -561,6 +563,14 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) osver.dwOSVersionInfoSize = sizeof(osver); GetVersionExW(&osver); + lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; + lpBuffer->dwAvailPhys = memstatus.ullAvailPhys; + lpBuffer->dwTotalPageFile = memstatus.ullTotalPageFile; + lpBuffer->dwAvailPageFile = memstatus.ullAvailPageFile; + lpBuffer->dwTotalVirtual = memstatus.ullTotalVirtual; + lpBuffer->dwAvailVirtual = memstatus.ullAvailVirtual; + +#ifndef _WIN64 if ( osver.dwMajorVersion >= 5 || osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) { lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); @@ -570,16 +580,6 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwAvailPageFile = min( memstatus.ullAvailPageFile, MAXDWORD ); lpBuffer->dwTotalVirtual = min( memstatus.ullTotalVirtual, MAXDWORD ); lpBuffer->dwAvailVirtual = min( memstatus.ullAvailVirtual, MAXDWORD ); - - } - else /* duplicate NT bug */ - { - lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = memstatus.ullAvailVirtual; } /* values are limited to 2Gb unless the app has the IMAGE_FILE_LARGE_ADDRESS_AWARE flag */ @@ -603,6 +603,7 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) if (lpBuffer->dwTotalPageFile > MAXLONG) lpBuffer->dwTotalPageFile = MAXLONG; if (lpBuffer->dwAvailPageFile > MAXLONG) lpBuffer->dwAvailPageFile = MAXLONG; } +#endif TRACE("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx," " TotalPageFile %lx, AvailPageFile %lx, TotalVirtual %lx, AvailVirtual %lx\n", diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index fa372b14e21..0a4e3367f60 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1213,6 +1213,51 @@ static void test_GetPhysicallyInstalledSystemMemory(void) "expected total_memory >= memstatus.ullTotalPhys / 1024\n"); } +static BOOL compare_ulong64(ULONG64 v1, ULONG64 v2, ULONG64 max_diff) +{ + ULONG64 diff = v1 > v2 ? v1 - v2 : v2 - v1; + + return diff <= max_diff; +} + +static void test_GlobalMemoryStatus(void) +{ + static const ULONG64 max_diff = 0x200000; + MEMORYSTATUSEX memex; + MEMORYSTATUS mem; + SIZE_T size; + + mem.dwLength = sizeof(mem); + GlobalMemoryStatus(&mem); + memex.dwLength = sizeof(memex); + GlobalMemoryStatusEx(&memex); + + /* Compare values approximately as the available memory may change between + * GlobalMemoryStatus() and GlobalMemoryStatusEx() calls. */ + + size = min(memex.ullTotalPhys, ~(SIZE_T)0 >> 1); + ok(compare_ulong64(mem.dwTotalPhys, size, max_diff), "Got unexpected dwTotalPhys %s, size %s.\n", + wine_dbgstr_longlong(mem.dwTotalPhys), wine_dbgstr_longlong(size)); + size = min(memex.ullAvailPhys, ~(SIZE_T)0 >> 1); + ok(compare_ulong64(mem.dwAvailPhys, size, max_diff), "Got unexpected dwAvailPhys %s, size %s.\n", + wine_dbgstr_longlong(mem.dwAvailPhys), wine_dbgstr_longlong(size)); + + size = min(memex.ullTotalPageFile, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwTotalPageFile, size, max_diff), + "Got unexpected dwTotalPageFile %s, size %s.\n", + wine_dbgstr_longlong(mem.dwTotalPageFile), wine_dbgstr_longlong(size)); + size = min(memex.ullAvailPageFile, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwAvailPageFile, size, max_diff), "Got unexpected dwAvailPageFile %s, size %s.\n", + wine_dbgstr_longlong(mem.dwAvailPageFile), wine_dbgstr_longlong(size)); + + ok(compare_ulong64(mem.dwTotalVirtual, memex.ullTotalVirtual, max_diff), + "Got unexpected dwTotalVirtual %s, ullTotalVirtual %s.\n", + wine_dbgstr_longlong(mem.dwTotalVirtual), wine_dbgstr_longlong(memex.ullTotalVirtual)); + ok(compare_ulong64(mem.dwAvailVirtual, memex.ullAvailVirtual, max_diff), + "Got unexpected dwAvailVirtual %s, ullAvailVirtual %s.\n", + wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual)); +} + START_TEST(heap) { int argc; @@ -1246,6 +1291,7 @@ START_TEST(heap) test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); + test_GlobalMemoryStatus(); if (pRtlGetNtGlobalFlags) {

1 0

Francois Gouget : winetest/build-patterns: Add a page showing failure patterns.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: tools Branch: master Commit: bce49667e6418c326ade5704ee65c5bf8c6930d6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bce49667e6418c326ade570… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 27 12:45:07 2021 +0200 winetest/build-patterns: Add a page showing failure patterns. The new page shows the failure patterns across time and test configurations to help detect Wine changes that cause new failures, and identify when failures happen in specific configurations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48164 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 3 +- winetest/build-patterns | 636 ++++++++++++++++++++++++++++++++++++++++++++++++ winetest/gather | 65 +++++ winetest/report.css | 46 ++++ winetest/winetest.cron | 1 + 5 files changed, 750 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=bce49667e6418c326ad…

1 0

Francois Gouget : winetest/dissect: Link test units to the matching failure pattern.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: tools Branch: master Commit: a02e0b637d50693124d8e2576132a81c4c410aa2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a02e0b637d50693124d8e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 27 12:45:10 2021 +0200 winetest/dissect: Link test units to the matching failure pattern. If a test unit had a failure it will appear in the global failure patterns page. So add a link. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 3e91a8d..ea76cb8 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -625,6 +625,7 @@ sub close_test_unit($) $failures += $extra_failures; $summary = "$s_total $todo $failures $skipped" if (!defined $summary); print SUM "- $dll $unit $summary $source\n"; + $testbox->{pattern} = "$dll:$unit" if ($failures); if ($failures && ++$failed_units > $maxfailedtests) { mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } @@ -963,6 +964,10 @@ for (my $i = 0; $i <= $#boxes; $i++) { printf REPORT "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; printf REPORT "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + if ($boxes[$i]->{pattern}) + { + printf REPORT "<a href=\"/data/patterns.html#%s\">pattern</a> | ", $boxes[$i]->{pattern}; + } if ($boxes[$i]->{testname}) { printf REPORT "<a href='/data/tests/%s.html'>all results</a> | ", $boxes[$i]->{testname}; @@ -993,12 +998,16 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n"; printf FILE "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; - printf FILE "<div class=\"updownbar\">%s", $boxes[$i]->{title}; + printf FILE "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + if ($boxes[$i]->{pattern}) + { + printf FILE "<a href=\"/data/patterns.html#%s\">pattern</a> | ", $boxes[$i]->{pattern}; + } if ($boxes[$i]->{testname}) { - printf FILE "<div class='ralign'><a href='/data/tests/%s.html'>all results</a></div>", $boxes[$i]->{testname}; + printf FILE "<a href='/data/tests/%s.html'>all results</a>", $boxes[$i]->{testname}; } - print FILE "</div>\n"; + print FILE "</div></div>\n"; print FILE $boxes[$i]->{data}, "</div>\n"; print FILE end_html(); close FILE or mydie "error writing to '$tmpdir/$boxes[$i]->{id}.html': $!";

1 0

Francois Gouget : winetest/dissect: Link the report pages to the test index pages.
by Alexandre Julliard April 27, 2021

April 27, 2021

Module: tools Branch: master Commit: 5fb8a7aa9b3b49fc513955e67140546793e719ba URL: https://source.winehq.org/git/tools.git/?a=commit;h=5fb8a7aa9b3b49fc513955e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 27 12:44:56 2021 +0200 winetest/dissect: Link the report pages to the test index pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 0ae7251..3e91a8d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -562,7 +562,9 @@ sub create_test_unit_box() { $dllinfo{$dll}->{first} = "$dll:$unit"; } - return create_box("$dll:$unit", "testfile", get_source_link(undef, undef)); + my $box = create_box("$dll:$unit", "testfile", get_source_link(undef, undef)); + $box->{testname} = "$dll:$unit"; + return $box; } sub close_test_unit($) @@ -961,6 +963,10 @@ for (my $i = 0; $i <= $#boxes; $i++) { printf REPORT "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; printf REPORT "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + if ($boxes[$i]->{testname}) + { + printf REPORT "<a href='/data/tests/%s.html'>all results</a> | ", $boxes[$i]->{testname}; + } printf REPORT "<a href=\"#%s\">↑</a>", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; printf REPORT "<a href=\"#%s\">↓</a>", $boxes[$i]->{next} if defined $boxes[$i]->{next}; print REPORT "</div></div>\n"; @@ -987,7 +993,12 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n"; printf FILE "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; - printf FILE "<div class=\"updownbar\">%s</div>\n", $boxes[$i]->{title}; + printf FILE "<div class=\"updownbar\">%s", $boxes[$i]->{title}; + if ($boxes[$i]->{testname}) + { + printf FILE "<div class='ralign'><a href='/data/tests/%s.html'>all results</a></div>", $boxes[$i]->{testname}; + } + print FILE "</div>\n"; print FILE $boxes[$i]->{data}, "</div>\n"; print FILE end_html(); close FILE or mydie "error writing to '$tmpdir/$boxes[$i]->{id}.html': $!";

1 0

Alexandre Julliard : dbghelp: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: f14632f345b478e875bf327964eaeca6dbf4cc54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f14632f345b478e875bf3279… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:33:48 2021 +0200 dbghelp: Support loading builtins from the architecture-specific PE directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index a2057947a42..b281c19de88 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -31,6 +31,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +#ifdef __i386__ +static const WCHAR pe_dir[] = L"\\i386-windows"; +#elif defined __x86_64__ +static const WCHAR pe_dir[] = L"\\x86_64-windows"; +#elif defined __arm__ +static const WCHAR pe_dir[] = L"\\arm-windows"; +#elif defined __aarch64__ +static const WCHAR pe_dir[] = L"\\aarch64-windows"; +#else +static const WCHAR pe_dir[] = L""; +#endif + static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} static inline BOOL is_sep(WCHAR ch) {return ch == '/' || ch == '\\';} @@ -694,6 +706,7 @@ WCHAR *get_dos_file_name(const WCHAR *filename) BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) { const WCHAR *env; + WCHAR *p, *end; size_t len, i; HANDLE file; WCHAR *buf; @@ -703,7 +716,6 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((env = process_getenv(process, L"WINEBUILDDIR"))) { - WCHAR *p, *end; const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; const WCHAR dot_dllW[] = {'.','d','l','l',0}; @@ -755,8 +767,19 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma WCHAR env_name[64]; swprintf(env_name, ARRAY_SIZE(env_name), L"WINEDLLDIR%u", i); if (!(env = process_getenv(process, env_name))) return FALSE; - len = wcslen(env) + wcslen(name) + 2; + len = wcslen(env) + wcslen(pe_dir) + wcslen(name) + 2; if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; + if (!(p = wcsrchr(name, '.')) || lstrcmpW(p, L".so")) + { + swprintf(buf, len, L"%s%s\\%s", env, pe_dir, name); + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; + } + } swprintf(buf, len, L"%s\\%s", env, name); file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : makefiles: Install PE files in an architecture-specific directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: c59126d403de0f749207a1d5e741274cb92fa64d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59126d403de0f749207a1d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:45:32 2021 +0200 makefiles: Install PE files in an architecture-specific directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 14 ++++++++++++++ configure.ac | 9 +++++++++ tools/makedep.c | 9 ++++++++- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index b52495f741f..d9e01a277c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,7 @@ nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine srcdir = @srcdir@ SHELL = /bin/sh +ARCH = @ARCH@ CC = @CC@ CXX = @CXX@ CPPBIN = @CPPBIN@ diff --git a/configure b/configure index dba0950b490..d22c0cf89cc 100755 --- a/configure +++ b/configure @@ -775,6 +775,7 @@ AR BISON FLEX TOOLSDIR +ARCH TARGETFLAGS LD CPPBIN @@ -5870,6 +5871,19 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +case $host_cpu in + *i[3456789]86*) ARCH="i386" + ;; + *x86_64*) ARCH="x86_64" + ;; + *aarch64*) ARCH="aarch64" + ;; + *arm*) ARCH="arm" + ;; + *) ARCH="" + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5 $as_echo_n "checking for the directory containing the Wine tools... " >&6; } if ${wine_cv_toolsdir+:} false; then : diff --git a/configure.ac b/configure.ac index 68366339ea2..c90e78d8bb7 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,15 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +dnl Normalize CPU architecture +case $host_cpu in + *i[[3456789]]86*) AC_SUBST(ARCH,"i386") ;; + *x86_64*) AC_SUBST(ARCH,"x86_64") ;; + *aarch64*) AC_SUBST(ARCH,"aarch64") ;; + *arm*) AC_SUBST(ARCH,"arm") ;; + *) AC_SUBST(ARCH,"") ;; +esac + AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, [wine_cv_toolsdir="$with_wine_tools" if test -z "$with_wine_tools"; then diff --git a/tools/makedep.c b/tools/makedep.c index 0eef646479b..c54eda772db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -158,6 +158,8 @@ static const char *tools_ext; static const char *exe_ext; static const char *dll_ext; static const char *man_ext; +static const char *arch; +static const char *pe_dir; static const char *crosstarget; static const char *crossdebug; static const char *fontforge; @@ -3321,7 +3323,7 @@ static void output_module( struct makefile *make ) } strarray_add( &make->all_targets, strmake( "%s", make->module )); add_install_rule( make, make->module, strmake( "%s", make->module ), - strmake( "c$(dlldir)/%s", make->module )); + strmake( "c%s/%s", pe_dir, make->module )); debug_file = get_debug_file( make, make->module ); output( "%s:", module_path ); } @@ -4434,6 +4436,7 @@ int main( int argc, char *argv[] ) exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" ); man_ext = get_expanded_make_variable( top_makefile, "api_manext" ); dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so"; + arch = get_expanded_make_variable( top_makefile, "ARCH" ); crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" ); crossdebug = get_expanded_make_variable( top_makefile, "CROSSDEBUG" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); @@ -4454,6 +4457,10 @@ int main( int argc, char *argv[] ) if (!exe_ext) exe_ext = ""; if (!tools_ext) tools_ext = ""; if (!man_ext) man_ext = "3w"; + if (arch) + pe_dir = strmake( "$(dlldir)/%s-windows", arch ); + else + pe_dir = "$(dlldir)"; top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" );

1 0

Alexandre Julliard : makefiles: Install PE fake dlls in the architecture-specific directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 893febda143ccf4e4499d411fd28ab2f225aea09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=893febda143ccf4e4499d411… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 16:56:34 2021 +0200 makefiles: Install PE fake dlls in the architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ------ dlls/setupapi/fakedll.c | 6 ------ tools/makedep.c | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 85ae6aac15f..b76a8137a1b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2669,12 +2669,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; - new_name->Length = len; - RtlAppendUnicodeToString( new_name, L"\\fakedlls\\" ); - RtlAppendUnicodeToString( new_name, name ); - status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; - else if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 68d0bd0bc69..203d7c393ce 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -474,9 +474,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, path, lstrlenW(path) ); if ((res = read_file( ptr, &data, size ))) break; - ptr = prepend( file + pos, L"\\fakedlls", 9 ); - ptr = prepend( ptr, path, lstrlenW(path) ); - if ((res = read_file( ptr, &data, size ))) break; } done: @@ -1042,9 +1039,6 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path ); install_lib_dir( dest, file, wildcard, NULL, delete ); - lstrcpyW( file, path ); - lstrcatW( file, L"\\fakedlls" ); - install_lib_dir( dest, file, wildcard, NULL, delete ); } HeapFree( GetProcessHeap(), 0, file ); HeapFree( GetProcessHeap(), 0, dest ); diff --git a/tools/makedep.c b/tools/makedep.c index a6d525a92e8..0092f22b3b0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3315,7 +3315,7 @@ static void output_module( struct makefile *make ) add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d$(dlldir)/fakedlls/%s", make->module )); + strmake( "d%s/%s", pe_dir, make->module )); output( "%s%s %s.fake:", module_path, dll_ext, module_path ); } else

1 0