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

Dmitry Timoshkov : mshtml: Add trace to IOleCommandTarget::Exec().
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 8975ec118c28a028b7560bd1a4fef66b625ad867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8975ec118c28a028b7560bd1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 14 15:04:00 2020 +0800 mshtml: Add trace to IOleCommandTarget::Exec(). 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/mshtml/olecmd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 43f9285e8f..a79f2d000e 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -917,6 +917,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID { HTMLDocument *This = impl_from_IOleCommandTarget(iface); + TRACE("(%p)->(%s %d %d %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, wine_dbgstr_variant(pvaIn), pvaOut); + if(!This->doc_node->browser) return E_UNEXPECTED;

1 0

Nikolay Sivov : combase: Move CoInitializeSecurity().
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 561a192317de945ff60a2140c5c027775c7a72ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=561a192317de945ff60a2140… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:29 2020 +0300 combase: Move CoInitializeSecurity(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 13 +++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 15 --------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 5752d90d5c..8d8d83005b 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -785,6 +785,19 @@ HRESULT WINAPI CoRevertToSelf(void) return hr; } +/*********************************************************************** + * CoInitializeSecurity (combase.@) + */ +HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR sd, LONG cAuthSvc, + SOLE_AUTHENTICATION_SERVICE *asAuthSvc, void *reserved1, DWORD authn_level, + DWORD imp_level, void *reserved2, DWORD capabilities, void *reserved3) +{ + FIXME("%p, %d, %p, %p, %d, %d, %p, %d, %p stub\n", sd, cAuthSvc, asAuthSvc, reserved1, authn_level, + imp_level, reserved2, capabilities, reserved3); + + return S_OK; +} + /*********************************************************************** * CoGetObjectContext (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index be5ed85a8e..0f34dc6918 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -124,7 +124,7 @@ @ stdcall CoImpersonateClient() @ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx -@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW @ stub CoInvalidateRemoteMachineBindings @ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f983b07f20..350508ac9a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3352,21 +3352,6 @@ BOOL WINAPI IsEqualGUID( return !memcmp(rguid1,rguid2,sizeof(GUID)); } -/*********************************************************************** - * CoInitializeSecurity [OLE32.@] - */ -HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, - SOLE_AUTHENTICATION_SERVICE* asAuthSvc, - void* pReserved1, DWORD dwAuthnLevel, - DWORD dwImpLevel, void* pReserved2, - DWORD dwCapabilities, void* pReserved3) -{ - FIXME("(%p,%d,%p,%p,%d,%d,%p,%d,%p) - stub!\n", pSecDesc, cAuthSvc, - asAuthSvc, pReserved1, dwAuthnLevel, dwImpLevel, pReserved2, - dwCapabilities, pReserved3); - return S_OK; -} - /*********************************************************************** * CoSuspendClassObjects [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7ab90e7b7a..7b2c583661 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -51,7 +51,7 @@ @ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) -@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) combase.CoInitializeSecurity @ stdcall CoInitializeWOW(long long) @ stdcall CoIsHandlerConnected(ptr) @ stdcall CoIsOle1Class (ptr)

1 0

Nikolay Sivov : combase: Move CoGetMarshalSizeMax().
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 3aefd100d73705b4d8bbe6f7dabc631322bb3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aefd100d73705b4d8bbe6f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:27 2020 +0300 combase: Move CoGetMarshalSizeMax(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 32 +++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 52 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 34 insertions(+), 54 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3214f54550..8bcac10cdc 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -112,7 +112,7 @@ @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) -@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stub CoGetModuleType @ stdcall CoGetObjectContext(ptr ptr) @ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 2b0c005812..3c577a9bff 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -24,6 +24,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/orpc.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -379,3 +380,34 @@ HRESULT WINAPI CoCreateFreeThreadedMarshaler(IUnknown *outer, IUnknown **marshal return S_OK; } + +/*********************************************************************** + * CoGetMarshalSizeMax (combase.@) + */ +HRESULT WINAPI CoGetMarshalSizeMax(ULONG *size, REFIID riid, IUnknown *unk, + DWORD dest_context, void *pvDestContext, DWORD mshlFlags) +{ + BOOL std_marshal = FALSE; + IMarshal *marshal; + HRESULT hr; + + if (!unk) + return E_POINTER; + + hr = IUnknown_QueryInterface(unk, &IID_IMarshal, (void **)&marshal); + if (hr != S_OK) + { + std_marshal = TRUE; + hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal); + } + if (hr != S_OK) + return hr; + + hr = IMarshal_GetMarshalSizeMax(marshal, riid, unk, dest_context, pvDestContext, mshlFlags, size); + if (!std_marshal) + /* add on the size of the whole OBJREF structure like native does */ + *size += sizeof(OBJREF); + + IMarshal_Release(marshal); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index cf1e55babe..ea8432e2ee 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1777,58 +1777,6 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, return hr; } -/*********************************************************************** - * CoGetMarshalSizeMax [OLE32.@] - * - * Gets the maximum amount of data that will be needed by a marshal. - * - * PARAMS - * pulSize [O] Address where maximum marshal size will be stored. - * riid [I] Identifier of the interface to marshal. - * pUnk [I] Pointer to the object to marshal. - * dwDestContext [I] Destination. Used to enable or disable optimizations. - * pvDestContext [I] Reserved. Must be NULL. - * mshlFlags [I] Flags that affect the marshaling. See CoMarshalInterface(). - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoMarshalInterface(). - */ -HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk, - DWORD dwDestContext, void *pvDestContext, - DWORD mshlFlags) -{ - HRESULT hr; - LPMARSHAL pMarshal; - BOOL std_marshal = FALSE; - - if(!pUnk) - return E_POINTER; - - hr = IUnknown_QueryInterface(pUnk, &IID_IMarshal, (void**)&pMarshal); - if (hr != S_OK) - { - std_marshal = TRUE; - hr = CoGetStandardMarshal(riid, pUnk, dwDestContext, pvDestContext, - mshlFlags, &pMarshal); - } - if (hr != S_OK) - return hr; - - hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext, - pvDestContext, mshlFlags, pulSize); - if (!std_marshal) - /* add on the size of the whole OBJREF structure like native does */ - *pulSize += sizeof(OBJREF); - - IMarshal_Release(pMarshal); - return hr; -} - - static void dump_MSHLFLAGS(MSHLFLAGS flags) { if (flags & MSHLFLAGS_TABLESTRONG) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index a19264127f..772599b4cf 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -39,7 +39,7 @@ @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) combase.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc -@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) combase.CoGetMarshalSizeMax @ stdcall CoGetObject(wstr ptr ptr ptr) @ stdcall CoGetObjectContext(ptr ptr) combase.CoGetObjectContext @ stdcall CoGetPSClsid(ptr ptr)

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleOutputCP.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

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

