March 2021 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Initialize HTMLStorage object with compat mode.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: c4fe86dabd6c60a81b04ec0154d43c3fae5c9395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4fe86dabd6c60a81b04ec01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:01 2021 +0100 mshtml: Initialize HTMLStorage object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstorage.c | 4 ++-- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index bc4b59b7f05..705c6248802 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -197,7 +197,7 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_storage(IHTMLStorage **p) +HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) { HTMLStorage *storage; @@ -207,7 +207,7 @@ HRESULT create_storage(IHTMLStorage **p) storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; - init_dispex(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex); + init_dispex_with_compat_mode(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); *p = &storage->IHTMLStorage_iface; return S_OK; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bc12d0decbc..9da2f7ccbae 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2137,7 +2137,8 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS if(!This->inner_window->session_storage) { HRESULT hres; - hres = create_storage(&This->inner_window->session_storage); + hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), + &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2156,7 +2157,8 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto if(!This->inner_window->local_storage) { HRESULT hres; - hres = create_storage(&This->inner_window->local_storage); + hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), + &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e213cd698ba..c58a6a563df 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -919,7 +919,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLDOMChildrenCollection object with compat mode.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: fe5860e42b13181b1ec7a3b664c0498da028ae93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe5860e42b13181b1ec7a3b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:08 2021 +0100 mshtml: Initialize HTMLDOMChildrenCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 14 +++++++------- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlnode.c | 38 +++++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6eb6fcc1f49..27ff9c00349 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4349,21 +4349,21 @@ static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface HTMLDocument *This = impl_from_IDocumentSelector(iface); nsIDOMNodeList *node_list; nsAString nsstr; - nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); nsAString_InitDepend(&nsstr, v); - nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->doc_node->nsdoc, &nsstr, &node_list); + hres = map_nsresult(nsIDOMHTMLDocument_QuerySelectorAll(This->doc_node->nsdoc, &nsstr, &node_list)); nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) { - ERR("QuerySelectorAll failed: %08x\n", nsres); - return E_FAIL; + if(FAILED(hres)) { + ERR("QuerySelectorAll failed: %08x\n", hres); + return hres; } - *pel = create_child_collection(node_list); + hres = create_child_collection(node_list, dispex_compat_mode(&This->doc_node->node.event_target.dispex), pel); nsIDOMNodeList_Release(node_list); - return *pel ? S_OK : E_OUTOFMEMORY; + return hres; } static const IDocumentSelectorVtbl DocumentSelectorVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 04e59eafdae..8e79da70571 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5740,7 +5740,7 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, HTMLElement *This = impl_from_IElementSelector(iface); nsIDOMNodeList *node_list; nsAString nsstr; - nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); @@ -5750,16 +5750,16 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, } nsAString_InitDepend(&nsstr, v); - nsres = nsIDOMElement_QuerySelectorAll(This->dom_element, &nsstr, &node_list); + hres = map_nsresult(nsIDOMElement_QuerySelectorAll(This->dom_element, &nsstr, &node_list)); nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) { - ERR("QuerySelectorAll failed: %08x\n", nsres); - return E_FAIL; + if(FAILED(hres)) { + ERR("QuerySelectorAll failed: %08x\n", hres); + return hres; } - *pel = create_child_collection(node_list); + hres = create_child_collection(node_list, dispex_compat_mode(&This->node.event_target.dispex), pel); nsIDOMNodeList_Release(node_list); - return *pel ? S_OK : E_OUTOFMEMORY; + return hres; } static const IElementSelectorVtbl ElementSelectorVtbl = { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b2d35f46601..89160aaa0b1 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -436,24 +436,24 @@ static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { HTMLDOMNode_init_dispex_info }; -IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList *nslist) +HRESULT create_child_collection(nsIDOMNodeList *nslist, compat_mode_t compat_mode, IHTMLDOMChildrenCollection **ret) { - HTMLDOMChildrenCollection *ret; + HTMLDOMChildrenCollection *collection; - ret = heap_alloc_zero(sizeof(*ret)); - if(!ret) - return NULL; + if(!(collection = heap_alloc_zero(sizeof(*collection)))) + return E_OUTOFMEMORY; - ret->IHTMLDOMChildrenCollection_iface.lpVtbl = &HTMLDOMChildrenCollectionVtbl; - ret->ref = 1; + collection->IHTMLDOMChildrenCollection_iface.lpVtbl = &HTMLDOMChildrenCollectionVtbl; + collection->ref = 1; nsIDOMNodeList_AddRef(nslist); - ret->nslist = nslist; + collection->nslist = nslist; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMChildrenCollection_iface, - &HTMLDOMChildrenCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLDOMChildrenCollection_iface, + &HTMLDOMChildrenCollection_dispex, compat_mode); - return &ret->IHTMLDOMChildrenCollection_iface; + *ret = &collection->IHTMLDOMChildrenCollection_iface; + return S_OK; } static inline HTMLDOMNode *impl_from_IHTMLDOMNode(IHTMLDOMNode *iface) @@ -611,20 +611,20 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); nsIDOMNodeList *nslist; - nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMNode_GetChildNodes(This->nsnode, &nslist); - if(NS_FAILED(nsres)) { - ERR("GetChildNodes failed: %08x\n", nsres); - return E_FAIL; + hres = map_nsresult(nsIDOMNode_GetChildNodes(This->nsnode, &nslist)); + if(FAILED(hres)) { + ERR("GetChildNodes failed: %08x\n", hres); + return hres; } - *p = (IDispatch*)create_child_collection(nslist); + hres = create_child_collection(nslist, dispex_compat_mode(&This->event_target.dispex), + (IHTMLDOMChildrenCollection**)p); nsIDOMNodeList_Release(nslist); - - return *p ? S_OK : E_OUTOFMEMORY; + return hres; } static HRESULT WINAPI HTMLDOMNode_get_attributes(IHTMLDOMNode *iface, IDispatch **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c58a6a563df..5e52eb3d7ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1143,7 +1143,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(nsIDOMNodeList*,compat_mode_t) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(nsIDOMHTMLCollection*,compat_mode_t) DECLSPEC_HIDDEN; -IHTMLDOMChildrenCollection *create_child_collection(nsIDOMNodeList*) DECLSPEC_HIDDEN; +HRESULT create_child_collection(nsIDOMNodeList*,compat_mode_t,IHTMLDOMChildrenCollection**) DECLSPEC_HIDDEN; HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLFiltersCollection object with compat mode.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 51479d560ca53856f8b20dcb334ea61161fafdb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51479d560ca53856f8b20dcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:17 2021 +0100 mshtml: Initialize HTMLFiltersCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8e79da70571..8d2d8626047 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -230,7 +230,7 @@ static inline HTMLFiltersCollection *impl_from_IHTMLFiltersCollection(IHTMLFilte return CONTAINING_RECORD(iface, HTMLFiltersCollection, IHTMLFiltersCollection_iface); } -static IHTMLFiltersCollection *HTMLFiltersCollection_Create(void); +static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFiltersCollection **ret); static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) { @@ -2011,18 +2011,16 @@ static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface) return S_OK; } -static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, - IHTMLFiltersCollection **p) +static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, IHTMLFiltersCollection **p) { HTMLElement *This = impl_from_IHTMLElement(iface); + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - *p = HTMLFiltersCollection_Create(); - - return S_OK; + return create_filters_collection(dispex_compat_mode(&This->node.event_target.dispex), p); } static HRESULT WINAPI HTMLElement_put_ondragstart(IHTMLElement *iface, VARIANT v) @@ -6606,17 +6604,21 @@ static dispex_static_data_t HTMLFiltersCollection_dispex = { HTMLFiltersCollection_iface_tids }; -static IHTMLFiltersCollection *HTMLFiltersCollection_Create(void) +static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFiltersCollection **ret) { - HTMLFiltersCollection *ret = heap_alloc(sizeof(HTMLFiltersCollection)); + HTMLFiltersCollection *collection; - ret->IHTMLFiltersCollection_iface.lpVtbl = &HTMLFiltersCollectionVtbl; - ret->ref = 1; + if(!(collection = heap_alloc(sizeof(HTMLFiltersCollection)))) + return E_OUTOFMEMORY; + + collection->IHTMLFiltersCollection_iface.lpVtbl = &HTMLFiltersCollectionVtbl; + collection->ref = 1; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLFiltersCollection_iface, - &HTMLFiltersCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLFiltersCollection_iface, + &HTMLFiltersCollection_dispex, compat_mode); - return &ret->IHTMLFiltersCollection_iface; + *ret = &collection->IHTMLFiltersCollection_iface; + return S_OK; } /* interface IHTMLAttributeCollection */

