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

Dmitry Timoshkov : ieframe: Implement IOleObject::Advise().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 0b941ea871482924c1e356b70fe3975fb984fd44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b941ea871482924c1e356b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:16 2020 +0800 ieframe: Implement IOleObject::Advise(). 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/ieframe.h | 2 ++ dlls/ieframe/oleobject.c | 23 ++++++++++++++++++++--- dlls/ieframe/webbrowser.c | 3 +++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8d238863be..329cea2f7c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -199,6 +199,8 @@ struct WebBrowser { DWORD sink_aspects; DWORD sink_flags; + IOleAdviseHolder *advise_holder; + /* window context */ HWND frame_hwnd; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 62faaae6bd..9f5da4039d 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -760,11 +760,28 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, - DWORD* pdwConnection) + DWORD *pdwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); + + if(!pdwConnection) + return E_INVALIDARG; + + *pdwConnection = 0; + + if(!pAdvSink) + return E_INVALIDARG; + + if(!This->advise_holder) + hr = CreateOleAdviseHolder(&This->advise_holder); + + if(hr == S_OK) + hr = IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); + + return hr; } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 356b0a2833..87b74b8e01 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -170,6 +170,9 @@ static ULONG WINAPI WebBrowser_Release(IUnknown *iface) if(This->sink) IAdviseSink_Release(This->sink); + if(This->advise_holder) + IOleAdviseHolder_Release(This->advise_holder); + if(This->doc_host.document) IUnknown_Release(This->doc_host.document);

1 0

Dmitry Timoshkov : ieframe: Implement IOleObject::Unadvise().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 7f527ff9331d58ab44064e0b1730a921fba31bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f527ff9331d58ab44064e0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:19 2020 +0800 ieframe: Implement IOleObject::Unadvise(). 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/oleobject.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 9f5da4039d..80568fbf8a 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -787,8 +787,13 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, dwConnection); + + if(!This->advise_holder) + return OLE_E_NOCONNECTION; + + return IOleAdviseHolder_Unadvise(This->advise_holder, dwConnection); } static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise)

1 0

Dmitry Timoshkov : ieframe: Implement IOleObject::EnumAdvise().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: c08a89fc757ab84f242df46ce932dccd122d41df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c08a89fc757ab84f242df46c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:22 2020 +0800 ieframe: Implement IOleObject::EnumAdvise(). 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/oleobject.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 80568fbf8a..a3fa645334 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -799,8 +799,11 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); - return S_OK; + + TRACE("(%p)->(%p): returning E_NOTIMPL\n", This, ppenumAdvise); + + *ppenumAdvise = NULL; + return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)

1 0

Dmitry Timoshkov : ieframe: IOleObject::Close() should notify OnClose() advise sink.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: d4ba3d866db53aede9cc14b3f3e09045fce2e164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ba3d866db53aede9cc14b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:25 2020 +0800 ieframe: IOleObject::Close() should notify OnClose() advise sink. 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/oleobject.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index a3fa645334..031994caa5 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -610,6 +610,10 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) IOleClientSite_AddRef(This->client); hres = IOleObject_SetClientSite(iface, NULL); This->client_closed = client; + + if(This->advise_holder) + IOleAdviseHolder_SendOnClose(This->advise_holder); + return hres; }

1 0

