[PATCH 1/2] kernel32/tests: Windows 10 dropped support for SetConsoleFont().
Windows 10 1507 still supports it but not 1607+. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Same thing as the GetConsoleFontInfo(): https://www.winehq.org/pipermail/wine-devel/2019-November/153939.html dlls/kernel32/tests/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a22051deafe..171b2dad4d6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2967,6 +2967,12 @@ static void test_SetConsoleFont(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleFont(NULL, 0); ok(!ret, "got %d, expected zero\n", ret); + if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */) + { + skip("SetConsoleFont is not implemented\n"); + return; + } todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); -- 2.20.1
That is return the same 'E_NOTIMPL' error code. Remove the todo_wine-s but keep the tests in case we want to implement the API for compatibility with old Windows versions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Same thing as the GetConsoleFontInfo() patch: https://www.winehq.org/pipermail/wine-devel/2019-November/153940.html dlls/kernel32/console.c | 2 +- dlls/kernel32/tests/console.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4c0bee2caf9..a698e53efed 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1627,7 +1627,7 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index) { FIXME("(%p, %u): stub!\n", hConsole, index); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 171b2dad4d6..1ecb350673d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2973,12 +2973,12 @@ static void test_SetConsoleFont(HANDLE std_output) skip("SetConsoleFont is not implemented\n"); return; } - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleFont(GetStdHandle(STD_INPUT_HANDLE), 0); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); if (!pGetNumberOfConsoleFonts) -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=60104 Your paranoid android. === debian10 (32 bit Chinese:China report) === kernel32: debugger.c:320: Test failed: GetThreadContext failed: 5 === debian10 (32 bit WoW report) === kernel32: comm.c:919: Test failed: OutQueue should not be empty === debian10 (64 bit WoW report) === kernel32: change.c:320: Test failed: should be ready
On Wed, 13 Nov 2019, Marvin wrote: [...]
=== debian10 (32 bit Chinese:China report) ===
kernel32: debugger.c:320: Test failed: GetThreadContext failed: 5
This is a random test failure: https://bugs.winehq.org/show_bug.cgi?id=48052
=== debian10 (32 bit WoW report) ===
kernel32: comm.c:919: Test failed: OutQueue should not be empty
This is a preexisting random test failure. It happens often enough that it happens every day but not on the same VMs every time. This is not the same random failure as bug 47873: those only happen on Windows while this one only happens on Wine. Interestingly it looks like it started on Oct 03, which is most likely when I added the winetest user to the dialout group, thus giving the tests access to /dev/ttyS*.
=== debian10 (64 bit WoW report) ===
kernel32: change.c:320: Test failed: should be ready
This is a random test failure: https://bugs.winehq.org/show_bug.cgi?id=48053 -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.
participants (2)
-
Francois Gouget -
Marvin