May 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : include: Define all the context structures on all platforms.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 7a25671c38de0287aee45b4248a6fd916040b388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a25671c38de0287aee45b42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 12 15:30:03 2021 +0200 include: Define all the context structures on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 536 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 266 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a25671c38de0287aee4…

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetCpuAreaInfo().
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: e97a2c4c0f330ac1a523ca42573ba93bcc295710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e97a2c4c0f330ac1a523ca42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 12 15:30:41 2021 +0200 ntdll: Implement RtlWow64GetCpuAreaInfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 36 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 29 +++++++++++++++++++++++---- 4 files changed, 114 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 05712d842c4..06ca3d3957c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1070,6 +1070,7 @@ @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) +@ stdcall -arch=win64 RtlWow64GetCpuAreaInfo(ptr long ptr) @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) @ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index dbb94cfb8b7..82b1b69c4ea 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -108,6 +108,42 @@ NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported( USHORT machine, BOOLEAN *sup } +#ifdef _WIN64 + +/********************************************************************** + * RtlWow64GetCpuAreaInfo (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ) +{ + static const struct { ULONG machine, align, size, offset, flag; } data[] = + { +#define ENTRY(machine,type,flag) { machine, TYPE_ALIGNMENT(type), sizeof(type), offsetof(type,ContextFlags), flag }, + ENTRY( IMAGE_FILE_MACHINE_I386, I386_CONTEXT, CONTEXT_i386 ) + ENTRY( IMAGE_FILE_MACHINE_AMD64, AMD64_CONTEXT, CONTEXT_AMD64 ) + ENTRY( IMAGE_FILE_MACHINE_ARMNT, ARM_CONTEXT, CONTEXT_ARM ) + ENTRY( IMAGE_FILE_MACHINE_ARM64, ARM64_NT_CONTEXT, CONTEXT_ARM64 ) +#undef ENTRY + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(data); i++) + { +#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((align) - 1))) + if (data[i].machine != cpu->Machine) continue; + info->Context = ALIGN( cpu + 1, data[i].align ); + info->ContextEx = ALIGN( (char *)info->Context + data[i].size, sizeof(void *) ); + info->ContextFlagsLocation = (char *)info->Context + data[i].offset; + info->ContextFlag = data[i].flag; + info->CpuReserved = cpu; + info->Machine = data[i].machine; + return STATUS_SUCCESS; +#undef ALIGN + } + return STATUS_INVALID_PARAMETER; +} + +#endif + /********************************************************************** * RtlCreateUserProcess (NTDLL.@) */ diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1c1722ee392..bca2086fee9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -25,6 +25,7 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pRtlWow64GetCpuAreaInfo)( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ); static USHORT (WINAPI * pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI * pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI * pRtlWow64IsWowGuestMachineSupported)(USHORT,BOOLEAN*); @@ -85,6 +86,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQuerySystemInformation); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); + NTDLL_GET_PROC(RtlWow64GetCpuAreaInfo); NTDLL_GET_PROC(RtlWow64GetCurrentMachine); NTDLL_GET_PROC(RtlWow64GetProcessMachines); NTDLL_GET_PROC(RtlWow64IsWowGuestMachineSupported); @@ -3133,7 +3135,56 @@ static void test_thread_info(void) static void test_wow64(void) { -#ifndef _WIN64 +#ifdef _WIN64 + if (pRtlWow64GetCpuAreaInfo) + { + static const struct + { + USHORT machine; + NTSTATUS expect; + ULONG align, size, offset, flag; + } tests[] = + { + { IMAGE_FILE_MACHINE_I386, 0, 4, 0x2cc, 0x00, 0x00010000 }, + { IMAGE_FILE_MACHINE_AMD64, 0, 16, 0x4d0, 0x30, 0x00100000 }, + { IMAGE_FILE_MACHINE_ARMNT, 0, 8, 0x1a0, 0x00, 0x00200000 }, + { IMAGE_FILE_MACHINE_ARM64, 0, 16, 0x390, 0x00, 0x00400000 }, + { IMAGE_FILE_MACHINE_ARM, STATUS_INVALID_PARAMETER }, + { IMAGE_FILE_MACHINE_THUMB, STATUS_INVALID_PARAMETER }, + }; + USHORT buffer[2048]; + WOW64_CPURESERVED *cpu; + WOW64_CPU_AREA_INFO info; + ULONG i, j; + NTSTATUS status; +#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((align) - 1))) + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + for (j = 0; j < 8; j++) + { + cpu = (WOW64_CPURESERVED *)(buffer + j); + cpu->Flags = 0; + cpu->Machine = tests[i].machine; + status = pRtlWow64GetCpuAreaInfo( cpu, 0, &info ); + ok( status == tests[i].expect, "%u:%u: failed %x\n", i, j, status ); + if (status) continue; + ok( info.Context == ALIGN( cpu + 1, tests[i].align ), "%u:%u: wrong offset %u\n", + i, j, (ULONG)((char *)info.Context - (char *)cpu) ); + ok( info.ContextEx == ALIGN( (char *)info.Context + tests[i].size, sizeof(void*) ), + "%u:%u: wrong ex offset %u\n", i, j, (ULONG)((char *)info.ContextEx - (char *)cpu) ); + ok( info.ContextFlagsLocation == (char *)info.Context + tests[i].offset, + "%u:%u: wrong flags offset %u\n", + i, j, (ULONG)((char *)info.ContextFlagsLocation - (char *)info.Context) ); + ok( info.CpuReserved == cpu, "%u:%u: wrong cpu %p / %p\n", info.CpuReserved, cpu ); + ok( info.ContextFlag == tests[i].flag, "%u:%u: wrong flag %08x\n", i, j, info.ContextFlag ); + ok( info.Machine == tests[i].machine, "%u:%u: wrong machine %x\n", i, j, info.Machine ); + } + } +#undef ALIGN + } + else win_skip( "RtlWow64GetCpuAreaInfo not supported\n" ); +#else if (is_wow64) { PEB64 *peb64; diff --git a/include/winternl.h b/include/winternl.h index 1839f4a0151..c9868fb5e39 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3588,6 +3588,25 @@ typedef enum _DEBUGOBJECTINFOCLASS MaxDebugObjectInfoClass } DEBUGOBJECTINFOCLASS, *PDEBUGOBJECTINFOCLASS; + +typedef struct _WOW64_CPURESERVED +{ + USHORT Flags; + USHORT Machine; + /* CONTEXT context */ + /* CONTEXT_EX *context_ex */ +} WOW64_CPURESERVED, *PWOW64_CPURESERVED; + +typedef struct _WOW64_CPU_AREA_INFO +{ + void *Context; + void *ContextEx; + void *ContextFlagsLocation; + WOW64_CPURESERVED *CpuReserved; + ULONG ContextFlag; + USHORT Machine; +} WOW64_CPU_AREA_INFO, *PWOW64_CPU_AREA_INFO; + /*********************************************************************** * Function declarations */ @@ -4249,10 +4268,6 @@ NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI USHORT WINAPI RtlWow64GetCurrentMachine(void); NTSYSAPI NTSTATUS WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*); -#ifdef __x86_64__ -NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE, WOW64_CONTEXT *); -NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE, const WOW64_CONTEXT *); -#endif NTSYSAPI NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported(USHORT,BOOLEAN*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); @@ -4263,6 +4278,12 @@ NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); +#ifdef _WIN64 +NTSYSAPI NTSTATUS WINAPI RtlWow64GetCpuAreaInfo(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); +NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*); +NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); +#endif + #if defined(__x86_64__) || defined(__i386__) NTSYSAPI NTSTATUS WINAPI RtlCopyExtendedContext(CONTEXT_EX*,ULONG,CONTEXT_EX*); NTSYSAPI NTSTATUS WINAPI RtlInitializeExtendedContext(void*,ULONG,CONTEXT_EX**);

