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

Dmitry Timoshkov : ieframe: When activating UI also activate the embedded document.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 44a983f650cfc07848bf29027aca8d8b83634d5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a983f650cfc07848bf2902… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 14 15:04:03 2020 +0800 ieframe: When activating UI also activate the embedded document. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 26 ++++++++++++++++++++++++++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 2 ++ 3 files changed, 29 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 46d5cc5dd1..042417b5b1 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -598,6 +598,32 @@ HRESULT refresh_document(DocHost *This, const VARIANT *level) return S_OK; } +void activate_document(DocHost *This) +{ + IOleObject *oleobj; + IHlinkTarget *hlink; + HRESULT hres; + + if(!This->document) return; + + hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); + if(SUCCEEDED(hres)) { + IHlinkTarget_Navigate(hlink, 0, NULL); + IHlinkTarget_Release(hlink); + } + + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); + if(SUCCEEDED(hres)) { + IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, NULL, -1, 0, NULL); + IOleObject_Release(oleobj); + } + + refresh_document(This, NULL); + + if(This->view) + IOleDocumentView_UIActivate(This->view, TRUE); +} + void release_dochost_client(DocHost *This) { if(This->hwnd) { diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 24d490c272..a35507e6fb 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -283,6 +283,7 @@ HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; HRESULT dochost_object_available(DocHost*,IUnknown*) DECLSPEC_HIDDEN; void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; +void activate_document(DocHost*) DECLSPEC_HIDDEN; void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; void on_commandstate_change(DocHost*,LONG,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index a2f87dda2f..be0e6ec5bf 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -230,6 +230,8 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) SetFocus(This->shell_embedding_hwnd); notify_on_focus(This, TRUE); + activate_document(&This->doc_host); + This->ui_activated = TRUE; return S_OK;

1 0

Paul Gofman : ntdll: Support nested exceptions on x64.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: ae07938ba661dc0515673835878710a25c99eec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae07938ba661dc0515673835… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 14 12:08:25 2020 +0300 ntdll: Support nested exceptions on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 6 ++--- dlls/ntdll/tests/exception.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 28e4ec8ca6..0cbcc177b2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -380,10 +380,10 @@ NTSTATUS WINAPI RtlWow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *co static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + rec->ExceptionFlags |= EH_NESTED_CALL; - /* FIXME */ - return ExceptionNestedException; + return ExceptionContinueSearch; } /********************************************************************** diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f74ddde0f2..b6307264bc 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -68,6 +68,10 @@ typedef struct _RTL_UNLOAD_EVENT_TRACE static RTL_UNLOAD_EVENT_TRACE *(WINAPI *pRtlGetUnloadEventTrace)(void); static void (WINAPI *pRtlGetUnloadEventTraceEx)(ULONG **element_size, ULONG **element_count, void **event_trace); +#ifndef EH_NESTED_CALL +#define EH_NESTED_CALL 0x10 +#endif + #if defined(__x86_64__) typedef struct { @@ -3782,6 +3786,65 @@ static void test_kiuserexceptiondispatcher(void) ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); } +static BOOL got_nested_exception, got_prev_frame_exception; +static void *nested_exception_initial_frame; + +static DWORD nested_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + trace("nested_exception_handler Rip %p, Rsp %p, code %#x, flags %#x, ExceptionAddress %p.\n", + (void *)context->Rip, (void *)context->Rsp, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress); + + if (rec->ExceptionCode == 0x80000003 + && !(rec->ExceptionFlags & EH_NESTED_CALL)) + { + ok(rec->NumberParameters == 1, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + ok((void *)context->Rsp == frame, "Got unexpected frame %p.\n", frame); + ok(*(void **)frame == (char *)code_mem + 5, "Got unexpected *frame %p.\n", *(void **)frame); + ok(context->Rip == (ULONG_PTR)((char *)code_mem + 7), "Got unexpected Rip %#lx.\n", context->Rip); + + nested_exception_initial_frame = frame; + RaiseException(0xdeadbeef, 0, 0, 0); + ++context->Rip; + return ExceptionContinueExecution; + } + + if (rec->ExceptionCode == 0xdeadbeef && rec->ExceptionFlags == EH_NESTED_CALL) + { + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + got_nested_exception = TRUE; + ok(frame == nested_exception_initial_frame, "Got unexpected frame %p.\n", frame); + return ExceptionContinueSearch; + } + + ok(rec->ExceptionCode == 0xdeadbeef && !rec->ExceptionFlags, + "Got unexpected exception code %#x, flags %#x.\n", rec->ExceptionCode, rec->ExceptionFlags); + ok(!rec->NumberParameters, "Got unexpected rec->NumberParameters %u.\n", rec->NumberParameters); + ok(frame == (void *)((BYTE *)nested_exception_initial_frame + 8), + "Got unexpected frame %p.\n", frame); + got_prev_frame_exception = TRUE; + return ExceptionContinueExecution; +} + +static void test_nested_exception(void) +{ + static const BYTE except_code[] = + { + 0xe8, 0x02, 0x00, 0x00, 0x00, /* call nest */ + 0x90, /* nop */ + 0xc3, /* ret */ + /* nest: */ + 0xcc, /* int3 */ + 0x90, /* nop */ + 0xc3, /* ret */ + }; + + got_nested_exception = got_prev_frame_exception = FALSE; + run_exception_test(nested_exception_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); + ok(got_nested_exception, "Did not get nested exception.\n"); + ok(got_prev_frame_exception, "Did not get nested exception in the previous frame.\n"); +} + #elif defined(__arm__) static void test_thread_context(void) @@ -5450,6 +5513,7 @@ START_TEST(exception) test_dpe_exceptions(); test_wow64_context(); test_kiuserexceptiondispatcher(); + test_nested_exception(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Paul Gofman : ntdll: Don't mind epilog in RtlVirtualUnwind() in case of zero op count on x64.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 71090bdc2f5051f181c193ea410e6438b92c9c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71090bdc2f5051f181c193ea… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 14 13:10:44 2020 +0300 ntdll: Don't mind epilog in RtlVirtualUnwind() in case of zero op count on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 5 ++- dlls/ntdll/tests/exception.c | 105 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0cbcc177b2..faf24b93b5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -815,13 +815,16 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, /* check if in prolog */ if (pc >= base + function->BeginAddress && pc < base + function->BeginAddress + info->prolog) { + TRACE("inside prolog.\n"); prolog_offset = pc - base - function->BeginAddress; } else { prolog_offset = ~0; - if (is_inside_epilog( (BYTE *)pc, base, function )) + /* Since Win10 1809 epilogue does not have a special treatment in case of zero opcode count. */ + if (info->count && is_inside_epilog( (BYTE *)pc, base, function )) { + TRACE("inside epilog.\n"); interpret_epilog( (BYTE *)pc, context, ctx_ptr ); *frame_ret = frame; return NULL; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b6307264bc..9e33417c7f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1935,6 +1935,7 @@ struct unwind_test const BYTE *unwind_info; const struct results *results; unsigned int nb_results; + const struct results *broken_results; }; enum regs @@ -1959,10 +1960,11 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) CONTEXT context; RUNTIME_FUNCTION runtime_func; KNONVOLATILE_CONTEXT_POINTERS ctx_ptr; - UINT i, j, k; + UINT i, j, k, broken_k; ULONG64 fake_stack[256]; ULONG64 frame, orig_rip, orig_rbp, unset_reg; UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; + void *expected_handler, *broken_handler; memcpy( (char *)code_mem + code_offset, test->function, test->function_size ); memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); @@ -1991,23 +1993,24 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) data = (void *)0xdeadbeef; handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_rip, &runtime_func, &context, &data, &frame, &ctx_ptr ); - if (test->results[i].handler) - { - ok( (char *)handler == (char *)code_mem + 0x200, - "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); - if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); - } + + expected_handler = test->results[i].handler ? (char *)code_mem + 0x200 : NULL; + broken_handler = test->broken_results && test->broken_results[i].handler ? (char *)code_mem + 0x200 : NULL; + + ok( handler == expected_handler || broken( test->broken_results && handler == broken_handler ), + "%u/%u: wrong handler %p/%p\n", testnum, i, handler, expected_handler ); + if (handler) + ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %p\n", testnum, i, data ); else - { - ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); - } - ok( context.Rip == test->results[i].rip, "%u/%u: wrong rip %p/%x\n", - testnum, i, (void *)context.Rip, test->results[i].rip ); - ok( frame == (ULONG64)fake_stack + test->results[i].frame, "%u/%u: wrong frame %p/%p\n", - testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); + ok( context.Rip == test->results[i].rip + || broken( test->broken_results && context.Rip == test->broken_results[i].rip ), + "%u/%u: wrong rip %p/%x\n", testnum, i, (void *)context.Rip, test->results[i].rip ); + ok( frame == (ULONG64)fake_stack + test->results[i].frame + || broken( test->broken_results && frame == (ULONG64)fake_stack + test->broken_results[i].frame ), + "%u/%u: wrong frame %p/%p\n", + testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); for (j = 0; j < 16; j++) { @@ -2023,15 +2026,40 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (test->results[i].regs[k][0] == j) break; } + if (test->broken_results) + { + for (broken_k = 0; broken_k < nb_regs; broken_k++) + { + if (test->broken_results[i].regs[broken_k][0] == -1) + { + broken_k = nb_regs; + break; + } + if (test->broken_results[i].regs[broken_k][0] == j) + break; + } + } + else + { + broken_k = k; + } + if (j == rsp) /* rsp is special */ { - ULONG64 expected_rsp; + ULONG64 expected_rsp, broken_rsp; ok( !ctx_ptr.IntegerContext[j], "%u/%u: rsp should not be set in ctx_ptr\n", testnum, i ); expected_rsp = test->results[i].regs[k][1] < 0 ? -test->results[i].regs[k][1] : (ULONG64)fake_stack + test->results[i].regs[k][1]; - ok( context.Rsp == expected_rsp, + if (test->broken_results) + broken_rsp = test->broken_results[i].regs[k][1] < 0 + ? -test->broken_results[i].regs[k][1] + : (ULONG64)fake_stack + test->broken_results[i].regs[k][1]; + else + broken_rsp = expected_rsp; + + ok( context.Rsp == expected_rsp || broken( context.Rsp == broken_rsp ), "%u/%u: register rsp wrong %p/%p\n", testnum, i, (void *)context.Rsp, (void *)expected_rsp ); continue; @@ -2039,16 +2067,18 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (ctx_ptr.IntegerContext[j]) { - ok( k < nb_regs, "%u/%u: register %s should not be set to %lx\n", + ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %lx\n", testnum, i, reg_names[j], *(&context.Rax + j) ); - if (k < nb_regs) - ok( *(&context.Rax + j) == test->results[i].regs[k][1], + ok( k == nb_regs || *(&context.Rax + j) == test->results[i].regs[k][1] + || broken( broken_k == nb_regs || *(&context.Rax + j) + == test->broken_results[i].regs[broken_k][1] ), "%u/%u: register %s wrong %p/%x\n", testnum, i, reg_names[j], (void *)*(&context.Rax + j), test->results[i].regs[k][1] ); } else { - ok( k == nb_regs, "%u/%u: register %s should be set\n", testnum, i, reg_names[j] ); + ok( k == nb_regs || broken( broken_k == nb_regs ), "%u/%u: register %s should be set\n", + testnum, i, reg_names[j] ); if (j == rbp) ok( context.Rbp == orig_rbp, "%u/%u: register rbp wrong %p/unset\n", testnum, i, (void *)context.Rbp ); @@ -2215,12 +2245,45 @@ static void test_virtual_unwind(void) { 0x01, 0x50, TRUE, 0x010, 0x000, { {rsp,-0x028}, {rbp,0x000}, {-1,-1} }}, }; + static const BYTE function_4[] = + { + 0x55, /* 00: push %rbp */ + 0x5d, /* 01: pop %rbp */ + 0xc3 /* 02: ret */ + }; + + static const BYTE unwind_info_4[] = + { + 1 | (UNW_FLAG_EHANDLER << 3), /* version + flags */ + 0x0, /* prolog size */ + 0, /* opcode count */ + 0, /* frame reg */ + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ + }; + + static const struct results results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, TRUE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + }; + + static const struct results broken_results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0) }, { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) }, { function_2, sizeof(function_2), unwind_info_2, results_2, ARRAY_SIZE(results_2) }, { function_2, sizeof(function_2), unwind_info_3, results_3, ARRAY_SIZE(results_3) }, + + /* Broken before Win10 1809. */ + { function_4, sizeof(function_4), unwind_info_4, results_4, ARRAY_SIZE(results_4), broken_results_4 }, }; unsigned int i;