Martin Storsjo : ntdll: Remove a stray duplicate instruction.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

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

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

Aug. 14, 2020

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 Aug. 14, 2020

Aug. 14, 2020

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

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

Aug. 13, 2020

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: Use PEB ConsoleHandle to check for console connection in AllocConsole.
by Alexandre Julliard Aug. 13, 2020

Aug. 13, 2020

Module: wine Branch: master Commit: 1d65e474b1a5aa3ea60e6b14c7a49479b35cc7e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d65e474b1a5aa3ea60e6b14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 16:02:27 2020 +0200 kernelbase: Use PEB ConsoleHandle to check for console connection in AllocConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 1 + dlls/kernelbase/console.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index c7a10d233a..e856cc3af4 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -150,6 +150,7 @@ static BOOL process_attach( HMODULE module ) if (params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC) { HMODULE mod = GetModuleHandleA(0); + params->ConsoleHandle = NULL; if (RtlImageNtHeader(mod)->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) AllocConsole(); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 71dacb9ff4..484072e252 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -275,20 +275,18 @@ BOOL WINAPI AllocConsole(void) STARTUPINFOW app_si, console_si; WCHAR buffer[1024], cmd[256]; PROCESS_INFORMATION pi; - HANDLE event, std_in, console; - DWORD mode; + HANDLE event, console; BOOL ret; TRACE("()\n"); RtlEnterCriticalSection( &console_section ); - std_in = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); - if (GetConsoleMode( std_in, &mode )) + if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle) { /* we already have a console opened on this process, don't create a new one */ - CloseHandle( std_in ); RtlLeaveCriticalSection( &console_section ); + SetLastError( ERROR_ACCESS_DENIED ); return FALSE; }

1 0

Rémi Bernon : dinput8: Stop using LL hooks for mouse devices.
by Alexandre Julliard Aug. 13, 2020

Aug. 13, 2020

Module: wine Branch: master Commit: 447bce4117a58910690a0d2610ebcbdd49ae9127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=447bce4117a58910690a0d26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 10 11:04:17 2020 +0200 dinput8: Stop using LL hooks for mouse devices. LL hooks are heavy and using them cause performance hit with high polling rate mice. We don't need them anymore since we now use rawinput API for mouse device. This also uses a separate list for rawinput mouse devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 1c4a26987f..45023fc104 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -104,6 +104,7 @@ static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; static struct list direct_input_list = LIST_INIT( direct_input_list ); static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); +static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); @@ -116,7 +117,7 @@ void dinput_hooks_acquire_device(LPDIRECTINPUTDEVICE8W iface) EnterCriticalSection( &dinput_hook_crit ); if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) - list_add_tail( &acquired_mouse_list, &dev->entry ); + list_add_tail( dev->use_raw_input ? &acquired_rawmouse_list : &acquired_mouse_list, &dev->entry ); else if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) list_add_tail( &acquired_keyboard_list, &dev->entry ); else @@ -657,11 +658,8 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR else if (ri.header.dwType == RIM_TYPEMOUSE) { EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( dev, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) - { - if (!dev->use_raw_input) continue; + LIST_FOR_EACH_ENTRY( dev, &acquired_rawmouse_list, IDirectInputDeviceImpl, entry ) dinput_mouse_rawinput_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam, &ri ); - } LeaveCriticalSection( &dinput_hook_crit ); } } @@ -1720,7 +1718,6 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) EnterCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY( dev, &acquired_mouse_list, IDirectInputDeviceImpl, entry ) { - if (dev->use_raw_input) continue; TRACE("calling dinput_mouse_hook (%p %lx %lx)\n", dev, wparam, lparam); skip |= dinput_mouse_hook( &dev->IDirectInputDevice8A_iface, wparam, lparam ); } @@ -1764,6 +1761,14 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); } } + LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_rawmouse_list, IDirectInputDeviceImpl, entry ) + { + if (msg->hwnd == dev->win && msg->hwnd != foreground) + { + TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); + IDirectInputDevice_Unacquire( &dev->IDirectInputDevice8A_iface ); + } + } LIST_FOR_EACH_ENTRY_SAFE( dev, next, &acquired_keyboard_list, IDirectInputDeviceImpl, entry ) { if (msg->hwnd == dev->win && msg->hwnd != foreground)

1 0