1 0

Stefan Dösinger : winemac.drv: Set view.WantsBestResolutionOpenGLSurface.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 004b1179e96648495fc0b7ff6711cc990a8a03bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=004b1179e96648495fc0b7ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 12 11:55:12 2021 +0200 winemac.drv: Set view.WantsBestResolutionOpenGLSurface. This used to default to false before Catalina, and it still does so when the application is built with XCode 10 or earlier. When building with XCode 11 or later Catalina and newer will create a high DPI GL view even if the window is low dpi. Because we don't adjust glViewport parameters (and glDrawPixels, etc) we render only to the lower left quadrant. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..29ac32d6be0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -685,6 +685,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi frame.size.width *= scale; frame.size.height *= scale; [self setFrame:frame]; + [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; [super setRetinaMode:mode]; @@ -3575,6 +3576,7 @@ macdrv_view macdrv_create_view(CGRect rect) [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; + [view setWantsBestResolutionOpenGLSurface:retina_on]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification

1 0

Hugh McMaster : reg: Fail if access is denied when deleting registry data.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: ab64b0e33972b31b648ee92922b1df78cb6b5a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab64b0e33972b31b648ee929… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 12 22:24:23 2021 +1000 reg: Fail if access is denied when deleting registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index f8e62e490b9..8804e16e52f 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -18,9 +18,27 @@ #include "reg.h" +static BOOL op_delete_key = TRUE; + +static void output_error(LONG rc) +{ + if (rc == ERROR_FILE_NOT_FOUND) + { + if (op_delete_key) + output_message(STRING_KEY_NONEXIST); + else + output_message(STRING_VALUE_NONEXIST); + } + else + { + output_message(STRING_ACCESS_DENIED); + } +} + static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { + LONG rc; HKEY hkey; if (!force) @@ -44,26 +62,28 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name /* Delete registry key if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) + if ((rc = RegDeleteTreeW(root, path))) { - output_message(STRING_KEY_NONEXIST); + output_error(rc); return 1; } + output_message(STRING_SUCCESS); return 0; } - if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey)) + if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey))) { - output_message(STRING_KEY_NONEXIST); + output_error(rc); return 1; } + op_delete_key = FALSE; + if (value_all) { DWORD max_value_len = 256, value_len; WCHAR *value_name; - LONG rc; value_name = malloc(max_value_len * sizeof(WCHAR)); @@ -79,6 +99,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name free(value_name); RegCloseKey(hkey); output_message(STRING_VALUEALL_FAILED, key_name); + output_error(rc); return 1; } } @@ -93,10 +114,10 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else if (value_name || value_empty) { - if (RegDeleteValueW(hkey, value_name)) + if ((rc = RegDeleteValueW(hkey, value_name))) { RegCloseKey(hkey); - output_message(STRING_VALUE_NONEXIST); + output_error(rc); return 1; } }