Dmitry Timoshkov : ieframe/tests: Add some tests for IOleObject::Advise(), IOleObject::Unadvise() and IOleObject::EnumAdvise().
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: fbe3db119778f8a03f4b08906fc9c8e84830f395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe3db119778f8a03f4b0890… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:32 2020 +0800 ieframe/tests: Add some tests for IOleObject::Advise(), IOleObject::Unadvise() and IOleObject::EnumAdvise(). 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/tests/webbrowser.c | 107 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 7 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3ec5921a32..e0af0d4642 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -47,6 +47,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(outer_test_iid,0x06d4cd6c,0x18dd,0x11ea,0x8e,0x76,0xfc,0xaa,0x14,0x72,0x2d,0xac); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -157,6 +158,7 @@ DEFINE_EXPECT(OnFocus_TRUE); DEFINE_EXPECT(OnFocus_FALSE); DEFINE_EXPECT(GetExternal); DEFINE_EXPECT(outer_QI_test); +DEFINE_EXPECT(Advise_OnClose); static const WCHAR wszItem[] = {'i','t','e','m',0}; @@ -184,6 +186,7 @@ static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ static DWORD dwl_flags; +static IAdviseSink test_sink; /* Returns true if the user interface is in English. Note that this does not * presume of the formatting of dates, numbers, etc. @@ -1834,12 +1837,16 @@ static void test_DoVerb(IWebBrowser2 *unk) IOleObject *oleobj; RECT rect = {0,0,1000,1000}; HRESULT hres; + DWORD connection; hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + SET_EXPECT(CanInPlaceActivate); SET_EXPECT(Site_GetWindow); SET_EXPECT(OnInPlaceActivate); @@ -1874,6 +1881,9 @@ static void test_DoVerb(IWebBrowser2 *unk) 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + IOleObject_Release(oleobj); } @@ -3681,6 +3691,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) }else { nav_back_todo = nav_forward_todo = TRUE; } + SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); CHECK_CALLED(Frame_SetActiveObject); @@ -3702,6 +3713,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) }else { nav_back_todo = nav_forward_todo = FALSE; } + CHECK_CALLED(Advise_OnClose); hres = IOleObject_GetClientSite(oo, &ocs); ok(hres == S_OK, "hres = %x\n", hres); @@ -3728,16 +3740,66 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) SET_EXPECT(OnFocus_FALSE); SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); + SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); + CHECK_CALLED(Advise_OnClose); test_close = FALSE; IOleObject_Release(oo); } +static void test_Advise(IWebBrowser2 *wb) +{ + IOleObject *oleobj; + IEnumSTATDATA *data; + DWORD connection[2]; + HRESULT hres; + + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, 0); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + data = (void *)0xdeadbeef; + hres = IOleObject_EnumAdvise(oleobj, &data); + ok(hres == E_NOTIMPL, "EnumAdvise returned: %08x\n", hres); + ok(data == NULL, "got data %p\n", data); + + connection[0] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, NULL, &connection[0]); + ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + ok(connection[0] == 0, "got connection %u\n", connection[0]); + + hres = IOleObject_Advise(oleobj, &test_sink, NULL); + ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + + connection[0] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, &test_sink, &connection[0]); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(connection[0] != 0xdeadbeef, "got connection %u\n", connection[0]); + + connection[1] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, &test_sink, &connection[1]); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(connection[1] == connection[0] + 1, "got connection %u\n", connection[1]); + + hres = IOleObject_Unadvise(oleobj, connection[1]); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, connection[1]); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, connection[0]); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + IOleObject_Release(oleobj); +} + #define TEST_DOWNLOAD 0x0001 #define TEST_NOOLECMD 0x0002 #define TEST_NODOCHOST 0x0004 @@ -3756,7 +3818,9 @@ static void init_test(IWebBrowser2 *webbrowser, DWORD flags) static void test_WebBrowser(DWORD flags, BOOL do_close) { IWebBrowser2 *webbrowser; - ULONG ref; + IOleObject *oleobj; + HRESULT hres; + ULONG ref, connection; webbrowser = create_webbrowser(); if(!webbrowser) @@ -3764,6 +3828,12 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) init_test(webbrowser, flags); + hres = IWebBrowser2_QueryInterface(webbrowser, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_QueryStatusWB(webbrowser, FALSE); test_ExecWB(webbrowser, FALSE); test_QueryInterface(webbrowser); @@ -3781,6 +3851,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_QueryStatusWB(webbrowser, TRUE); test_Persist(webbrowser, 2); test_OleObject(webbrowser, 2); + test_Advise(webbrowser); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3866,6 +3937,11 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ConnectionPoint(webbrowser, FALSE); test_IServiceProvider(webbrowser); + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IOleObject_Release(oleobj); + ref = IWebBrowser2_Release(webbrowser); ok(ref == 0 || broken(do_download && !do_close), "ref=%d, expected 0\n", ref); } @@ -3873,7 +3949,8 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) static void test_WebBrowserV1(void) { IWebBrowser2 *wb; - ULONG ref; + IOleObject *oleobj; + ULONG ref, connection; HRESULT hres; hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -3883,6 +3960,12 @@ static void test_WebBrowserV1(void) init_test(wb, 0); wb_version = 1; + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_QueryStatusWB(wb, FALSE); test_ExecWB(wb, FALSE); test_QueryInterface(wb); @@ -3891,6 +3974,12 @@ static void test_WebBrowserV1(void) test_EnumVerbs(wb); test_Persist(wb, 1); test_OleObject(wb, 1); + test_Advise(wb); + + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IOleObject_Release(oleobj); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref); @@ -4038,6 +4127,9 @@ static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void return S_OK; } + if (IsEqualGUID(riid, &IID_IProxyManager)) + return E_NOINTERFACE; + ok(0, "unexpected call QI(%s)\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -4054,27 +4146,28 @@ static ULONG WINAPI sink_Release(IAdviseSink *iface) static void WINAPI sink_OnDataChange(IAdviseSink *iface, FORMATETC *format, STGMEDIUM *medium) { - trace("%p, %p, %p\n", iface, format, medium); + trace("OnDataChange(%p, %p, %p)\n", iface, format, medium); } static void WINAPI sink_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) { - trace("%p, %08x, %d\n", iface, aspect, index); + trace("OnViewChange(%p, %08x, %d)\n", iface, aspect, index); } static void WINAPI sink_OnRename(IAdviseSink *iface, IMoniker *moniker) { - trace("%p, %p\n", iface, moniker); + trace("OnRename(%p, %p) \n", iface, moniker); } static void WINAPI sink_OnSave(IAdviseSink *iface) { - trace("%p\n", iface); + trace("OnSave(%p)\n", iface); } static void WINAPI sink_OnClose(IAdviseSink *iface) { - trace("%p\n", iface); + trace("OnClose(%p)\n", iface); + CHECK_EXPECT(Advise_OnClose); } static const IAdviseSinkVtbl sink_vtbl =

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SCROLL ioctl.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 7ae370a5491b58eeec03961b09dcf5ae5e53e411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae370a5491b58eeec03961b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:36:05 2020 +0200 server: Introduce IOCTL_CONDRV_SCROLL ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 29 +++++++++---- server/console.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 135 insertions(+), 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 839db84ea5..a6df63155c 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -22,6 +22,7 @@ #define _INC_CONDRV #include "winioctl.h" +#include "wincon.h" /* common console input and output ioctls */ #define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -43,6 +44,7 @@ #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) +#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_DATA) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -133,6 +135,16 @@ struct condrv_output_info_params struct condrv_output_info info; /* output info */ }; +#define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 +#define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 +#define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 +#define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 +#define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 +#define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 +#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 + /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params { @@ -145,15 +157,14 @@ struct condrv_fill_output_params unsigned short attr; /* attribute to write */ }; -#define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 -#define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 -#define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 -#define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 -#define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 -#define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 -#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 -#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 -#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 +/* IOCTL_CONDRV_SCROLL params */ +struct condrv_scroll_params +{ + SMALL_RECT scroll; /* source rectangle */ + COORD origin; /* destination coordinates */ + SMALL_RECT clip; /* clipping rectangle */ + char_info_t fill; /* empty character info */ +}; /* IOCTL_CONDRV_GET_RENDERER_EVENTS result */ struct condrv_renderer_event diff --git a/server/console.c b/server/console.c index 8bd3e94e65..f924ddc06b 100644 --- a/server/console.c +++ b/server/console.c @@ -1446,7 +1446,85 @@ static int fill_console_output( struct screen_buffer *screen_buffer, char_info_t /* scroll parts of a screen buffer */ static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc, int ysrc, int xdst, int ydst, - int w, int h ) + int w, int h, const rectangle_t *clip, char_info_t fill ) +{ + struct condrv_renderer_event evt; + rectangle_t src, dst; + int x, y; + + src.left = max( xsrc, clip->left ); + src.top = max( ysrc, clip->top ); + src.right = min( xsrc + w - 1, clip->right ); + src.bottom = min( ysrc + h - 1, clip->bottom ); + + dst.left = xdst; + dst.top = ydst; + dst.right = xdst + w - 1; + dst.bottom = ydst + h - 1; + + if (dst.left < clip->left) + { + xsrc += clip->left - dst.left; + w -= clip->left - dst.left; + dst.left = clip->left; + } + if (dst.top < clip->top) + { + ysrc += clip->top - dst.top; + h -= clip->top - dst.top; + dst.top = clip->top; + } + if (dst.right > clip->right) w -= dst.right - clip->right; + if (dst.bottom > clip->bottom) h -= dst.bottom - clip->bottom; + + if (w > 0 && h > 0) + { + if (ysrc < ydst) + { + for (y = h; y > 0; y--) + { + memcpy( &screen_buffer->data[(dst.top + y - 1) * screen_buffer->width + dst.left], + &screen_buffer->data[(ysrc + y - 1) * screen_buffer->width + xsrc], + w * sizeof(screen_buffer->data[0]) ); + } + } + else + { + for (y = 0; y < h; y++) + { + /* we use memmove here because when psrc and pdst are the same, + * copies are done on the same row, so the dst and src blocks + * can overlap */ + memmove( &screen_buffer->data[(dst.top + y) * screen_buffer->width + dst.left], + &screen_buffer->data[(ysrc + y) * screen_buffer->width + xsrc], + w * sizeof(screen_buffer->data[0]) ); + } + } + } + + for (y = src.top; y <= src.bottom; y++) + { + int left = src.left; + int right = src.right; + if (dst.top <= y && y <= dst.bottom) + { + if (dst.left <= src.left) left = max( left, dst.right + 1 ); + if (dst.left >= src.left) right = min( right, dst.left - 1 ); + } + for (x = left; x <= right; x++) screen_buffer->data[y * screen_buffer->width + x] = fill; + } + + /* FIXME: this could be enhanced, by signalling scroll */ + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); + evt.u.update.top = min( src.top, dst.top ); + evt.u.update.bottom = max( src.bottom, dst.bottom ); + console_input_events_append( screen_buffer->input, &evt ); +} + +/* scroll parts of a screen buffer */ +static void scroll_console_output_req( struct screen_buffer *screen_buffer, int xsrc, int ysrc, int xdst, int ydst, + int w, int h ) { int j; char_info_t *psrc, *pdst; @@ -1811,6 +1889,40 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return !get_error(); } + case IOCTL_CONDRV_SCROLL: + { + const struct condrv_scroll_params *params = get_req_data(); + rectangle_t clip; + if (get_req_data_size() != sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (console_input_is_bare( screen_buffer->input ) || !screen_buffer->input) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; + } + clip.left = max( params->clip.Left, 0 ); + clip.top = max( params->clip.Top, 0 ); + clip.right = min( params->clip.Right, screen_buffer->width - 1 ); + clip.bottom = min( params->clip.Bottom, screen_buffer->height - 1 ); + if (clip.left > clip.right || clip.top > clip.bottom || params->scroll.Left < 0 || params->scroll.Top < 0 || + params->scroll.Right >= screen_buffer->width || params->scroll.Bottom >= screen_buffer->height || + params->scroll.Right < params->scroll.Left || params->scroll.Top > params->scroll.Bottom || + params->origin.X < 0 || params->origin.X >= screen_buffer->width || params->origin.Y < 0 || + params->origin.Y >= screen_buffer->height) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + scroll_console_output( screen_buffer, params->scroll.Left, params->scroll.Top, params->origin.X, params->origin.Y, + params->scroll.Right - params->scroll.Left + 1, params->scroll.Bottom - params->scroll.Top + 1, + &clip, params->fill ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0; @@ -2182,8 +2294,8 @@ DECL_HANDLER(move_console_output) release_object( screen_buffer ); return; } - scroll_console_output( screen_buffer, req->x_src, req->y_src, req->x_dst, req->y_dst, - req->w, req->h ); + scroll_console_output_req( screen_buffer, req->x_src, req->y_src, req->x_dst, req->y_dst, + req->w, req->h ); release_object( screen_buffer ); } }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SCROLL in ScrollConsoleScreenBufferW.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 3609406308110f93f11c6045da5734f038ef727c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3609406308110f93f11c6045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:36:23 2020 +0200 kernelbase: Use IOCTL_CONDRV_SCROLL in ScrollConsoleScreenBufferW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 114 ++++------------------------------------------ 1 file changed, 10 insertions(+), 104 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f59010b334..10b52df4e9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -74,12 +74,6 @@ static BOOL WINAPI default_ctrl_handler( DWORD type ) static struct ctrl_handler default_handler = { default_ctrl_handler, NULL }; static struct ctrl_handler *ctrl_handlers = &default_handler; -/* map a kernel32 console handle onto a real wineserver handle */ -static inline obj_handle_t console_handle_unmap( HANDLE h ) -{ - return wine_server_obj_handle( console_handle_map( h ) ); -} - static BOOL console_ioctl( HANDLE handle, DWORD code, void *in_buff, DWORD in_count, void *out_buff, DWORD out_count, DWORD *read ) { @@ -160,21 +154,6 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count ) } } -/* helper function for ScrollConsoleScreenBufferW */ -static void fill_console_output( HANDLE handle, int i, int j, int len, CHAR_INFO *fill ) -{ - struct condrv_fill_output_params params; - - params.mode = CHAR_INFO_MODE_TEXTATTR; - params.x = i; - params.y = j; - params.count = len; - params.wrap = FALSE; - params.ch = fill->Char.UnicodeChar; - params.attr = fill->Attributes; - console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), NULL, 0, NULL ); -} - /* helper function for GetLargestConsoleWindowSize */ static COORD get_largest_console_window_size( HANDLE handle ) { @@ -964,12 +943,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ScrollConsoleScreenBufferW( HANDLE handle, SMALL_R SMALL_RECT *clip_rect, COORD origin, CHAR_INFO *fill ) { - CONSOLE_SCREEN_BUFFER_INFO info; - SMALL_RECT dst, clip; - int i, j, start = -1; - DWORD ret; - BOOL inside; - COORD src; + struct condrv_scroll_params params; if (clip_rect) TRACE( "(%p,(%d,%d-%d,%d),(%d,%d-%d,%d),%d-%d,%p)\n", handle, @@ -981,85 +955,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH ScrollConsoleScreenBufferW( HANDLE handle, SMALL_R scroll->Left, scroll->Top, scroll->Right, scroll->Bottom, origin.X, origin.Y, fill ); - if (!GetConsoleScreenBufferInfo( handle, &info )) return FALSE; - - src.X = scroll->Left; - src.Y = scroll->Top; - - /* step 1: get dst rect */ - dst.Left = origin.X; - dst.Top = origin.Y; - dst.Right = dst.Left + (scroll->Right - scroll->Left); - dst.Bottom = dst.Top + (scroll->Bottom - scroll->Top); - - /* step 2a: compute the final clip rect (optional passed clip and screen buffer limits */ - if (clip_rect) - { - clip.Left = max(0, clip_rect->Left); - clip.Right = min(info.dwSize.X - 1, clip_rect->Right); - clip.Top = max(0, clip_rect->Top); - clip.Bottom = min(info.dwSize.Y - 1, clip_rect->Bottom); - } - else + params.scroll = *scroll; + params.origin = origin; + params.fill.ch = fill->Char.UnicodeChar; + params.fill.attr = fill->Attributes; + if (!clip_rect) { - clip.Left = 0; - clip.Right = info.dwSize.X - 1; - clip.Top = 0; - clip.Bottom = info.dwSize.Y - 1; + params.clip.Left = params.clip.Top = 0; + params.clip.Right = params.clip.Bottom = SHRT_MAX; } - if (clip.Left > clip.Right || clip.Top > clip.Bottom) return FALSE; - - /* step 2b: clip dst rect */ - if (dst.Left < clip.Left ) {src.X += clip.Left - dst.Left; dst.Left = clip.Left;} - if (dst.Top < clip.Top ) {src.Y += clip.Top - dst.Top; dst.Top = clip.Top;} - if (dst.Right > clip.Right ) dst.Right = clip.Right; - if (dst.Bottom > clip.Bottom) dst.Bottom = clip.Bottom; - - /* step 3: transfer the bits */ - SERVER_START_REQ( move_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x_src = src.X; - req->y_src = src.Y; - req->x_dst = dst.Left; - req->y_dst = dst.Top; - req->w = dst.Right - dst.Left + 1; - req->h = dst.Bottom - dst.Top + 1; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - - if (!ret) return FALSE; - - /* step 4: clean out the exposed part */ - - /* have to write cell [i,j] if it is not in dst rect (because it has already - * been written to by the scroll) and is in clip (we shall not write - * outside of clip) - */ - for (j = max(scroll->Top, clip.Top); j <= min(scroll->Bottom, clip.Bottom); j++) - { - inside = dst.Top <= j && j <= dst.Bottom; - start = -1; - for (i = max(scroll->Left, clip.Left); i <= min(scroll->Right, clip.Right); i++) - { - if (inside && dst.Left <= i && i <= dst.Right) - { - if (start != -1) - { - fill_console_output( handle, start, j, i - start, fill ); - start = -1; - } - } - else - { - if (start == -1) start = i; - } - } - if (start != -1) fill_console_output( handle, start, j, i - start, fill ); - } - - return TRUE; + else params.clip = *clip_rect; + return console_ioctl( handle, IOCTL_CONDRV_SCROLL, (void *)&params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : server: Remove no longer used move_console_output request.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: b6b2667482a14e4cd76da48940ead142ce207b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b2667482a14e4cd76da489… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:36:33 2020 +0200 server: Remove no longer used move_console_output request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 24 +------------- server/console.c | 75 ------------------------------------------ server/protocol.def | 12 ------- server/request.h | 10 ------ server/trace.c | 14 -------- 5 files changed, 1 insertion(+), 134 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 957f97eb36..d4bb5c9ab3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1995,25 +1995,6 @@ struct create_console_output_reply -struct move_console_output_request -{ - struct request_header __header; - obj_handle_t handle; - short int x_src; - short int y_src; - short int x_dst; - short int y_dst; - short int w; - short int h; - char __pad_28[4]; -}; -struct move_console_output_reply -{ - struct reply_header __header; -}; - - - struct send_console_signal_request { struct request_header __header; @@ -5599,7 +5580,6 @@ enum request REQ_append_console_input_history, REQ_get_console_input_history, REQ_create_console_output, - REQ_move_console_output, REQ_send_console_signal, REQ_read_directory_changes, REQ_read_change, @@ -5891,7 +5871,6 @@ union generic_request struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; struct create_console_output_request create_console_output_request; - struct move_console_output_request move_console_output_request; struct send_console_signal_request send_console_signal_request; struct read_directory_changes_request read_directory_changes_request; struct read_change_request read_change_request; @@ -6181,7 +6160,6 @@ union generic_reply struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; struct create_console_output_reply create_console_output_reply; - struct move_console_output_reply move_console_output_reply; struct send_console_signal_reply send_console_signal_reply; struct read_directory_changes_reply read_directory_changes_reply; struct read_change_reply read_change_reply; @@ -6398,7 +6376,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 631 +#define SERVER_PROTOCOL_VERSION 632 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index f924ddc06b..2316b8eafb 100644 --- a/server/console.c +++ b/server/console.c @@ -1522,61 +1522,6 @@ static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc console_input_events_append( screen_buffer->input, &evt ); } -/* scroll parts of a screen buffer */ -static void scroll_console_output_req( struct screen_buffer *screen_buffer, int xsrc, int ysrc, int xdst, int ydst, - int w, int h ) -{ - int j; - char_info_t *psrc, *pdst; - struct condrv_renderer_event evt; - - if (xsrc < 0 || ysrc < 0 || xdst < 0 || ydst < 0 || - xsrc + w > screen_buffer->width || - xdst + w > screen_buffer->width || - ysrc + h > screen_buffer->height || - ydst + h > screen_buffer->height || - w == 0 || h == 0) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - if (ysrc < ydst) - { - psrc = &screen_buffer->data[(ysrc + h - 1) * screen_buffer->width + xsrc]; - pdst = &screen_buffer->data[(ydst + h - 1) * screen_buffer->width + xdst]; - - for (j = h; j > 0; j--) - { - memcpy(pdst, psrc, w * sizeof(*pdst) ); - pdst -= screen_buffer->width; - psrc -= screen_buffer->width; - } - } - else - { - psrc = &screen_buffer->data[ysrc * screen_buffer->width + xsrc]; - pdst = &screen_buffer->data[ydst * screen_buffer->width + xdst]; - - for (j = 0; j < h; j++) - { - /* we use memmove here because when psrc and pdst are the same, - * copies are done on the same row, so the dst and src blocks - * can overlap */ - memmove( pdst, psrc, w * sizeof(*pdst) ); - pdst += screen_buffer->width; - psrc += screen_buffer->width; - } - } - - /* FIXME: this could be enhanced, by signalling scroll */ - evt.event = CONSOLE_RENDERER_UPDATE_EVENT; - memset(&evt.u, 0, sizeof(evt.u)); - evt.u.update.top = min(ysrc, ydst); - evt.u.update.bottom = max(ysrc, ydst) + h - 1; - console_input_events_append( screen_buffer->input, &evt ); -} - static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_input *console = get_fd_user( fd ); @@ -2280,26 +2225,6 @@ DECL_HANDLER(create_console_output) release_object( console ); } -/* move a rect of data in a screen buffer */ -DECL_HANDLER(move_console_output) -{ - struct screen_buffer *screen_buffer; - - if ((screen_buffer = (struct screen_buffer*)get_handle_obj( current->process, req->handle, - FILE_WRITE_DATA, &screen_buffer_ops))) - { - if (console_input_is_bare( screen_buffer->input )) - { - set_error( STATUS_OBJECT_TYPE_MISMATCH ); - release_object( screen_buffer ); - return; - } - scroll_console_output_req( screen_buffer, req->x_src, req->y_src, req->x_dst, req->y_dst, - req->w, req->h ); - release_object( screen_buffer ); - } -} - /* sends a signal to a console (process, group...) */ DECL_HANDLER(send_console_signal) { diff --git a/server/protocol.def b/server/protocol.def index c8014d920d..b48cf70e48 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1567,18 +1567,6 @@ enum server_fd_type @END -/* move a rect (of data) in screen buffer content */ -(a)REQ(move_console_output) - obj_handle_t handle; /* handle to the console output */ - short int x_src; /* position (x, y) of rect to start moving from */ - short int y_src; - short int x_dst; /* position (x, y) of rect to move to */ - short int y_dst; - short int w; /* size of the rect (width, height) to move */ - short int h; -(a)END - - /* Sends a signal to a process group */ @REQ(send_console_signal) int signal; /* the signal to send */ diff --git a/server/request.h b/server/request.h index 87593d1373..fd5141d6cb 100644 --- a/server/request.h +++ b/server/request.h @@ -191,7 +191,6 @@ DECL_HANDLER(get_console_input_info); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); -DECL_HANDLER(move_console_output); DECL_HANDLER(send_console_signal); DECL_HANDLER(read_directory_changes); DECL_HANDLER(read_change); @@ -482,7 +481,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, (req_handler)req_create_console_output, - (req_handler)req_move_console_output, (req_handler)req_send_console_signal, (req_handler)req_read_directory_changes, (req_handler)req_read_change, @@ -1166,14 +1164,6 @@ C_ASSERT( FIELD_OFFSET(struct create_console_output_request, fd) == 28 ); C_ASSERT( sizeof(struct create_console_output_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_console_output_reply, handle_out) == 8 ); C_ASSERT( sizeof(struct create_console_output_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, x_src) == 16 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, y_src) == 18 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, x_dst) == 20 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, y_dst) == 22 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, w) == 24 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, h) == 26 ); -C_ASSERT( sizeof(struct move_console_output_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, signal) == 12 ); C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, group_id) == 16 ); C_ASSERT( sizeof(struct send_console_signal_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 78bdf790dd..db5d0dd6ea 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2139,17 +2139,6 @@ static void dump_create_console_output_reply( const struct create_console_output fprintf( stderr, " handle_out=%04x", req->handle_out ); } -static void dump_move_console_output_request( const struct move_console_output_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", x_src=%d", req->x_src ); - fprintf( stderr, ", y_src=%d", req->y_src ); - fprintf( stderr, ", x_dst=%d", req->x_dst ); - fprintf( stderr, ", y_dst=%d", req->y_dst ); - fprintf( stderr, ", w=%d", req->w ); - fprintf( stderr, ", h=%d", req->h ); -} - static void dump_send_console_signal_request( const struct send_console_signal_request *req ) { fprintf( stderr, " signal=%d", req->signal ); @@ -4539,7 +4528,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, (dump_func)dump_create_console_output_request, - (dump_func)dump_move_console_output_request, (dump_func)dump_send_console_signal_request, (dump_func)dump_read_directory_changes_request, (dump_func)dump_read_change_request, @@ -4829,7 +4817,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_console_output_reply, NULL, NULL, - NULL, (dump_func)dump_read_change_reply, (dump_func)dump_create_mapping_reply, (dump_func)dump_open_mapping_reply, @@ -5115,7 +5102,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "append_console_input_history", "get_console_input_history", "create_console_output", - "move_console_output", "send_console_signal", "read_directory_changes", "read_change",