1 0

Jacek Caban : mshtml: Initialize HTMLDocumentObj object with compat mode.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 5f9dfee9860e4eb53780ab9f06067cd33140c3fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9dfee9860e4eb53780ab9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:22 2021 +0100 mshtml: Initialize HTMLDocumentObj object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 27ff9c00349..e945f148ad6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5979,7 +5979,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->basedoc.doc_obj = doc; - init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); + init_dispex_with_compat_mode(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex, COMPAT_MODE_QUIRKS); init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_inner, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); doc->is_mhtml = is_mhtml;

1 0

Jacek Caban : mshtml: Initialize function object with compat mode.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 013accc3db1fb1ad73a5f0934243818ee104df5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=013accc3db1fb1ad73a5f093… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:28 2021 +0100 mshtml: Initialize function object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 626c3671f75..44e4813b39e 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -876,7 +876,7 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) return NULL; ret->IUnknown_iface.lpVtbl = &FunctionUnkVtbl; - init_dispex(&ret->dispex, &ret->IUnknown_iface, &function_dispex); + init_dispex_with_compat_mode(&ret->dispex, &ret->IUnknown_iface, &function_dispex, dispex_compat_mode(obj)); ret->ref = 1; ret->obj = obj; ret->info = info;

1 0

Jacek Caban : mshtml: Rename init_dispex_with_compat_mode to init_dispatch.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 5590ea4a6e26aba1c6ec0fdb8f3b74ad6c14ca7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5590ea4a6e26aba1c6ec0fdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:57:45 2021 +0100 mshtml: Rename init_dispex_with_compat_mode to init_dispatch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmlattr.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlelemcol.c | 4 ++-- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmllocation.c | 4 ++-- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstylesheet.c | 16 ++++++++-------- dlls/mshtml/mshtml_private.h | 7 +------ dlls/mshtml/omnavigator.c | 36 ++++++++++++++++++------------------ dlls/mshtml/range.c | 4 ++-- dlls/mshtml/selection.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 4 ++-- 18 files changed, 61 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5590ea4a6e26aba1c6ec…