1 0

Francois Gouget : winetest/build-patterns: Remove an unneeded <div class='main'>.
by Alexandre Julliard 12 May '21

12 May '21

Module: tools Branch: master Commit: c60021723fd5b8f59cc694eedd885e6415712341 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c60021723fd5b8f59cc694e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 12 19:19:07 2021 +0200 winetest/build-patterns: Remove an unneeded <div class='main'>. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 10cc021..eb02e88 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1114,7 +1114,6 @@ sub write_patterns_page($$$) </head> <body> <div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> -<div class="main"> EOF # Show the test units with recent failures first. @@ -1240,7 +1239,7 @@ EOF write_patterns_list($html, $pagereports, $mainpage, $list); } - print $html "</div></body></html>\n"; + print $html "</body></html>\n"; close($html); if (!rename "$filename.new", "$filename")

1 0

Francois Gouget : winetest/build-patterns: Add a message if a page has no failure.
by Alexandre Julliard 12 May '21

12 May '21

Module: tools Branch: master Commit: cab866b47e1d3127130fb144ecc78a9e68c19a05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cab866b47e1d3127130fb14… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 12 19:19:10 2021 +0200 winetest/build-patterns: Add a message if a page has no failure. Otherwise the page is very empty and cryptic. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index eb02e88..98290f5 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1205,16 +1205,18 @@ EOF print $html "<h1>$title</h1>\n"; print $html "<ul>\n"; my @listids = ("recent", "newmode", "regular", "old"); - my $prevunit = ""; + my ($prevunit, $nolist) = ("", 1); foreach my $listid (@listids) { my $list = $lists{$listid}; my $count = @{$list->{testnames}}; next if (!$count); print $html "<li><a href='#$listid'>$count test units</a> $list->{desc}</li>\n"; + $nolist = 0; $list->{prevunit} = $prevunit; $prevunit = $list->{testnames}->[-1]; } + print $html "<p>No failures. Don't change anything!</p>\n" if ($nolist); print $html "</ul>\n"; # Link the last test unit of each list to the first one of the next list