1 0

Jacek Caban : server: Use weak reference between console input and renderer objects.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: e7c9a0e1511641961a69babe2ab7aca75c636672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7c9a0e1511641961a69babe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:01 2020 +0200 server: Use weak reference between console input and renderer objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/console.c b/server/console.c index 2316b8eafb..7a10b611c5 100644 --- a/server/console.c +++ b/server/console.c @@ -131,6 +131,7 @@ struct console_input_events { struct object obj; /* object header */ struct fd *fd; /* pseudo-fd for ioctls */ + struct console_input *console; /* attached console */ int num_alloc; /* number of allocated events */ int num_used; /* number of actually used events */ struct condrv_renderer_event *events; @@ -321,6 +322,7 @@ static void console_input_events_destroy( struct object *obj ) { struct console_input_events *evts = (struct console_input_events *)obj; assert( obj->ops == &console_input_events_ops ); + if (evts->console) evts->console->evt = NULL; free_async_queue( &evts->read_q ); if (evts->fd) release_object( evts->fd ); free( evts->events ); @@ -419,6 +421,7 @@ static struct object *create_console_input_events(void) struct console_input_events* evt; if (!(evt = alloc_object( &console_input_events_ops ))) return NULL; + evt->console = NULL; evt->num_alloc = evt->num_used = 0; evt->events = NULL; init_async_queue( &evt->read_q ); @@ -1177,10 +1180,7 @@ static void console_input_destroy( struct object *obj ) free_async_queue( &console_in->read_q ); if (console_in->evt) - { - release_object( console_in->evt ); - console_in->evt = NULL; - } + console_in->evt->console = NULL; if (console_in->event) release_object( console_in->event ); if (console_in->fd) @@ -1898,10 +1898,11 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct 0, &console_input_ops ); if (!console_input) return 0; - if (!console_input->evt) + if (!console_input->evt && !evts->console) { - console_input->evt = (struct console_input_events *)grab_object( evts ); + console_input->evt = evts; console_input->renderer = current; + evts->console = console_input; } else set_error( STATUS_INVALID_HANDLE );

1 0

Jacek Caban : server: Allow using console ioctls on renderer object.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: fef78c4e10422319736f290e44493838e4257a04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef78c4e10422319736f290e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:12 2020 +0200 server: Allow using console ioctls on renderer object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 7a10b611c5..add8b1278d 100644 --- a/server/console.c +++ b/server/console.c @@ -1910,9 +1910,27 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct return !get_error(); } + case IOCTL_CONDRV_SCROLL: + case IOCTL_CONDRV_SET_MODE: + case IOCTL_CONDRV_WRITE_OUTPUT: + case IOCTL_CONDRV_READ_OUTPUT: + case IOCTL_CONDRV_FILL_OUTPUT: + case IOCTL_CONDRV_GET_OUTPUT_INFO: + case IOCTL_CONDRV_SET_OUTPUT_INFO: + if (!evts->console || !evts->console->active) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return screen_buffer_ioctl( evts->console->active->fd, code, async ); + default: - set_error( STATUS_INVALID_HANDLE ); - return 0; + if (!evts->console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return console_input_ioctl( evts->console->fd, code, async ); } }

1 0