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

[PATCH] urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx
by Alex Henrie 20 Aug '20

20 Aug '20

The exact same workaround was already being used in test_CoInternetCombineIUri. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- See 7786d376498da643eb63ebe287541325b21ba3cd --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b1390a35bf..b6d2182a27 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10899,10 +10899,11 @@ static void test_CoInternetCombineUrlEx(void) { hr = pCoInternetCombineUrlEx(base, relativeW, uri_combine_tests[i].combine_flags, &result, 0); todo_wine_if(uri_combine_tests[i].todo) - ok(hr == uri_combine_tests[i].expected, + ok(hr == uri_combine_tests[i].expected || + broken(hr == S_OK && uri_combine_tests[i].expected == E_INVALIDARG) /* win10 1607 to 1709 */, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr) && SUCCEEDED(uri_combine_tests[i].expected)) { DWORD j; for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) { -- 2.28.0

2 1

[PATCH 11/12] condrv: Implement initial ioctl processing.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 69 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-)

1 0

[PATCH 10/12] server: Introduce get_next_console_request request.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I considered using ioctl for this instead of server request (in fact, my first implementation used that), but it required rather unpleasant messing with ioctl buffers to pass additional informations for server<->conhost connection. This will need to be extended for: - blocking read calls I will queue them on server side and pass only one at the time to conhost. - screen buffer calls We may have multiple screen buffers for each console, so we will need to pass screen buffer ids to conhost and add additional calls for tracking them. server/console.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 13 +++++++ 2 files changed, 100 insertions(+)

1 0

[PATCH 08/12] conhost: Add initial main loop implementation.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 131 +++++++++++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 6 deletions(-)

1 0

[PATCH 06/12] kernel32/tests: Add CreatePseudoConsole tests.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

1 0

[PATCH 05/12] kernelbase: Add ClosePseudoConsole implementation.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)

1 0

[PATCH 04/12] kernelbase: Add CreatePseudoConsole implementation.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is inspired by MS open source Terminal code (which includes implementation of those functions), but I didn't follow it exactly. High level architecture is similar, it's otherwise different. dlls/kernelbase/console.c | 116 ++++++++++++++++++++++++++++++++++- dlls/kernelbase/kernelbase.h | 7 +++ 2 files changed, 121 insertions(+), 2 deletions(-)

1 0

[PATCH 03/12] server: Support creating console reference from console server.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-)

1 0

[PATCH 02/12] server: Introduce console server object.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch series implements initial infrastructure for pseudo consoles. Pseudo consoles are relatively new Windows features. My main motivation for implementing them is that they are very similar to what we need for supporting UNIX consoles. UNIX console support may be achieved by using pseudo consoles with UNIX fd handles wrapped by a generic file object. (A few more adjustments will be needed for better handling, like avoiding absolute cursor position). This way, we may even support features that currently require curses backend in wineconsole. The version from my tree passes almost all kernel32 tests with console --current while attached to UNIX console. My plan is to also move current user wineconsole backend to the new architecture, avoiding duplication and allowing more proper implementation. server/console.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)

1 0

[PATCH 01/12] kernel32/tests: Fix tests on some broken Windows versions.
by Jacek Caban 20 Aug '20

20 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0