1 0

Francois Gouget : winetest/build-patterns: Add a header documenting the pattern pages.
by Alexandre Julliard 12 May '21

12 May '21

Module: tools Branch: master Commit: 29ddcf4488b3919d84946a702da4464aa8dc4e38 URL: https://source.winehq.org/git/tools.git/?a=commit;h=29ddcf4488b3919d84946a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 12 19:19:13 2021 +0200 winetest/build-patterns: Add a header documenting the pattern pages. Also tweak the descriptions for the pattern lists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 98290f5..f6704bd 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1114,22 +1114,41 @@ sub write_patterns_page($$$) </head> <body> <div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> + +<div class='testfile' id='summary'> +<div class='updownbar'>$title</div> +<p>The purpose of this page is to:</p> +<ul> + <li>Help detect new test failures, that is test / Wine regressions.</li> + <li>Help diagnose failures by showing when they are specific to a set of Windows versions, a locale, a day of the week, etc.</li> +</ul> +<p>The patterns on this page read as follows:</p> +<ul> + <li>Each line corresponds to a test configuration sorted by platform and tag name.</li> + <li>Test configurations with no failure for a given test are omitted from that test's pattern.</li> + <li>Each column corresponds to a WineTest build from oldest to newest.</li> + <li>Lines with a _N suffix are when WineTest was run more than once for a test configuration + build combination. They are rare and thus hang at the bottom of the pattern to not disrupt it.</li> + <li>Each cell is a single letter describing the result for that test. See the tooltips for a description. Click on the letter to go to that result page.</li> + <li>Each result is also color coded to make the patterns pop out. There is one color per type of result (crash , timeout, etc.), and one per number of failures (to help detect changes).</li> + <li>Failure modes that have not been seen before (test that newly crashes, new failure count, etc.) are highlighted, as well as the configuration names in which it appears.</li> + <li>Below the patterns is a line showing which builds have potentially related commits if any. +</ul> EOF # Show the test units with recent failures first. # Also use these lists to link the test units to each other. my %lists = ( recent => {title => "Recent failures", - desc => "have recent failures (that is failures that did not happen for the $patternbuilds oldest builds).", + desc => "recently started failing (the $patternbuilds oldest builds had no failure).", testnames => []}, newmode => {title => "New failure modes", - desc => "failed in new ways in the $patternbuilds most recent builds.", + desc => "failed in new ways in the $patternbuilds most recent builds (for instance they have more failures than before).", testnames => []}, regular => {title => "Regular failures", - desc => "had failures.", + desc => "have failures... as usual :-(.", testnames => []}, old => {title => "Old failures", - desc => "had no failure in the most recent $patternbuilds builds. Fixed or just rare failures?", + desc => "look like they are fixed: they had no failure in the most recent $patternbuilds builds but that may also just be a lucky streak.", testnames => []}, ); foreach my $testname (sort keys %tests) @@ -1202,7 +1221,7 @@ EOF } # Generate the lists index (and up test unit links) - print $html "<h1>$title</h1>\n"; + print $html "<p>The patterns are grouped according to the likelyhood that they contain new failures:</p>\n"; print $html "<ul>\n"; my @listids = ("recent", "newmode", "regular", "old"); my ($prevunit, $nolist) = ("", 1); @@ -1211,13 +1230,14 @@ EOF my $list = $lists{$listid}; my $count = @{$list->{testnames}}; next if (!$count); - print $html "<li><a href='#$listid'>$count test units</a> $list->{desc}</li>\n"; + print $html "<li><a href='#$listid'>$count tests</a> $list->{desc}</li>\n"; $nolist = 0; $list->{prevunit} = $prevunit; $prevunit = $list->{testnames}->[-1]; } print $html "<p>No failures. Don't change anything!</p>\n" if ($nolist); print $html "</ul>\n"; + print $html "</div>\n"; # Link the last test unit of each list to the first one of the next list my $nextunit;

