August 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d] tests: Remove radv bug_if from test_draw_uav_only().
by Conor McCarthy 16 Aug '21

16 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 073c590c..4f783325 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6886,7 +6886,6 @@ static void test_draw_uav_only(void) transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - bug_if(is_radv_device(context.device)) check_sub_resource_uint(resource, 0, queue, command_list, 500, 0); ID3D12DescriptorHeap_Release(cpu_descriptor_heap); -- 2.32.0

1 0

[PATCH 1/2] bthprops.cpl: Add BluetoothGetRadioInfo stub.
by Esdras Tarsis 14 Aug '21

14 Aug '21

Needed for War Dust. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 9 +++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 49b181763ee..d57eb9136e6 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -35,7 +35,7 @@ @ stdcall BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothIsVersionAvailable diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 943c9dcb764..672b682a29d 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -80,3 +80,12 @@ BOOL WINAPI BluetoothFindNextRadio(HBLUETOOTH_RADIO_FIND find, HANDLE *radio) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothGetRadioInfo + */ +DWORD WINAPI BluetoothGetRadioInfo(HANDLE radio, PBLUETOOTH_RADIO_INFO info) +{ + FIXME("(%p, %p): stub!\n", radio, info); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index f2fa18aab89..a3e5faa7076 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -31,7 +31,7 @@ @ stdcall BluetoothFindRadioClose(ptr) bthprops.cpl.BluetoothFindRadioClose @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) bthprops.cpl.BluetoothGetRadioInfo @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothMapClassOfDeviceToImageIndex -- 2.32.0

1 1

Managing test differences on 32/64-bit systems
by Hugh McMaster 14 Aug '21

14 Aug '21

I'm adding tests for SetCurrentConsoleFontEx to dlls/kernel32/tests/console.c. The behaviour is unusual on Windows and changes on 32-bit and 64-bit systems. For example, when deliberately testing failure, the 32-bit function returns ERROR_INVALID_HANDLE, while the 64-bit equivalent returns ERROR_INVALID_PARAMETER. In one particular test, the 32-bit function even returns non-zero (success), while the 64-bit function correctly returns zero (failure). Should I mark the the 32-bit return codes as broken? And what should I do about the zero/non-zero difference? Writing something like ok(!ret || broken(ret), ...) seems rather strange. I'm also wondering how to manage this when implementing the function. Thanks

2 1

Re: [PATCH v2] conhost: Use font face length as number of characters, not size
by Jacek Caban 14 Aug '21

14 Aug '21

On 8/13/21 3:52 PM, Hugh McMaster wrote: > Hi Jacek, > > On Fri, 13 Aug 2021 at 23:11, Jacek Caban wrote: >> On 8/12/21 3:18 PM, Hugh McMaster wrote: >>> - if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; >>> - memcpy( screen_buffer->font.face_name, console->active->font.face_name, >>> - screen_buffer->font.face_len ); >>> + if (screen_buffer->font.face_len) >>> + { >>> + screen_buffer->font.face_name = malloc((screen_buffer->font.face_len + 1) * sizeof(WCHAR)); >>> + if (!screen_buffer->font.face_name) return NULL; >>> + lstrcpyW(screen_buffer->font.face_name, console->active->font.face_name); >> >> This does not only change the meaning of length, but also >> null-terminates the string. Is there any reason for that? It doesn't >> make much sense to both store the length and null-terminate string at >> the same time. > The FaceName value is stored null-terminated in the registry. It's > also null-terminated in the LOGFONTW structure, when copied to the > config and in dialogs. > > We can probably get rid of face_len though. While in this case it doesn't matter all that much, I don't see a point in having it null-terminated. Storing the length separately has the advantage that we don't need to recalculate it whenever we need it and it's easy enough to null-terminate it when copying to structs that need it. Thanks, Jacek

1 0

[tools] winetest: Detect Windows 10 21H1.
by Francois Gouget 14 Aug '21

14 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4371c90f7..43f7790d2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -393,6 +393,7 @@ my @idmatch = ( [ "win1909", 2, 10, 0, 18363, 1, 0 ], [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], + [ "win21H1", 2, 10, 0, 19043, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], -- 2.20.1

1 1

[tools] testbot/TestLauncher: Report CreateProcess() errors like WineTest.
by Francois Gouget 14 Aug '21

14 Aug '21

Show the GetLastError() value on the done line instead of exiting with a non-standard error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index fc67f92ae..41fb90427 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -238,16 +238,15 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { + *Pid = 0; if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) { Skips++; printf("%s.c:0: Tests skipped: Side-by-side dll version not found\n", (*Subtest ? Subtest : "testlauncher")); - *Pid = 0; return 0; } - Error("CreateProcess failed (error %lu)\n", GetLastError()); - ExitProcess(1); + return -GetLastError(); } CloseHandle(ProcessInformation.hThread); *Pid = ProcessInformation.dwProcessId; -- 2.20.1

1 0

[tools] testbot/WineRunTask: Extract the tests to a WineTest.exe subdirectory.
by Francois Gouget 14 Aug '21

14 Aug '21

This simplifies shielding all the test executables from anti-virus tools like Microsoft Defender by excluding the directory WineTest is in. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index bb199d126..58e055ca8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -478,7 +478,7 @@ elsif ($Step->Type eq "suite") $Info .= $VM->Details; } # Escape the arguments for cmd's command interpreter - $Script .= "-q -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; + $Script .= "-q -d tests -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); $Script .= "$FileName -q -s $RptFileName -S http://amboise.vmbr/submit\r\n" if (!$Mission->{nosubmit}); } -- 2.20.1

1 0

[tools] winetest: Detect Windows 10 21H1.
by Francois Gouget 14 Aug '21

14 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4371c90f7..43f7790d2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -393,6 +393,7 @@ my @idmatch = ( [ "win1909", 2, 10, 0, 18363, 1, 0 ], [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], + [ "win21H1", 2, 10, 0, 19043, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], -- 2.20.1

1 0

Wine staging 6.15 release
by Alistair Leslie-Hughes 14 Aug '21

14 Aug '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.15 (604 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * advapi32/tests: Add test for perflib registry key. * wine.inf: Add registry keys for Windows Performance Library. * wine.inf: Add 'Counters' to the perflib key as an alias for 'Counter'. Added: * None Updated: * mfplat-streaming-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v2] ntdll: Fix calling convention of image init function pointer array.
by Torge Matthies 14 Aug '21

14 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51596 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- Supersedes patch 211567. v2: Don't add the attribute on non-x86 architectures. dlls/ntdll/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9f126249c01..45df5d4af4d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1345,7 +1345,11 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) static void init_builtin_dll( HMODULE module ) { void *buffer[16]; +#if defined(__i386__) || defined(__x86_64__) + void (__attribute__ ((__sysv_abi__)) **funcs)(int, char **, char **) = (void *)buffer; +#else void (**funcs)(int, char **, char **) = (void *)buffer; +#endif SIZE_T i, size; NTSTATUS status; -- 2.32.0

1 0