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

Alexandre Julliard : reg: Avoid non-portable Unicode character.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 495d9b5fb3ab5bab885f9fe80cd6952cc4bbca6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=495d9b5fb3ab5bab885f9fe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 5 22:58:32 2021 +0200 reg: Avoid non-portable Unicode character. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 13d5871d57e..8e4aa594503 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -301,7 +301,7 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) static void export_file_header(HANDLE hFile) { - static const WCHAR *header = L"\uFEFFWindows Registry Editor Version 5.00\r\n"; + static const WCHAR header[] = L"\xFEFFWindows Registry Editor Version 5.00\r\n"; write_file(hFile, header); }

1 0

Jacek Caban : mshtml: Add IHTMLStyleElement::onload and onerror implementation.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 85da7dba0746bfaab30a0ac9c883a03660998f67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85da7dba0746bfaab30a0ac9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 16:04:45 2021 +0200 mshtml: Add IHTMLStyleElement::onload and onerror implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyleelem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 0cb6bac0710..d3fb71dae72 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -156,29 +156,29 @@ static HRESULT WINAPI HTMLStyleElement_get_onreadystatechange(IHTMLStyleElement static HRESULT WINAPI HTMLStyleElement_put_onload(IHTMLStyleElement *iface, VARIANT v) { HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return IHTMLElement6_put_onload(&This->element.IHTMLElement6_iface, v); } static HRESULT WINAPI HTMLStyleElement_get_onload(IHTMLStyleElement *iface, VARIANT *p) { HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return IHTMLElement6_get_onload(&This->element.IHTMLElement6_iface, p); } static HRESULT WINAPI HTMLStyleElement_put_onerror(IHTMLStyleElement *iface, VARIANT v) { HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return IHTMLElement6_put_onerror(&This->element.IHTMLElement6_iface, v); } static HRESULT WINAPI HTMLStyleElement_get_onerror(IHTMLStyleElement *iface, VARIANT *p) { HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return IHTMLElement6_get_onerror(&This->element.IHTMLElement6_iface, p); } static HRESULT WINAPI HTMLStyleElement_get_styleSheet(IHTMLStyleElement *iface, IHTMLStyleSheet **p)

1 0

Jacek Caban : include: Add IHTMLStyleElement2 declaration.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: ecf9c499ec1291e3372288ea1043fec3ba8ad2d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf9c499ec1291e3372288ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 16:04:54 2021 +0200 include: Add IHTMLStyleElement2 declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index cccb1da92d7..58be0df31a9 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4487,6 +4487,9 @@ #define DISPID_IHTMLSTYLEELEMENT_DISABLED STDPROPID_XOBJ_DISABLED #define DISPID_IHTMLSTYLEELEMENT_MEDIA DISPID_STYLEELEMENT+6 +/* IHTMLStyleElement2 */ +#define DISPID_IHTMLSTYLEELEMENT2_SHEET DISPID_STYLEELEMENT+7 + /* IHTMLStorage */ #define DISPID_IHTMLSTORAGE_LENGTH DISPID_DOMSTORAGE+1 #define DISPID_IHTMLSTORAGE_REMAININGSPACE DISPID_DOMSTORAGE+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index ab8302f94eb..ba2021669c5 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -27624,6 +27624,21 @@ interface IHTMLStyleElement : IDispatch HRESULT media([retval, out] BSTR *p); } +/***************************************************************************** + * IHTMLStyleElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051072a-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyleElement2 : IDispatch +{ + [propget, id(DISPID_IHTMLSTYLEELEMENT2_SHEET)] + HRESULT sheet([out, retval] IHTMLStyleSheet **p); +} + /***************************************************************************** * DispHTMLStyleElement dispinterface */ @@ -27651,6 +27666,9 @@ methods: [propget, id(DISPID_IHTMLSTYLEELEMENT_MEDIA), displaybind, bindable] BSTR media(); + + [propget, id(DISPID_IHTMLSTYLEELEMENT2_SHEET)] + IHTMLStyleSheet *sheet(); } /***************************************************************************** @@ -27667,7 +27685,7 @@ coclass HTMLStyleElement /* [source] dispinterface HTMLStyleElementEvents2; */ WINE_HTMLELEMENT_INTERFACES; interface IHTMLStyleElement; - /* interface IHTMLStyleElement2; */ + interface IHTMLStyleElement2; } /*****************************************************************************

1 0

Jacek Caban : mshtml: Add IHTMLStyleElement2 implementation.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 5962a0ea263fbe1860d824c5dde536df263fb51b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5962a0ea263fbe1860d824c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 16:05:01 2021 +0200 mshtml: Add IHTMLStyleElement2 implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyleelem.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 11 ++++++ 3 files changed, 93 insertions(+) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index d3fb71dae72..9108cc4ca8b 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -37,6 +37,7 @@ struct HTMLStyleElement { HTMLElement element; IHTMLStyleElement IHTMLStyleElement_iface; + IHTMLStyleElement2 IHTMLStyleElement2_iface; nsIDOMHTMLStyleElement *nsstyle; IHTMLStyleSheet *style_sheet; @@ -282,6 +283,82 @@ static const IHTMLStyleElementVtbl HTMLStyleElementVtbl = { HTMLStyleElement_get_media }; +static inline HTMLStyleElement *impl_from_IHTMLStyleElement2(IHTMLStyleElement2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyleElement, IHTMLStyleElement2_iface); +} + +static HRESULT WINAPI HTMLStyleElement2_QueryInterface(IHTMLStyleElement2 *iface, + REFIID riid, void **ppv) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLStyleElement2_AddRef(IHTMLStyleElement2 *iface) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLStyleElement2_Release(IHTMLStyleElement2 *iface) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLStyleElement2_GetTypeInfoCount(IHTMLStyleElement2 *iface, UINT *pctinfo) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLStyleElement2_GetTypeInfo(IHTMLStyleElement2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI HTMLStyleElement2_GetIDsOfNames(IHTMLStyleElement2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLStyleElement2_Invoke(IHTMLStyleElement2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLStyleElement2_get_sheet(IHTMLStyleElement2 *iface, IHTMLStyleSheet **p) +{ + HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); + TRACE("(%p)->(%p)\n", This, p); + return IHTMLStyleElement_get_styleSheet(&This->IHTMLStyleElement_iface, p); +} + +static const IHTMLStyleElement2Vtbl HTMLStyleElement2Vtbl = { + HTMLStyleElement2_QueryInterface, + HTMLStyleElement2_AddRef, + HTMLStyleElement2_Release, + HTMLStyleElement2_GetTypeInfoCount, + HTMLStyleElement2_GetTypeInfo, + HTMLStyleElement2_GetIDsOfNames, + HTMLStyleElement2_Invoke, + HTMLStyleElement2_get_sheet +}; + static inline HTMLStyleElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLStyleElement, element.node); @@ -300,6 +377,9 @@ static HRESULT HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLStyleElement, riid)) { TRACE("(%p)->(IID_IHTMLStyleElement %p)\n", This, ppv); *ppv = &This->IHTMLStyleElement_iface; + }else if(IsEqualGUID(&IID_IHTMLStyleElement2, riid)) { + TRACE("(%p)->(IID_IHTMLStyleElement2 %p)\n", This, ppv); + *ppv = &This->IHTMLStyleElement2_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -382,6 +462,7 @@ HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HT return E_OUTOFMEMORY; ret->IHTMLStyleElement_iface.lpVtbl = &HTMLStyleElementVtbl; + ret->IHTMLStyleElement2_iface.lpVtbl = &HTMLStyleElement2Vtbl; ret->element.node.vtbl = &HTMLStyleElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLStyleElement_dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2a269df5e4e..d6b71b0521b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -236,6 +236,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLStyle5) \ XIID(IHTMLStyle6) \ XIID(IHTMLStyleElement) \ + XIID(IHTMLStyleElement2) \ XIID(IHTMLStyleSheet) \ XIID(IHTMLStyleSheetRule) \ XIID(IHTMLStyleSheetRulesCollection) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1253e9cdea8..67d79780907 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10100,6 +10100,7 @@ static void test_null_write(IHTMLDocument2 *doc) static void test_create_stylesheet(IHTMLDocument2 *doc) { IHTMLStyleSheet *stylesheet, *stylesheet2; + IHTMLStyleElement2 *style_elem2; IHTMLStyleElement *style_elem; IHTMLElement *doc_elem, *elem; HRESULT hres; @@ -10142,8 +10143,18 @@ static void test_create_stylesheet(IHTMLDocument2 *doc) ok(hres == S_OK, "get_styleSheet failed: %08x\n", hres); ok(stylesheet2 != NULL, "stylesheet2 == NULL\n"); ok(iface_cmp((IUnknown*)stylesheet, (IUnknown*)stylesheet2), "stylesheet != stylesheet2\n"); + IHTMLStyleSheet_Release(stylesheet2); + + hres = IHTMLStyleElement_QueryInterface(style_elem, &IID_IHTMLStyleElement2, (void**)&style_elem2); + ok(hres == S_OK, "Could not get IHTMLStyleElement2: %08x\n", hres); + hres = IHTMLStyleElement2_get_sheet(style_elem2, &stylesheet2); + ok(hres == S_OK, "get_styleSheet failed: %08x\n", hres); + ok(stylesheet2 != NULL, "stylesheet2 == NULL\n"); + ok(iface_cmp((IUnknown*)stylesheet, (IUnknown*)stylesheet2), "stylesheet != stylesheet2\n"); IHTMLStyleSheet_Release(stylesheet2); + + IHTMLStyleElement2_Release(style_elem2); IHTMLStyleSheet_Release(stylesheet); IHTMLStyleElement_Release(style_elem);

1 0

Jacek Caban : mshtml: Don't expose readyState property to elements in IE11 mode.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: bb1ff3372010befa9a2d1197a69aa6dbaf4229d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb1ff3372010befa9a2d1197… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 16:05:13 2021 +0200 mshtml: Don't expose readyState property to elements in IE11 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 81993db224d..930568ab2c0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6301,6 +6301,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const dispex_hook_t elem2_ie11_hooks[] = { {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, + {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, {DISPID_UNKNOWN} }; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 8755f4ab6ec..f02840a1ff3 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -32,6 +32,7 @@ sync_test("elem_props", function() { var v = document.documentMode; test_exposed("doScroll", v < 11); + test_exposed("readyState", v < 11); test_exposed("querySelectorAll", v >= 8); test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9);

1 0

Jacek Caban : mshtml: Expose IHTMLStyleElement2 to scripts.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 4cd257d54d7ee11c7b1e7ce89502ba3c4d11c513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cd257d54d7ee11c7b1e7ce8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 16:05:19 2021 +0200 mshtml: Expose IHTMLStyleElement2 to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyleelem.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 9 +++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 9108cc4ca8b..538e79f0b5e 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -30,6 +30,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "mshtmdid.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -420,6 +421,23 @@ static void HTMLStyleElement_unlink(HTMLDOMNode *iface) } } +static void HTMLStyleElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + static const dispex_hook_t ie11_hooks[] = { + {DISPID_IHTMLSTYLEELEMENT_READYSTATE, NULL}, + {DISPID_IHTMLSTYLEELEMENT_STYLESHEET, NULL}, + {DISPID_UNKNOWN} + }; + + HTMLElement_init_dispex_info(info, mode); + + dispex_info_add_interface(info, IHTMLStyleElement_tid, + mode >= COMPAT_MODE_IE11 ? ie11_hooks : NULL); + + if(mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLStyleElement2_tid, NULL); +} + static const NodeImplVtbl HTMLStyleElementImplVtbl = { &CLSID_HTMLStyleElement, HTMLStyleElement_QI, @@ -442,14 +460,13 @@ static const NodeImplVtbl HTMLStyleElementImplVtbl = { static const tid_t HTMLStyleElement_iface_tids[] = { HTMLELEMENT_TIDS, - IHTMLStyleElement_tid, 0 }; static dispex_static_data_t HTMLStyleElement_dispex = { NULL, DispHTMLStyleElement_tid, HTMLStyleElement_iface_tids, - HTMLElement_init_dispex_info + HTMLStyleElement_init_dispex_info }; HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTMLElement **elem) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index f02840a1ff3..a8bcc611083 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -45,6 +45,15 @@ sync_test("elem_props", function() { test_exposed("dispatchEvent", v >= 9); test_exposed("msSetPointerCapture", v >= 10); if (v >= 9) test_exposed("spellcheck", v >= 10); + + elem = document.createElement("style"); + test_exposed("media", true); + test_exposed("type", true); + test_exposed("disabled", true); + test_exposed("media", true); + test_exposed("sheet", v >= 9); + test_exposed("readyState", v < 11); + test_exposed("styleSheet", v < 11); }); sync_test("doc_props", function() {

1 0

Jacek Caban : include: Add IHTMLStyleSheet4 and IHTMLCSSRule declarations.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 73276d797c1543542e66270d76ec5206e3f2d52f URL: https://source.winehq.org/git/wine.git/?a=commit;h=73276d797c1543542e66270d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 16:05:27 2021 +0200 include: Add IHTMLStyleSheet4 and IHTMLCSSRule declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 18 ++++++++++ include/mshtml.idl | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 58be0df31a9..28d114da81d 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -78,6 +78,7 @@ #define DISPID_SCRIPT DISPID_NORMAL_FIRST #define DISPID_STYLESHEET DISPID_NORMAL_FIRST #define DISPID_STYLERULE DISPID_NORMAL_FIRST +#define DISPID_BASE_STYLERULE (DISPID_STYLERULE+100) #define DISPID_STYLEPAGE DISPID_NORMAL_FIRST #define DISPID_STYLESHEETS_COL DISPID_NORMAL_FIRST #define DISPID_STYLERULES_COL DISPID_NORMAL_FIRST @@ -3553,6 +3554,17 @@ #define DISPID_IHTMLSTYLESHEET2_PAGES (DISPID_STYLESHEET+16) #define DISPID_IHTMLSTYLESHEET2_ADDPAGERULE (DISPID_STYLESHEET+17) +/* IHTMLStyleSheet4 */ +#define DISPID_IHTMLSTYLESHEET4_IE9_TYPE (DISPID_IE8_STYLE+3) +#define DISPID_IHTMLSTYLESHEET4_IE9_HREF (DISPID_IE8_STYLE+4) +#define DISPID_IHTMLSTYLESHEET4_IE9_TITLE (DISPID_IE8_STYLE+5) +#define DISPID_IHTMLSTYLESHEET4_OWNERNODE (DISPID_IE8_STYLE+6) +#define DISPID_IHTMLSTYLESHEET4_OWNERRULE (DISPID_IE8_STYLE+7) +#define DISPID_IHTMLSTYLESHEET4_CSSRULES (DISPID_IE8_STYLE+8) +#define DISPID_IHTMLSTYLESHEET4_IE9_MEDIA (DISPID_IE8_STYLE+9) +#define DISPID_IHTMLSTYLESHEET4_INSERTRULE (DISPID_IE8_STYLE+10) +#define DISPID_IHTMLSTYLESHEET4_DELETERULE (DISPID_IE8_STYLE+11) + /* IHTMLStyleSheetRulesCollection */ #define DISPID_IHTMLSTYLESHEETRULESCOLLECTION_LENGTH (DISPID_STYLERULES_COL+1) #define DISPID_IHTMLSTYLESHEETRULESCOLLECTION_ITEM DISPID_VALUE @@ -3655,6 +3667,12 @@ #define DISPID_IHTMLRULESTYLE_TEXTALIGN STDPROPID_XOBJ_BLOCKALIGN #define DISPID_IHTMLRULESTYLE_BACKGROUNDCOLOR DISPID_BACKCOLOR +/* IHTMLCSSRule */ +#define DISPID_IHTMLCSSRULE_TYPE DISPID_BASE_STYLERULE+1 +#define DISPID_IHTMLCSSRULE_CSSTEXT DISPID_BASE_STYLERULE+2 +#define DISPID_IHTMLCSSRULE_PARENTRULE DISPID_BASE_STYLERULE+3 +#define DISPID_IHTMLCSSRULE_PARENTSTYLESHEET DISPID_BASE_STYLERULE+4 + /* IHTMLDOMNode */ #define DISPID_IHTMLDOMNODE_NODETYPE DISPID_ELEMENT+46 #define DISPID_IHTMLDOMNODE_PARENTNODE DISPID_ELEMENT+47 diff --git a/include/mshtml.idl b/include/mshtml.idl index ba2021669c5..ef496b840ea 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -424,6 +424,7 @@ interface IHTMLChangeLog; interface IHTMLChangeSink; interface ISVGSVGElement; interface IHTMLDOMRange; +interface IHTMLStyleSheet; /***************************************************************************** * IHTMLCSSStyleDeclaration interface @@ -5766,6 +5767,33 @@ interface IHTMLRuleStyle : IDispatch [retval, out] VARIANT_BOOL *pfSuccess); } +/***************************************************************************** + * IHTMLCSSRule interface + */ +[ + odl, + oleautomation, + dual, + uuid(305106e9-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLCSSRule : IDispatch +{ + [propget, id(DISPID_IHTMLCSSRULE_TYPE)] + HRESULT type([out, retval] USHORT *p); + + [propput, id(DISPID_IHTMLCSSRULE_CSSTEXT)] + HRESULT cssText([in] BSTR v); + + [propget, id(DISPID_IHTMLCSSRULE_CSSTEXT)] + HRESULT cssText([out, retval] BSTR *p); + + [propget, id(DISPID_IHTMLCSSRULE_PARENTRULE)] + HRESULT parentRule([out, retval] IHTMLCSSRule **p); + + [propget, id(DISPID_IHTMLCSSRULE_PARENTSTYLESHEET)] + HRESULT parentStyleSheet([out, retval] IHTMLStyleSheet **p); +} + /***************************************************************************** * DispHTMLStyle dispinterface */ @@ -12023,6 +12051,48 @@ interface IHTMLStyleSheet2 : IDispatch [retval, out] LONG *plNewIndex); } +/***************************************************************************** + * IHTMLStyleSheet4 interface + */ +[ + odl, + oleautomation, + dual, + uuid(305106f4-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyleSheet4 : IDispatch +{ + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_TYPE)] + HRESULT type([out, retval] BSTR *p); + + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_HREF)] + HRESULT href([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_TITLE)] + HRESULT title([out, retval] BSTR *p); + + [propget, id(DISPID_IHTMLSTYLESHEET4_OWNERNODE)] + HRESULT ownerNode([out, retval] IHTMLElement **p); + + [propget, id(DISPID_IHTMLSTYLESHEET4_OWNERRULE)] + HRESULT ownerRule([out, retval] IHTMLCSSRule **p); + + [propget, id(DISPID_IHTMLSTYLESHEET4_CSSRULES)] + HRESULT cssRules([out, retval] IHTMLStyleSheetRulesCollection **p); + + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_MEDIA)] + HRESULT media([out, retval] VARIANT *p); + + [id(DISPID_IHTMLSTYLESHEET4_INSERTRULE)] + HRESULT insertRule( + [in] BSTR bstrRule, + [in, defaultvalue(-1)] long lIndex, + [out, retval] long *plNewIndex); + + [id(DISPID_IHTMLSTYLESHEET4_DELETERULE)] + HRESULT deleteRule([in, defaultvalue(-1)] long lIndex); +} + [ hidden, uuid(3050f58d-98b5-11cf-bb82-00aa00bdce0b) @@ -12107,6 +12177,35 @@ methods: [in] BSTR bstrSelector, [in] BSTR bstrStyle, [defaultvalue(-1), in] LONG lIndex); + + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_TYPE)] + BSTR ie9_type(); + + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_HREF)] + VARIANT ie9_href(); + + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_TITLE)] + BSTR ie9_title(); + + [propget, id(DISPID_IHTMLSTYLESHEET4_OWNERNODE)] + IHTMLElement *ownerNode(); + + [propget, id(DISPID_IHTMLSTYLESHEET4_OWNERRULE)] + IHTMLCSSRule *ownerRule(); + + [propget, id(DISPID_IHTMLSTYLESHEET4_CSSRULES)] + IHTMLStyleSheetRulesCollection *cssRules(); + + [propget, id(DISPID_IHTMLSTYLESHEET4_IE9_MEDIA)] + VARIANT ie9_media(); + + [id(DISPID_IHTMLSTYLESHEET4_INSERTRULE)] + long insertRule( + [in] BSTR bstrRule, + [in, defaultvalue(-1)] long lIndex); + + [id(DISPID_IHTMLSTYLESHEET4_DELETERULE)] + void deleteRule([in, defaultvalue(-1)] long lIndex); } [ @@ -12118,6 +12217,7 @@ coclass HTMLStyleSheet [default] dispinterface DispHTMLStyleSheet; interface IHTMLStyleSheet; interface IHTMLStyleSheet2; + interface IHTMLStyleSheet4; } /*****************************************************************************

1 0

Jacek Caban : jscript: Use quiet NaNs in jsval.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: d9a4392d6bbd50b0a9690aa20fe7baa199f38d96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9a4392d6bbd50b0a9690aa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 5 20:40:42 2021 +0200 jscript: Use quiet NaNs in jsval. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50845 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsval.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 963f59f6a08..9f451b12831 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -35,8 +35,8 @@ #endif #ifdef JSVAL_DOUBLE_LAYOUT_PTR32 -/* NaN exponent and our 0x80000 marker */ -#define JSV_VAL(x) (0x7ff80000|x) +/* NaN exponent, quiet bit 0x80000 and our 0x10000 marker */ +#define JSV_VAL(x) (0x7ff90000|x) #else #define JSV_VAL(x) x #endif @@ -150,10 +150,10 @@ static inline jsval_t jsval_number(double n) if((ret.u.s.tag & 0x7ff00000) == 0x7ff00000) { /* isinf */ if(ret.u.s.tag & 0xfffff) { - ret.u.s.tag = 0x7ff00000; + ret.u.s.tag = 0x7ff80000; ret.u.s.u.as_uintptr = ~0; }else if(ret.u.s.u.as_uintptr) { - ret.u.s.tag = 0x7ff00000; + ret.u.s.tag = 0x7ff80000; } } #else @@ -191,7 +191,7 @@ static inline BOOL is_string(jsval_t v) static inline BOOL is_number(jsval_t v) { #ifdef JSVAL_DOUBLE_LAYOUT_PTR32 - return (v.u.s.tag & 0x7ff80000) != 0x7ff80000; + return (v.u.s.tag & 0x7ff10000) != 0x7ff10000; #else return v.type == JSV_NUMBER; #endif

1 0

Gabriel Ivăncescu : conhost: Wrap around immediately if ENABLE_VIRTUAL_TERMINAL_PROCESSING is not set.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 85c4adc80bd5744b10129cacf94fa06969a002ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c4adc80bd5744b10129cac… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 5 16:24:32 2021 +0200 conhost: Wrap around immediately if ENABLE_VIRTUAL_TERMINAL_PROCESSING is not set. 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> --- programs/conhost/conhost.c | 11 +++++- programs/conhost/tests/tty.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 39544fb8a9d..07d90a3a1ae 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1948,7 +1948,16 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR if (screen_buffer->cursor_x == screen_buffer->width) { - if (screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT) screen_buffer->cursor_x--; + if (screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT) + { + if (!(screen_buffer->mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING)) + { + screen_buffer->cursor_x = 0; + if (++screen_buffer->cursor_y == screen_buffer->height) + new_line( screen_buffer, &update_rect ); + } + else screen_buffer->cursor_x--; + } else screen_buffer->cursor_x = update_rect.left; } diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 7cc37fa7fe1..c60dd253dfe 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -149,6 +149,7 @@ enum req_type REQ_CREATE_SCREEN_BUFFER, REQ_FILL_CHAR, REQ_GET_INPUT, + REQ_GET_SB_INFO, REQ_READ_CONSOLE, REQ_READ_CONSOLE_A, REQ_READ_CONSOLE_FILE, @@ -551,8 +552,30 @@ static void expect_char_key_(unsigned int line, WCHAR ch) expect_key_pressed_(line, ch, ch, vk, ctrl); } +#define test_cursor_pos(a,b) _test_cursor_pos(__LINE__,a,b) +static void _test_cursor_pos(unsigned line, int expect_x, int expect_y) +{ + struct pseudoconsole_req req = { REQ_GET_SB_INFO }; + CONSOLE_SCREEN_BUFFER_INFO info; + DWORD read; + BOOL ret; + + ret = WriteFile(child_pipe, &req, sizeof(req), &read, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + + ret = ReadFile(child_pipe, &info, sizeof(info), &read, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + + ok_(__FILE__,line)(info.dwCursorPosition.X == expect_x, "dwCursorPosition.X = %u, expected %u\n", + info.dwCursorPosition.X, expect_x); + ok_(__FILE__,line)(info.dwCursorPosition.Y == expect_y, "dwCursorPosition.Y = %u, expected %u\n", + info.dwCursorPosition.Y, expect_y); +} + static void test_write_console(void) { + child_set_output_mode(ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING); + child_string_request(REQ_WRITE_CONSOLE, L"abc"); skip_hide_cursor(); expect_output_sequence("abc"); @@ -761,6 +784,55 @@ static void test_write_console(void) expect_empty_output(); child_set_output_mode(ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + + child_set_cursor(28, 20); + skip_hide_cursor(); + expect_output_sequence("\x1b[21;29H"); /* set cursor */ + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"ab"); + skip_hide_cursor(); + expect_output_sequence("ab"); + expect_output_sequence("\r\n"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + test_cursor_pos(0, 21); + + child_string_request(REQ_WRITE_CONSOLE, L"c"); + skip_hide_cursor(); + expect_output_sequence("c"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + test_cursor_pos(1, 21); + + child_set_cursor(28, 22); + skip_hide_cursor(); + expect_output_sequence("\x1b[23;29H"); /* set cursor */ + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"x"); + skip_hide_cursor(); + expect_output_sequence("x"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + test_cursor_pos(29, 22); + + child_string_request(REQ_WRITE_CONSOLE, L"y"); + skip_hide_cursor(); + expect_output_sequence("y"); + expect_output_sequence("\r\n"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + test_cursor_pos(0, 23); + + child_string_request(REQ_WRITE_CONSOLE, L"z"); + skip_hide_cursor(); + expect_output_sequence("z"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + test_cursor_pos(1, 23); } static void test_tty_output(void) @@ -1300,6 +1372,16 @@ static void child_process(HANDLE pipe) break; } + case REQ_GET_SB_INFO: + { + CONSOLE_SCREEN_BUFFER_INFO info; + ret = GetConsoleScreenBufferInfo(output, &info); + ok(ret, "GetConsoleScreenBufferInfo failed: %u\n", GetLastError()); + ret = WriteFile(pipe, &info, sizeof(info), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + break; + } + case REQ_READ_CONSOLE: ret = ReadConsoleW(input, buf, req->u.size, &count, NULL ); ok(ret, "ReadConsoleW failed: %u\n", GetLastError());

1 0

Gabriel Ivăncescu : conhost: Fix line wrapping around when ENABLE_VIRTUAL_TERMINAL_PROCESSING is set.
by Alexandre Julliard 05 Apr '21

05 Apr '21

Module: wine Branch: master Commit: 8d076bc5e46cc11ec94db631e7c608f62d75cee2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d076bc5e46cc11ec94db631… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Apr 5 16:24:43 2021 +0200 conhost: Fix line wrapping around when ENABLE_VIRTUAL_TERMINAL_PROCESSING is set. Remember the fact we completed the entire line but normalize the cursor otherwise. A newline is delayed so it wraps when writing a new character if the cursor is outside the width. 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> --- programs/conhost/conhost.c | 36 +++++++++++++------- programs/conhost/conhost.h | 5 +++ programs/conhost/tests/tty.c | 80 +++++++++++++++++++++++++++++++++++++++++--- programs/conhost/window.c | 6 ++-- 4 files changed, 107 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d076bc5e46cc11ec94d…

1 0