1 0

Rémi Bernon : server: Implement WM_INPUT_DEVICE_CHANGE message dispatch.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: 4e956dc0fea1b7b20553bfd6d6f7a528363e4245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e956dc0fea1b7b20553bfd6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 11 10:17:21 2021 +0200 server: Implement WM_INPUT_DEVICE_CHANGE message dispatch. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 13 ++++++++----- server/queue.c | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 148b35f8caf..9af33c3291e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2289,11 +2289,14 @@ static void accept_hardware_message( UINT hw_id ) static BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) { struct rawinput_thread_data *thread_data = rawinput_thread_data(); - if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) - return FALSE; - thread_data->hw_id = hw_id; - msg->lParam = (LPARAM)hw_id; + if (msg->message == WM_INPUT) + { + if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; + thread_data->hw_id = hw_id; + msg->lParam = (LPARAM)hw_id; + } + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); return TRUE; } @@ -2613,7 +2616,7 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar /* hardware messages are always in physical coords */ context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - if (msg->message == WM_INPUT) + if (msg->message == WM_INPUT || msg->message == WM_INPUT_DEVICE_CHANGE) ret = process_rawinput_message( msg, hw_id, msg_data ); else if (is_keyboard_message( msg->message )) ret = process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); diff --git a/server/queue.c b/server/queue.c index 73828fafbe6..5d65e030112 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1464,7 +1464,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru *thread = NULL; *msg_code = msg->msg; - if (msg->msg == WM_INPUT) + if (msg->msg == WM_INPUT || msg->msg == WM_INPUT_DEVICE_CHANGE) { if (!(win = msg->win) && input) win = input->focus; } @@ -1553,7 +1553,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg if (msg->wparam == VK_SHIFT || msg->wparam == VK_LSHIFT || msg->wparam == VK_RSHIFT) msg->lparam &= ~(KF_EXTENDED << 16); } - else if (msg->msg != WM_INPUT) + else if (msg->msg != WM_INPUT && msg->msg != WM_INPUT_DEVICE_CHANGE) { if (msg->msg == WM_MOUSEMOVE) { @@ -1695,7 +1695,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) if (process != foreground->process) { - if (!(device->flags & RIDEV_INPUTSINK)) goto done; + if (raw_msg->message == WM_INPUT && !(device->flags & RIDEV_INPUTSINK)) goto done; if (!(target_thread = get_window_thread( device->target ))) goto done; if (!(target_desktop = get_thread_desktop( target_thread, 0 ))) goto done; if (target_desktop != desktop) goto done; @@ -1711,6 +1711,12 @@ static int queue_rawinput_message( struct process* process, void *arg ) msg->lparam = 0; memcpy( msg->data, &raw_msg->data, sizeof(raw_msg->data) ); + if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && raw_msg->data.rawinput.type == RIM_TYPEHID) + { + msg->wparam = raw_msg->data.rawinput.hid.param; + msg->lparam = raw_msg->data.rawinput.hid.device; + } + queue_hardware_message( desktop, msg, 1 ); done: @@ -1975,8 +1981,30 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ unsigned int origin, const hw_input_t *input ) { struct hw_msg_source source = { IMDT_UNAVAILABLE, origin }; + struct hardware_msg_data *msg_data; + struct rawinput_message raw_msg; struct message *msg; + switch (input->hw.msg) + { + case WM_INPUT_DEVICE_CHANGE: + raw_msg.foreground = NULL; + raw_msg.desktop = NULL; + raw_msg.source = source; + raw_msg.time = get_tick_count(); + raw_msg.message = input->hw.msg; + + msg_data = &raw_msg.data; + msg_data->info = 0; + msg_data->flags = 0; + msg_data->rawinput = input->hw.rawinput; + + enum_processes( queue_rawinput_message, &raw_msg ); + + if (raw_msg.foreground) release_object( raw_msg.foreground ); + return; + } + if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return; msg->win = get_user_full_handle( win ); @@ -2109,7 +2137,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) + if ((msg->msg == WM_INPUT || msg->msg == WM_INPUT_DEVICE_CHANGE) && (flags & PM_REMOVE)) release_hardware_message( current->queue, data->hw_id ); return 1; }

