September 2020 - Wine-Commits

Zhiyi Zhang : ddraw/tests: Add display mode frequency tests.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: d4fdb1f62cf54b5f6f0e6f4b8a19605b24f1b4f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4fdb1f62cf54b5f6f0e6f4b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 4 16:56:29 2020 +0800 ddraw/tests: Add display mode frequency tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 41 +++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 293 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4fdb1f62cf54b5f6f0e…

1 0

Gabriel Ivăncescu : msscript.ocx: Implement UseSafeSubset properly by setting the interface safety options.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: fb746414e2323d66e17772a8c20e1fda3bf6c58b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb746414e2323d66e17772a8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 3 17:50:26 2020 +0300 msscript.ocx: Implement UseSafeSubset properly by setting the interface safety options. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 40 ++++++++++------ dlls/msscript.ocx/tests/msscript.c | 93 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 117 insertions(+), 16 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 7ddcb8f73d..ed17be90d8 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -2426,9 +2426,30 @@ static const IScriptErrorVtbl ScriptErrorVtbl = { ScriptError_Clear }; -static HRESULT init_script_host(ScriptControl *control, const CLSID *clsid, ScriptHost **ret) +static HRESULT set_safety_opts(IActiveScript *script, VARIANT_BOOL use_safe_subset) { IObjectSafety *objsafety; + HRESULT hr; + + hr = IActiveScript_QueryInterface(script, &IID_IObjectSafety, (void**)&objsafety); + if (FAILED(hr)) { + FIXME("Could not get IObjectSafety, %#x\n", hr); + return hr; + } + + hr = IObjectSafety_SetInterfaceSafetyOptions(objsafety, &IID_IActiveScriptParse, INTERFACESAFE_FOR_UNTRUSTED_DATA, + use_safe_subset ? INTERFACESAFE_FOR_UNTRUSTED_DATA : 0); + IObjectSafety_Release(objsafety); + if (FAILED(hr)) { + FIXME("SetInterfaceSafetyOptions failed, %#x\n", hr); + return hr; + } + + return hr; +} + +static HRESULT init_script_host(ScriptControl *control, const CLSID *clsid, ScriptHost **ret) +{ ScriptHost *host; HRESULT hr; @@ -2455,18 +2476,8 @@ static HRESULT init_script_host(ScriptControl *control, const CLSID *clsid, Scri goto failed; } - hr = IActiveScript_QueryInterface(host->script, &IID_IObjectSafety, (void**)&objsafety); - if (FAILED(hr)) { - FIXME("Could not get IObjectSafety, %#x\n", hr); - goto failed; - } - - hr = IObjectSafety_SetInterfaceSafetyOptions(objsafety, &IID_IActiveScriptParse, INTERFACESAFE_FOR_UNTRUSTED_DATA, 0); - IObjectSafety_Release(objsafety); - if (FAILED(hr)) { - FIXME("SetInterfaceSafetyOptions failed, %#x\n", hr); - goto failed; - } + hr = set_safety_opts(host->script, control->use_safe_subset); + if (FAILED(hr)) goto failed; hr = IActiveScript_SetScriptSite(host->script, &host->IActiveScriptSite_iface); if (FAILED(hr)) { @@ -2850,6 +2861,9 @@ static HRESULT WINAPI ScriptControl_put_UseSafeSubset(IScriptControl *iface, VAR ScriptControl *This = impl_from_IScriptControl(iface); TRACE("(%p)->(%x)\n", This, use_safe_subset); + if (This->host && This->use_safe_subset != use_safe_subset) + set_safety_opts(This->host->script, use_safe_subset); + This->use_safe_subset = use_safe_subset; return S_OK; } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index e6d139fd75..a6ec0992c8 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -91,6 +91,7 @@ static const WCHAR vbW[] = {'V','B','S','c','r','i','p','t',0}; DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(SetInterfaceSafetyOptions); +DEFINE_EXPECT(SetInterfaceSafetyOptions_UseSafeSubset); DEFINE_EXPECT(InitNew); DEFINE_EXPECT(Close); DEFINE_EXPECT(Bind); @@ -278,12 +279,13 @@ static HRESULT WINAPI ObjectSafety_GetInterfaceSafetyOptions(IObjectSafety *ifac static HRESULT WINAPI ObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD mask, DWORD options) { - CHECK_EXPECT(SetInterfaceSafetyOptions); + if (options == INTERFACESAFE_FOR_UNTRUSTED_DATA) + CHECK_EXPECT(SetInterfaceSafetyOptions_UseSafeSubset); + else + CHECK_EXPECT(SetInterfaceSafetyOptions); ok(IsEqualGUID(&IID_IActiveScriptParse, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); - ok(mask == INTERFACESAFE_FOR_UNTRUSTED_DATA, "option mask = %x\n", mask); - ok(options == 0, "options = %x\n", options); return S_OK; } @@ -2100,6 +2102,91 @@ static void test_UseSafeSubset(void) ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(use_safe_subset == VARIANT_FALSE, "got %d\n", use_safe_subset); + + SET_EXPECT(SetInterfaceSafetyOptions_UseSafeSubset); + hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetInterfaceSafetyOptions_UseSafeSubset); + + hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); + + hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(SetInterfaceSafetyOptions); + hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(SetInterfaceSafetyOptions); + + hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions_UseSafeSubset); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = SysAllocString(L"testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions_UseSafeSubset); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + } } static void test_State(void)

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptControl::put_SitehWnd.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 01ea797c344afda604326808e13a48bc9ea93393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ea797c344afda604326808… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 3 17:50:22 2020 +0300 msscript.ocx: Implement IScriptControl::put_SitehWnd. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 7 ++++++- dlls/msscript.ocx/tests/msscript.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ee0cf2537e..1ff330c78a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -165,6 +165,7 @@ struct ScriptControl { IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IOleClientSite *site; + HWND site_hwnd; SIZEL extent; LONG timeout; VARIANT_BOOL allow_ui; @@ -2751,8 +2752,12 @@ static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwn { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%x)\n", This, hwnd); + TRACE("(%p)->(%x)\n", This, hwnd); + if (hwnd && !IsWindow(LongToHandle(hwnd))) + return CTL_E_INVALIDPROPERTYVALUE; + + This->site_hwnd = LongToHandle(hwnd); return S_OK; } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 5a29c7efc6..8b63e979f0 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1929,7 +1929,7 @@ static void test_SitehWnd(void) todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); hr = IScriptControl_put_SitehWnd(sc, 1); - todo_wine ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); site_hwnd = 0xdeadbeef; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd);

1 0

Jacek Caban : conhost/tests: Add tty output tests.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 4100c43576af4953f32b646fddb7987cd019d869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4100c43576af4953f32b646f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:51:26 2020 +0200 conhost/tests: Add tty output tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 344 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 342 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4100c43576af4953f32b…

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IActiveScriptSiteWindow::GetWindow.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: c57e2de626a59f395fa7ab786e6aaaa5f13bec4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57e2de626a59f395fa7ab78… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 3 17:50:24 2020 +0300 msscript.ocx: Implement IActiveScriptSiteWindow::GetWindow. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 14 ++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 845d501814..a61763458b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -147,6 +147,7 @@ struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; ScriptError *error; + HWND site_hwnd; SCRIPTSTATE script_state; CLSID clsid; @@ -761,9 +762,13 @@ static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow * { ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); - FIXME("(%p, %p)\n", This, hwnd); + TRACE("(%p, %p)\n", This, hwnd); - return E_NOTIMPL; + if (!hwnd) return E_POINTER; + if (This->site_hwnd == ((HWND)-1)) return E_FAIL; + + *hwnd = This->site_hwnd; + return S_OK; } static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL enable) @@ -2481,6 +2486,7 @@ static HRESULT init_script_host(ScriptControl *control, const CLSID *clsid, Scri goto failed; } host->script_state = SCRIPTSTATE_INITIALIZED; + host->site_hwnd = control->allow_ui ? control->site_hwnd : ((HWND)-1); host->error = control->error; IScriptError_AddRef(&host->error->IScriptError_iface); @@ -2758,6 +2764,8 @@ static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwn return CTL_E_INVALIDPROPERTYVALUE; This->site_hwnd = LongToHandle(hwnd); + if (This->host) + This->host->site_hwnd = This->allow_ui ? This->site_hwnd : ((HWND)-1); return S_OK; } @@ -2820,6 +2828,8 @@ static HRESULT WINAPI ScriptControl_put_AllowUI(IScriptControl *iface, VARIANT_B TRACE("(%p)->(%x)\n", This, allow_ui); This->allow_ui = allow_ui; + if (This->host) + This->host->site_hwnd = allow_ui ? This->site_hwnd : ((HWND)-1); return S_OK; } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 8e4fa1bfcf..2df85ffb40 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1994,10 +1994,10 @@ static void test_SitehWnd(void) window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, NULL); - todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08x\n", hr); hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(window == hwnd, "got %p, expected %p\n", window, hwnd); hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2013,8 +2013,8 @@ static void test_SitehWnd(void) window = (HWND)0xdeadbeef; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(!window, "got %p\n", window); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!window, "got %p\n", window); site_hwnd = 0; hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); @@ -2025,8 +2025,8 @@ static void test_SitehWnd(void) window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(window == hwnd, "got %p, expected %p\n", window, hwnd); hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2037,7 +2037,7 @@ static void test_SitehWnd(void) window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(!window, "got %p\n", window); hr = IScriptControl_put_AllowUI(sc, VARIANT_TRUE); @@ -2045,8 +2045,8 @@ static void test_SitehWnd(void) window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(window == hwnd, "got %p, expected %p\n", window, hwnd); IActiveScriptSite_Release(site); @@ -2056,8 +2056,8 @@ static void test_SitehWnd(void) window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(window == hwnd, "got %p, expected %p\n", window, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(window == hwnd, "got %p, expected %p\n", window, hwnd); IActiveScriptSiteWindow_Release(site_window); }