1 0

Martin Storsjo : ntdll: Remove a stray duplicate instruction.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 00b4a51fcc325fe1a5f2d1dbc7b81dacf4686b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b4a51fcc325fe1a5f2d1db… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:15:55 2020 +0300 ntdll: Remove a stray duplicate instruction. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 573eaef0f6..a35e48c1d6 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1174,7 +1174,6 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "ldp x4, x5, [sp]\n\t" /* frame pointer, return address */ "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ "str x5, [x1, #0x108]\n\t" /* context->Pc */ - "str x5, [x1, #0x108]\n\t" /* context->Pc */ "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ "mov x2, #1\n\t" "bl " __ASM_NAME("NtRaiseException") "\n\t"

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleCP.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 4faed406d428a2cec752c2aa1bda8449a1342057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4faed406d428a2cec752c2aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:26:53 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 ++++++ dlls/kernelbase/console.c | 16 +++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2b70c2ffc4..d3ce6fb21c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3590,6 +3590,7 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { HANDLE handle; + UINT cp; BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); @@ -3626,6 +3627,11 @@ static void test_FreeConsole(void) ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_HANDLE, "CreateConsoleScreenBuffer returned: %p (%u)\n", handle, GetLastError()); + SetLastError(0xdeadbeef); + cp = GetConsoleCP(); + ok(!cp, "cp = %x\n", cp); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 484072e252..94577a5806 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -585,18 +585,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group */ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) { - UINT codepage = GetOEMCP(); /* default value */ + struct condrv_input_info info; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - if (!wine_server_call_err( req )) - { - if (reply->input_cp) codepage = reply->input_cp; - } - } - SERVER_END_REQ; - return codepage; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) + return 0; + return info.input_cp ? info.input_cp : GetOEMCP(); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleOutputCP.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 3576258402f5e23ad059cf446eafef7fb2c10430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3576258402f5e23ad059cf44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:00 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleOutputCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 5 +++++ dlls/kernelbase/console.c | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d3ce6fb21c..ee050e887a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3632,6 +3632,11 @@ static void test_FreeConsole(void) ok(!cp, "cp = %x\n", cp); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + cp = GetConsoleOutputCP(); + ok(!cp, "cp = %x\n", cp); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 94577a5806..8f4bde8d05 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -658,18 +658,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) */ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) { - UINT codepage = GetOEMCP(); /* default value */ + struct condrv_input_info info; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - if (!wine_server_call_err( req )) - { - if (reply->output_cp) codepage = reply->output_cp; - } - } - SERVER_END_REQ; - return codepage; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) + return 0; + return info.output_cp ? info.output_cp : GetOEMCP(); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_TITLE in GetConsoleTitleW.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 7444aa42306cd0e091dd46efc2e0be3c7c61b2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7444aa42306cd0e091dd46ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:10 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_TITLE in GetConsoleTitleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 9 +++++++++ dlls/kernelbase/console.c | 21 ++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ee050e887a..1fc23992ba 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3589,7 +3589,9 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { + WCHAR title[16]; HANDLE handle; + DWORD size; UINT cp; BOOL ret; @@ -3637,6 +3639,13 @@ static void test_FreeConsole(void) ok(!cp, "cp = %x\n", cp); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + memset( title, 0xc0, sizeof(title) ); + size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); + ok(!size, "GetConsoleTitleW returned %u\n", size); + ok(title[0] == 0xc0c0, "title byffer changed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 8f4bde8d05..a3271712d9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -739,20 +739,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) { - DWORD ret = 0; + if (!size) return 0; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - wine_server_set_reply( req, title, (size - 1) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) - { - ret = wine_server_reply_size(reply) / sizeof(WCHAR); - title[ret] = 0; - } - } - SERVER_END_REQ; - return ret; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, + NULL, 0, title, (size - 1) * sizeof(WCHAR), &size )) + return 0; + + size /= sizeof(WCHAR); + title[size] = 0; + return size + 1; }

1 0

Jacek Caban : kernelbase: Close PEB ConsoleHandle in FreeConsole.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: ccaaf6957f525f09ba485377a606ce322ab90792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccaaf6957f525f09ba485377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:00:27 2020 +0200 kernelbase: Close PEB ConsoleHandle in FreeConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 12 ++++++++++++ dlls/kernelbase/console.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2facdf91fa..32a1275e3e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3592,9 +3592,15 @@ static void test_FreeConsole(void) HANDLE handle; BOOL ret; + todo_wine + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); + ret = FreeConsole(); ok(ret, "FreeConsole failed: %u\n", GetLastError()); + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == NULL, "ConsoleHandle = %p\n", + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle); + handle = CreateFileA("CONOUT$", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); ok(handle == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_ACCESS_DENIED /* winxp */)), @@ -3719,8 +3725,12 @@ static void test_AttachConsole_child(DWORD console_pid) ok(!res && GetLastError() == ERROR_ACCESS_DENIED, "AttachConsole returned: %x(%u)\n", res, GetLastError()); + todo_wine + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); res = FreeConsole(); ok(res, "FreeConsole failed: %u\n", GetLastError()); + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == NULL, "ConsoleHandle = %p\n", + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle); SetStdHandle(STD_ERROR_HANDLE, pipe_out); @@ -3728,6 +3738,8 @@ static void test_AttachConsole_child(DWORD console_pid) ok(res, "AttachConsole failed: %u\n", GetLastError()); ok(pipe_out != GetStdHandle(STD_ERROR_HANDLE), "std handle not set to console\n"); + todo_wine + ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); console = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); ok(console != INVALID_HANDLE_VALUE, "Could not open console\n"); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 7f9152d5c5..15153dbb6f 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -509,6 +509,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) RtlEnterCriticalSection( &console_section ); + NtClose( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle ); + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = NULL; + if (console_flags & CONSOLE_INPUT_HANDLE) NtClose( GetStdHandle( STD_INPUT_HANDLE )); if (console_flags & CONSOLE_OUTPUT_HANDLE) NtClose( GetStdHandle( STD_OUTPUT_HANDLE )); if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE ));