1 0

Louis Lenders : advapi32: Add stub for LsaEnumerateAccounts.
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: c74508d22528548940db3c8ac6a350064ca445e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74508d22528548940db3c8a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri May 7 09:28:30 2021 +0200 advapi32: Add stub for LsaEnumerateAccounts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50830 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 16 ++++++++++++++++ include/ntlsa.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1b7a83d347a..0391643aa6a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -452,7 +452,7 @@ @ stub LsaDelete @ stdcall LsaDeleteTrustedDomain(ptr ptr) @ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) -@ stub LsaEnumerateAccounts +@ stdcall LsaEnumerateAccounts(ptr ptr ptr long ptr) @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) @ stub LsaEnumeratePrivileges @ stub LsaEnumeratePrivilegesOfAccount diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 55e42400c6d..7b118733b50 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -236,6 +236,22 @@ NTSTATUS WINAPI LsaEnumerateAccountRights( return STATUS_OBJECT_NAME_NOT_FOUND; } +/****************************************************************************** + * LsaEnumerateAccounts [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaEnumerateAccounts( + LSA_HANDLE policy, + PLSA_ENUMERATION_HANDLE context, + PVOID *buffer, + ULONG maxlen, + PULONG count) +{ + FIXME("(%p,%p,%p,%d,%p) stub\n", policy, context, buffer, maxlen, count); + if (count) *count = 0; + return STATUS_NO_MORE_ENTRIES; +} + /****************************************************************************** * LsaEnumerateAccountsWithUserRight [ADVAPI32.@] * diff --git a/include/ntlsa.h b/include/ntlsa.h index ca864f6356c..9a0cf378c50 100644 --- a/include/ntlsa.h +++ b/include/ntlsa.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +NTSTATUS WINAPI LsaEnumerateAccounts(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE policy, LSA_UNICODE_STRING *name, LSA_UNICODE_STRING **display_name, SHORT *language); NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Zebediah Figura : wined3d: Use the correct device context ops in wined3d_device_context_issue_query().
by Alexandre Julliard 11 May '21

11 May '21

Module: wine Branch: master Commit: a02a4614bddf5671f7f9fe5bfdf95b6b27228a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a02a4614bddf5671f7f9fe5b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 01:35:11 2021 -0500 wined3d: Use the correct device context ops in wined3d_device_context_issue_query(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b8ec5baa862..38ab2aed900 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5387,7 +5387,7 @@ void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *con { TRACE("context %p, query %p, flags %#x.\n", context, query, flags); - query->device->cs->c.ops->issue_query(context, query, flags); + context->ops->issue_query(context, query, flags); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view(

1 0