1 0

Hans Leidekker : advapi32: Enumerate host credentials through mountmgr.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 66baf153528a018933fa5ac55c7d3bbeb76217f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66baf153528a018933fa5ac5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 4 13:15:47 2020 +0200 advapi32: Enumerate host credentials through mountmgr. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/cred.c | 411 +++++++++++++--------------------------------- 2 files changed, 115 insertions(+), 297 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=66baf153528a018933fa…

1 0

Jacek Caban : conhost: Update tty output in IOCTL_CONDRV_ACTIVATE.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 3885b32bc8995bbb171ffdc7af7d402df1b0534e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3885b32bc8995bbb171ffdc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:52:01 2020 +0200 conhost: Update tty output in IOCTL_CONDRV_ACTIVATE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 14 ++++++- programs/conhost/tests/tty.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9edd5971b8..9830ff0182 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -451,6 +451,17 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD return STATUS_SUCCESS; } +static NTSTATUS screen_buffer_activate( struct screen_buffer *screen_buffer ) +{ + RECT update_rect; + TRACE( "%p\n", screen_buffer ); + screen_buffer->console->active = screen_buffer; + SetRect( &update_rect, 0, 0, screen_buffer->width - 1, screen_buffer->height - 1); + update_output( screen_buffer, &update_rect ); + tty_sync( screen_buffer->console ); + return STATUS_SUCCESS; +} + static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *out_size ) { struct condrv_output_info *info; @@ -1043,8 +1054,7 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign case IOCTL_CONDRV_ACTIVATE: if (in_size || *out_size) return STATUS_INVALID_PARAMETER; - screen_buffer->console->active = screen_buffer; - return STATUS_SUCCESS; + return screen_buffer_activate( screen_buffer ); case IOCTL_CONDRV_GET_MODE: { diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index c28928701f..9c0ec8493b 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -145,8 +145,10 @@ static BOOL expect_erase_line_(unsigned line, unsigned int cnt) enum req_type { + REQ_CREATE_SCREEN_BUFFER, REQ_FILL_CHAR, REQ_SCROLL, + REQ_SET_ACTIVE, REQ_SET_CURSOR, REQ_SET_TITLE, REQ_WRITE_CHARACTERS, @@ -160,6 +162,7 @@ struct pseudoconsole_req { WCHAR string[1]; COORD coord; + HANDLE handle; struct { COORD coord; @@ -234,6 +237,33 @@ static void child_set_cursor(const unsigned int x, unsigned int y) ok(ret, "WriteFile failed: %u\n", GetLastError()); } +static HANDLE child_create_screen_buffer(void) +{ + struct pseudoconsole_req req; + HANDLE handle; + DWORD count; + BOOL ret; + + req.type = REQ_CREATE_SCREEN_BUFFER; + ret = WriteFile(child_pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + ret = ReadFile(child_pipe, &handle, sizeof(handle), &count, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + return handle; +} + +static void child_set_active(HANDLE handle) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_SET_ACTIVE; + req.u.handle = handle; + ret = WriteFile(child_pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + #define child_write_output(a,b,c,d,e,f,g,h,j,k,l,m,n) child_write_output_(__LINE__,a,b,c,d,e,f,g,h,j,k,l,m,n) static void child_write_output_(unsigned int line, CHAR_INFO *buf, unsigned int size_x, unsigned int size_y, unsigned int coord_x, unsigned int coord_y, unsigned int left, @@ -303,6 +333,7 @@ static void child_fill_character(WCHAR ch, DWORD count, int x, int y) static void test_tty_output(void) { CHAR_INFO char_info_buf[2048], char_info; + HANDLE sb, sb2; unsigned int i; /* simple write chars */ @@ -532,6 +563,52 @@ static void test_tty_output(void) expect_output_sequence("\x1b[4;3H"); /* set cursor */ expect_output_sequence("\x1b[?25h"); /* show cursor */ expect_empty_output(); + + sb = child_create_screen_buffer(); + child_set_active(sb); + expect_hide_cursor(); + expect_output_sequence("\x1b[H"); /* set cursor */ + for (i = 0; i < 40; i++) + { + expect_erase_line(30); + if (i != 39) expect_output_sequence("\r\n"); + } + expect_output_sequence("\x1b[H"); /* set cursor */ + expect_output_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_write_characters(L"new sb", 0, 0); + skip_hide_cursor(); + expect_output_sequence("new sb"); + ok(skip_sequence("\x1b[H") || skip_sequence("\r"), "expected set cursor\n"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + sb2 = child_create_screen_buffer(); + child_set_active(sb2); + expect_hide_cursor(); + for (i = 0; i < 40; i++) + { + expect_erase_line(30); + if (i != 39) expect_output_sequence("\r\n"); + } + expect_output_sequence("\x1b[H"); /* set cursor */ + expect_output_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_set_active(sb); + expect_hide_cursor(); + expect_output_sequence("new sb"); + expect_erase_line(24); + expect_output_sequence("\r\n"); + for (i = 1; i < 40; i++) + { + expect_erase_line(30); + if (i != 39) expect_output_sequence("\r\n"); + } + expect_output_sequence("\x1b[H"); /* set cursor */ + expect_output_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); } static void child_process(HANDLE pipe) @@ -552,6 +629,20 @@ static void child_process(HANDLE pipe) const struct pseudoconsole_req *req = (void *)buf; switch (req->type) { + case REQ_CREATE_SCREEN_BUFFER: + { + HANDLE handle; + DWORD count; + SetLastError(0xdeadbeef); + handle = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: %u\n", GetLastError()); + ret = WriteFile(pipe, &handle, sizeof(handle), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + break; + } + case REQ_SCROLL: ret = ScrollConsoleScreenBufferW(output, &req->u.scroll.rect, NULL, req->u.scroll.dst, &req->u.scroll.fill); ok(ret, "ScrollConsoleScreenBuffer failed: %u\n", GetLastError()); @@ -563,6 +654,12 @@ static void child_process(HANDLE pipe) ok(count == req->u.fill.count, "count = %u, expected %u\n", count, req->u.fill.count); break; + case REQ_SET_ACTIVE: + output = req->u.handle; + ret = SetConsoleActiveScreenBuffer(output); + ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + break; + case REQ_SET_CURSOR: ret = SetConsoleCursorPosition(output, req->u.coord); ok(ret, "SetConsoleCursorPosition failed: %u\n", GetLastError());

1 0

Jacek Caban : conhost: Update tty output in scroll_output.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: f3322891420d4d7c5a1c506a25ef4f99d21b2f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3322891420d4d7c5a1c506a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:51:45 2020 +0200 conhost: Update tty output in scroll_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 5 +++++ programs/conhost/tests/tty.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8f0a48c097..9edd5971b8 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -905,6 +905,7 @@ static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct int x, y, xsrc, ysrc, w, h; char_info_t *psrc, *pdst; SMALL_RECT src, dst; + RECT update_rect; SMALL_RECT clip; xsrc = params->scroll.Left; @@ -993,6 +994,10 @@ static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct for (x = left; x <= right; x++) screen_buffer->data[y * screen_buffer->width + x] = params->fill; } + SetRect( &update_rect, min( src.Left, dst.Left ), min( src.Top, dst.Top ), + max( src.Right, dst.Right ), max( src.Bottom, dst.Bottom )); + update_output( screen_buffer, &update_rect ); + tty_sync( screen_buffer->console ); return STATUS_SUCCESS; } diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 4a0ec30875..c28928701f 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -146,6 +146,7 @@ static BOOL expect_erase_line_(unsigned line, unsigned int cnt) enum req_type { REQ_FILL_CHAR, + REQ_SCROLL, REQ_SET_CURSOR, REQ_SET_TITLE, REQ_WRITE_CHARACTERS, @@ -173,6 +174,12 @@ struct pseudoconsole_req CHAR_INFO buf[1]; } write_output; struct + { + SMALL_RECT rect; + COORD dst; + CHAR_INFO fill; + } scroll; + struct { WCHAR ch; DWORD count; @@ -259,6 +266,26 @@ static void child_write_output_(unsigned int line, CHAR_INFO *buf, unsigned int ok_(__FILE__,line)(region.Bottom == out_bottom, "Bottom = %u\n", region.Bottom); } +static void child_scroll(unsigned int src_left, unsigned int src_top, unsigned int src_right, + unsigned int src_bottom, unsigned int dst_x, unsigned int dst_y, WCHAR fill) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_SCROLL; + req.u.scroll.rect.Left = src_left; + req.u.scroll.rect.Top = src_top; + req.u.scroll.rect.Right = src_right; + req.u.scroll.rect.Bottom = src_bottom; + req.u.scroll.dst.X = dst_x; + req.u.scroll.dst.Y = dst_y; + req.u.scroll.fill.Char.UnicodeChar = fill; + req.u.scroll.fill.Attributes = 0; + ret = WriteFile(child_pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + static void child_fill_character(WCHAR ch, DWORD count, int x, int y) { struct pseudoconsole_req req; @@ -418,6 +445,18 @@ static void test_tty_output(void) expect_output_sequence("\x1b[?25h"); /* show cursor */ expect_empty_output(); + child_scroll(/* scroll rect */ 0, 7, 2, 8, /* destination */ 2, 8, /* fill */ 'x'); + expect_hide_cursor(); + if (skip_sequence("\x1b[m")) /* default attr */ + expect_output_sequence("\x1b[30m");/* foreground black */ + expect_output_sequence("\x1b[8;1H"); /* set cursor */ + expect_output_sequence("xxx89\r\n"); + expect_output_sequence("xx567\r\n"); + expect_output_sequence("90234"); + expect_output_sequence("\x1b[4;3H"); /* set cursor */ + expect_output_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + child_write_characters(L"xxx", 3, 10); expect_hide_cursor(); expect_output_sequence("\x1b[m"); /* default attributes */ @@ -513,6 +552,11 @@ static void child_process(HANDLE pipe) const struct pseudoconsole_req *req = (void *)buf; switch (req->type) { + case REQ_SCROLL: + ret = ScrollConsoleScreenBufferW(output, &req->u.scroll.rect, NULL, req->u.scroll.dst, &req->u.scroll.fill); + ok(ret, "ScrollConsoleScreenBuffer failed: %u\n", GetLastError()); + break; + case REQ_FILL_CHAR: ret = FillConsoleOutputCharacterW(output, req->u.fill.ch, req->u.fill.count, req->u.fill.coord, &count); ok(ret, "FillConsoleOutputCharacter failed: %u\n", GetLastError());

1 0

Jacek Caban : conhost: Update tty output in fill_output.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: cd193e44a58f542a919e3c59a82c64e6d2393b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd193e44a58f542a919e3c59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:51:35 2020 +0200 conhost: Update tty output in fill_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 12 ++++++++++++ programs/conhost/tests/tty.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index b3aa8b4158..8f0a48c097 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -883,6 +883,18 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c return STATUS_INVALID_PARAMETER; } + if (count && is_active(screen_buffer)) + { + RECT update_rect; + SetRect( &update_rect, + params->x % screen_buffer->width, + params->y + params->x / screen_buffer->width, + (params->x + i - 1) % screen_buffer->width, + params->y + (params->x + i - 1) / screen_buffer->width ); + update_output( screen_buffer, &update_rect ); + tty_sync( screen_buffer->console ); + } + if (!(result = alloc_ioctl_buffer( sizeof(*result) ))) return STATUS_NO_MEMORY; *result = count; return STATUS_SUCCESS; diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 0b63ce82a7..4a0ec30875 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -145,6 +145,7 @@ static BOOL expect_erase_line_(unsigned line, unsigned int cnt) enum req_type { + REQ_FILL_CHAR, REQ_SET_CURSOR, REQ_SET_TITLE, REQ_WRITE_CHARACTERS, @@ -171,6 +172,12 @@ struct pseudoconsole_req SMALL_RECT region; CHAR_INFO buf[1]; } write_output; + struct + { + WCHAR ch; + DWORD count; + COORD coord; + } fill; } u; }; @@ -252,6 +259,20 @@ static void child_write_output_(unsigned int line, CHAR_INFO *buf, unsigned int ok_(__FILE__,line)(region.Bottom == out_bottom, "Bottom = %u\n", region.Bottom); } +static void child_fill_character(WCHAR ch, DWORD count, int x, int y) +{ + struct pseudoconsole_req req; + BOOL ret; + + req.type = REQ_FILL_CHAR; + req.u.fill.ch = ch; + req.u.fill.count = count; + req.u.fill.coord.X = x; + req.u.fill.coord.Y = y; + ret = WriteFile(child_pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + static void test_tty_output(void) { CHAR_INFO char_info_buf[2048], char_info; @@ -463,6 +484,15 @@ static void test_tty_output(void) expect_output_sequence("\x1b[4;3H"); /* set cursor */ expect_output_sequence("\x1b[?25h"); /* show cursor */ expect_empty_output(); + + child_fill_character('i', 5, 15, 16); + expect_hide_cursor(); + expect_output_sequence("\x1b[m"); /* default attributes */ + expect_output_sequence("\x1b[17;16H"); /* set cursor */ + expect_output_sequence("iiiii"); + expect_output_sequence("\x1b[4;3H"); /* set cursor */ + expect_output_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); } static void child_process(HANDLE pipe) @@ -483,6 +513,12 @@ static void child_process(HANDLE pipe) const struct pseudoconsole_req *req = (void *)buf; switch (req->type) { + case REQ_FILL_CHAR: + ret = FillConsoleOutputCharacterW(output, req->u.fill.ch, req->u.fill.count, req->u.fill.coord, &count); + ok(ret, "FillConsoleOutputCharacter failed: %u\n", GetLastError()); + ok(count == req->u.fill.count, "count = %u, expected %u\n", count, req->u.fill.count); + break; + case REQ_SET_CURSOR: ret = SetConsoleCursorPosition(output, req->u.coord); ok(ret, "SetConsoleCursorPosition failed: %u\n", GetLastError());

1 0

Jacek Caban : conhost: Synchronize tty cursor position in set_output_info.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 298fa4a7f0fb8f97923a2a86c6e42b6e060e062b URL: https://source.winehq.org/git/wine.git/?a=commit;h=298fa4a7f0fb8f97923a2a86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:50:47 2020 +0200 conhost: Synchronize tty cursor position in set_output_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 523b1dfa94..02e3789c3e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -613,6 +613,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, } } + if (is_active( screen_buffer )) tty_sync( screen_buffer->console ); return STATUS_SUCCESS; }

1 0