1 0

Rémi Bernon : ntdll: Don't call possibly deadly DbgUiGetThreadDebugObject.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 4d5824112e13160e538013a25f1c13a124565180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d5824112e13160e538013a2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 16 20:28:09 2021 +0100 ntdll: Don't call possibly deadly DbgUiGetThreadDebugObject. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 83ae707ba3f..04bcdb18a2b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3215,7 +3215,8 @@ void WINAPI LdrShutdownThread(void) RtlReleasePebLock(); RtlLeaveCriticalSection( &loader_section ); - if (DbgUiGetThreadDebugObject()) NtClose( DbgUiGetThreadDebugObject() ); + /* don't call DbgUiGetThreadDebugObject as some apps hook it and terminate if called */ + if (NtCurrentTeb()->DbgSsReserved[1]) NtClose( NtCurrentTeb()->DbgSsReserved[1] ); RtlFreeThreadActivationContextStack(); }

1 0

Huw Davies : riched20: Handle the read-only property setting in the host.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 8544242f43b5eeeb9f74ed112bca726e42de1d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8544242f43b5eeeb9f74ed11… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 16 08:22:45 2021 +0000 riched20: Handle the read-only property setting in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 49 ++++++++++++++++-------------------- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 67 ++++++++++++++++++++++++++++++++++++++++--------- dlls/riched20/txtsrv.c | 9 ++++--- 4 files changed, 83 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8544242f43b5eeeb9f74…

1 0

Huw Davies : riched20: Handle scrollbar changes in the host.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: d7d81d7182541a53b903dac335fa05a9cc0ce983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7d81d7182541a53b903dac3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 16 08:22:46 2021 +0000 riched20: Handle scrollbar changes in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 57 ++++++-------------------------------- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 32 +++++++++++----------- dlls/riched20/txthost.c | 73 +++++++++++++++++++++++++++++++------------------ dlls/riched20/txtsrv.c | 21 ++++++++++++-- 5 files changed, 92 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7d81d7182541a53b903…

1 0