1 0

Jacek Caban : kernel32: Set PEB console handle in AllocConsole.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 57a222356cb675beec38268c2736628e0fb3d231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a222356cb675beec38268c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:00:37 2020 +0200 kernel32: Set PEB console handle in AllocConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 32a1275e3e..01c2361396 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3592,7 +3592,6 @@ static void test_FreeConsole(void) HANDLE handle; BOOL ret; - todo_wine ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); ret = FreeConsole(); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 15153dbb6f..7b84fc8f73 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -266,7 +266,7 @@ BOOL WINAPI AllocConsole(void) STARTUPINFOW app_si, console_si; WCHAR buffer[1024], cmd[256]; PROCESS_INFORMATION pi; - HANDLE event, std_in; + HANDLE event, std_in, console; DWORD mode; BOOL ret; @@ -324,6 +324,10 @@ BOOL WINAPI AllocConsole(void) } CloseHandle( event ); if (!ret || !init_console_std_handles()) goto error; + console = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); + if (console == INVALID_HANDLE_VALUE) goto error; + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; + TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); RtlLeaveCriticalSection( &console_section );

1 0

Jacek Caban : kernelbase: Close PEB ConsoleHandle in AttachConsole.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 06c3e7e44cb40ac2e6e6c55029103d63f47f9e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06c3e7e44cb40ac2e6e6c550… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:00:50 2020 +0200 kernelbase: Close PEB ConsoleHandle in AttachConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 01c2361396..d66a2af668 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3737,7 +3737,6 @@ static void test_AttachConsole_child(DWORD console_pid) ok(res, "AttachConsole failed: %u\n", GetLastError()); ok(pipe_out != GetStdHandle(STD_ERROR_HANDLE), "std handle not set to console\n"); - todo_wine ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); console = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 7b84fc8f73..c7513601f8 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -250,7 +250,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) } SERVER_END_REQ; - if (ret && !(ret = init_console_std_handles())) FreeConsole(); + if (ret) + { + if ((ret = init_console_std_handles())) + { + HANDLE console = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); + if (console != INVALID_HANDLE_VALUE) RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; + else ret = FALSE; + } + if (!ret) FreeConsole(); + } RtlLeaveCriticalSection( &console_section ); return ret;

1 0