Huw Davies : riched20: Use the host to set hide/save-sel, auto-word-sel, and vertical properties.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 030fbc458715159ed90e6aa4c67748eacadc5529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=030fbc458715159ed90e6aa4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 16 08:22:47 2021 +0000 riched20: Use the host to set hide/save-sel, auto-word-sel, and vertical properties. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 30 ++++++------------------------ dlls/riched20/paint.c | 6 +++--- dlls/riched20/txthost.c | 35 +++++++++++++++++++++++++++++++---- dlls/riched20/txtsrv.c | 2 ++ 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cf723d66cf6..b7c07058801 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3118,20 +3118,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) if (ed->props & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar(texthost, &ed->cPasswordMask); - if (ed->props & TXTBIT_AUTOWORDSEL) - ed->styleFlags |= ECO_AUTOWORDSELECTION; if (ed->props & TXTBIT_MULTILINE) { ed->styleFlags |= ES_MULTILINE; ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) != 0; } else { ed->bWordWrap = FALSE; } - if (!(ed->props & TXTBIT_HIDESELECTION)) - ed->styleFlags |= ES_NOHIDESEL; - if (ed->props & TXTBIT_SAVESELECTION) - ed->styleFlags |= ES_SAVESEL; - if (ed->props & TXTBIT_VERTICAL) - ed->styleFlags |= ES_VERTICAL; + if (ed->props & TXTBIT_DISABLEDRAG) ed->styleFlags |= ES_NOOLEDRAGDROP; @@ -3444,7 +3437,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bDialogMode = TRUE; if (editor->styleFlags & ES_MULTILINE) code |= DLGC_WANTMESSAGE; - if (!(editor->styleFlags & ES_SAVESEL)) + if (!(editor->props & TXTBIT_SAVESELECTION)) code |= DLGC_HASSETSEL; return code; } @@ -3492,8 +3485,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETOPTIONS: { /* these flags are equivalent to the ES_* counterparts */ - DWORD mask = ECO_VERTICAL | - ECO_NOHIDESEL | ECO_WANTRETURN | ECO_SELECTIONBAR; + DWORD mask = ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD settings = editor->styleFlags & mask; return settings; @@ -3544,9 +3536,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* these flags are equivalent to ES_* counterparts, except for * ECO_AUTOWORDSELECTION that doesn't have an ES_* counterpart, * but is still stored in editor->styleFlags. */ - const DWORD mask = ECO_VERTICAL | - ECO_NOHIDESEL | ECO_WANTRETURN | - ECO_SELECTIONBAR | ECO_AUTOWORDSELECTION; + const DWORD mask = ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD settings = mask & editor->styleFlags; DWORD oldSettings = settings; DWORD changedSettings; @@ -3584,15 +3574,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_RewrapRepaint(editor); } - if ((changedSettings & settings & ES_NOHIDESEL) && !editor->bHaveFocus) - ME_InvalidateSelection( editor ); - if (changedSettings & settings & ECO_VERTICAL) - FIXME("ECO_VERTICAL not implemented yet!\n"); - if (changedSettings & settings & ECO_AUTOHSCROLL) - FIXME("ECO_WANTRETURN not implemented yet!\n"); - if (changedSettings & settings & ECO_AUTOWORDSELECTION) - FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); } return settings; @@ -4216,7 +4198,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, create_caret(editor); update_caret(editor); ME_SendOldNotify(editor, EN_SETFOCUS); - if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; case WM_KILLFOCUS: @@ -4226,7 +4208,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, hide_caret(editor); DestroyCaret(); ME_SendOldNotify(editor, EN_KILLFOCUS); - if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; case WM_COMMAND: diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e22dc64ebdb..34d0ab8a54f 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -270,8 +270,8 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy ); - if (c->editor->bHideSelection || (!c->editor->bHaveFocus && - !(c->editor->styleFlags & ES_NOHIDESEL))) selected = FALSE; + if (c->editor->bHideSelection || (!c->editor->bHaveFocus && (c->editor->props & TXTBIT_HIDESELECTION))) + selected = FALSE; if (c->editor->bEmulateVersion10) { old_style_selected = selected; @@ -366,7 +366,7 @@ static void draw_text_with_style( ME_Context *c, ME_Run *run, int x, int y, int yOffset = 0; BOOL selected = (nSelFrom < run->len && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection && - (c->editor->bHaveFocus || (c->editor->styleFlags & ES_NOHIDESEL))); + (c->editor->bHaveFocus || !(c->editor->props & TXTBIT_HIDESELECTION))); BOOL old_style_selected = FALSE; RECT sel_rect; HRGN clip = NULL, sel_rgn = NULL; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 027b079d654..d10b303a137 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -60,7 +60,7 @@ static void host_init_props( struct host *host ) if (style & WS_VSCROLL) host->scrollbars |= ES_AUTOVSCROLL; if ((style & WS_HSCROLL) && !host->emulate_10) host->scrollbars |= ES_AUTOHSCROLL; - host->props = TXTBIT_RICHTEXT | TXTBIT_AUTOWORDSEL | TXTBIT_ALLOWBEEP; + host->props = TXTBIT_RICHTEXT | TXTBIT_ALLOWBEEP; if (style & ES_MULTILINE) host->props |= TXTBIT_MULTILINE; if (style & ES_READONLY) host->props |= TXTBIT_READONLY; if (style & ES_PASSWORD) host->props |= TXTBIT_USEPASSWORD; @@ -765,9 +765,11 @@ static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT * static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *res ) { DWORD style, old_options, new_options, change, props_mask = 0; - const DWORD mask = ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | - ECO_SELECTIONBAR | ECO_VERTICAL; - const DWORD host_mask = ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_READONLY; + DWORD mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | + ECO_WANTRETURN | ECO_SAVESEL | ECO_SELECTIONBAR | ECO_VERTICAL; + const DWORD host_mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | + ECO_SAVESEL | ECO_VERTICAL; + HRESULT hr = S_OK; new_options = old_options = SendMessageW( host->window, EM_GETOPTIONS, 0, 0 ); @@ -790,6 +792,11 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r change = (new_options ^ old_options); + if (change & ECO_AUTOWORDSELECTION) + { + host->props ^= TXTBIT_AUTOWORDSEL; + props_mask |= TXTBIT_AUTOWORDSEL; + } if (change & ECO_AUTOVSCROLL) { host->scrollbars ^= WS_VSCROLL; @@ -800,11 +807,26 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r host->scrollbars ^= WS_HSCROLL; props_mask |= TXTBIT_SCROLLBARCHANGE; } + if (change & ECO_NOHIDESEL) + { + host->props ^= TXTBIT_HIDESELECTION; + props_mask |= TXTBIT_HIDESELECTION; + } if (change & ECO_READONLY) { host->props ^= TXTBIT_READONLY; props_mask |= TXTBIT_READONLY; } + if (change & ECO_SAVESEL) + { + host->props ^= TXTBIT_SAVESELECTION; + props_mask |= TXTBIT_SAVESELECTION; + } + if (change & ECO_VERTICAL) + { + host->props ^= TXTBIT_VERTICAL; + props_mask |= TXTBIT_VERTICAL; + } if (props_mask) ITextServices_OnTxPropertyBitsChange( host->text_srv, props_mask, host->props & props_mask ); @@ -813,6 +835,7 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r hr = ITextServices_TxSendMessage( host->text_srv, EM_SETOPTIONS, op, value, res ); *res = (*res & ~host_mask) | (new_options & host_mask); + mask &= ~ECO_AUTOWORDSELECTION; /* doesn't correspond to a window style */ style = GetWindowLongW( host->window, GWL_STYLE ); style = (style & ~mask) | (*res & mask); SetWindowLongW( host->window, GWL_STYLE, style ); @@ -926,6 +949,10 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, case EM_GETOPTIONS: hr = ITextServices_TxSendMessage( host->text_srv, EM_GETOPTIONS, 0, 0, &res ); if (host->props & TXTBIT_READONLY) res |= ECO_READONLY; + if (!(host->props & TXTBIT_HIDESELECTION)) res |= ECO_NOHIDESEL; + if (host->props & TXTBIT_SAVESELECTION) res |= ECO_SAVESEL; + if (host->props & TXTBIT_AUTOWORDSEL) res |= ECO_AUTOWORDSELECTION; + if (host->props & TXTBIT_VERTICAL) res |= ECO_VERTICAL; if (host->scrollbars & ES_AUTOHSCROLL) res |= ECO_AUTOHSCROLL; if (host->scrollbars & ES_AUTOVSCROLL) res |= ECO_AUTOVSCROLL; break; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index c017f5bae16..8fb6416d38b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -347,6 +347,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic } } + if ((mask & TXTBIT_HIDESELECTION) && !services->editor->bHaveFocus) ME_InvalidateSelection( services->editor ); + return S_OK; }

1 0