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

Jacek Caban : jscript: Use quiet NaNs in jsval.
by Alexandre Julliard April 5, 2021

April 5, 2021

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: Fix line wrapping around when ENABLE_VIRTUAL_TERMINAL_PROCESSING is set.
by Alexandre Julliard April 5, 2021

April 5, 2021

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

Gabriel Ivăncescu : conhost: Wrap around immediately if ENABLE_VIRTUAL_TERMINAL_PROCESSING is not set.
by Alexandre Julliard April 5, 2021

April 5, 2021

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

Jacek Caban : include: Add IHTMLStyleSheet4 and IHTMLCSSRule declarations.
by Alexandre Julliard April 5, 2021

April 5, 2021

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 : mshtml: Add IHTMLStyleElement2 implementation.
by Alexandre Julliard April 5, 2021

April 5, 2021

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

Hugh McMaster : reg: Only call get_long_key() when operations require it.
by Alexandre Julliard April 5, 2021

April 5, 2021

Module: wine Branch: master Commit: 07fdd5036ca40fd4f0475583b6e410192576d804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07fdd5036ca40fd4f0475583… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 5 23:24:11 2021 +1000 reg: Only call get_long_key() when operations require it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 4 ++-- programs/reg/delete.c | 4 +++- programs/reg/export.c | 8 +++++--- programs/reg/query.c | 4 +++- programs/reg/reg.c | 6 ++---- programs/reg/reg.h | 3 ++- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index f259f0a4100..d94789ad484 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -213,11 +213,11 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, int reg_add(int argc, WCHAR *argvW[]) { HKEY root; - WCHAR *path, *key_name, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; + WCHAR *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, force = FALSE; int i; - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 3; i < argc; i++) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index b23b14e8dab..626fcf3b341 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -113,7 +113,7 @@ int reg_delete(int argc, WCHAR *argvW[]) BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; int i; - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 3; i < argc; i++) @@ -158,6 +158,8 @@ int reg_delete(int argc, WCHAR *argvW[]) if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) goto invalid; + key_name = get_long_key(root, path); + return run_delete(root, path, key_name, value_name, value_empty, value_all, force); invalid: diff --git a/programs/reg/export.c b/programs/reg/export.c index 5d55eaad407..13d5871d57e 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -347,14 +347,14 @@ static HANDLE get_file_handle(WCHAR *filename, BOOL overwrite_file) int reg_export(int argc, WCHAR *argvW[]) { HKEY root, hkey; - WCHAR *path, *long_key; + WCHAR *path, *key_name; BOOL overwrite_file = FALSE; HANDLE hFile; int i, ret; if (argc < 4) goto invalid; - if (!parse_registry_key(argvW[2], &root, &path, &long_key)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 4; i < argc; i++) @@ -378,9 +378,11 @@ int reg_export(int argc, WCHAR *argvW[]) return 1; } + key_name = get_long_key(root, path); + hFile = get_file_handle(argvW[3], overwrite_file); export_file_header(hFile); - ret = export_registry_data(hFile, hkey, long_key); + ret = export_registry_data(hFile, hkey, key_name); export_newline(hFile); CloseHandle(hFile); diff --git a/programs/reg/query.c b/programs/reg/query.c index cc8f264e780..76f12b4a2d3 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -329,7 +329,7 @@ int reg_query(int argc, WCHAR *argvW[]) BOOL value_empty = FALSE, recurse = FALSE; int i; - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + if (!parse_registry_key(argvW[2], &root, &path)) return 1; for (i = 3; i < argc; i++) @@ -368,6 +368,8 @@ int reg_query(int argc, WCHAR *argvW[]) if (value_name && value_empty) goto invalid; + key_name = get_long_key(root, path); + return run_query(root, path, key_name, value_name, value_empty, recurse); invalid: diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6b337f5d415..3ffc5fe3d8f 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -203,7 +203,7 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD return subkey_path; } -static WCHAR *get_long_key(HKEY root, WCHAR *path) +WCHAR *get_long_key(HKEY root, WCHAR *path) { DWORD i, array_size = ARRAY_SIZE(root_rels), len; WCHAR *long_key; @@ -229,7 +229,7 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) return long_key; } -BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) { if (!sane_path(key)) return FALSE; @@ -245,8 +245,6 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long return FALSE; } - *long_key = get_long_key(*root, *path); - return TRUE; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index c7719a6e4f0..3fc9e392d45 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -39,7 +39,8 @@ void WINAPIV output_string(const WCHAR *fmt, ...); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); HKEY path_get_rootkey(const WCHAR *path); WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len); -BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); +WCHAR *get_long_key(HKEY root, WCHAR *path); +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path); BOOL is_char(const WCHAR s, const WCHAR c); BOOL is_switch(const WCHAR *s, const WCHAR c);

1 0

Zebediah Figura : ntoskrnl/tests: Use a more descriptive name for the netio test driver.
by Alexandre Julliard April 5, 2021

April 5, 2021

Module: wine Branch: master Commit: b1eba2266a30b3dda239f1de8723074a89e9a974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1eba2266a30b3dda239f1de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:49 2021 -0500 ntoskrnl/tests: Use a more descriptive name for the netio test driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 8 ++++---- dlls/ntoskrnl.exe/tests/{driver4.c => driver_netio.c} | 6 +++--- dlls/ntoskrnl.exe/tests/{driver4.spec => driver_netio.spec} | 0 dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index c799dfcaf77..d911879ff99 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -7,8 +7,8 @@ driver2_IMPORTS = winecrt0 ntoskrnl driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver3_IMPORTS = winecrt0 ntoskrnl driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver4_IMPORTS = winecrt0 ntoskrnl netio -driver4_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native @@ -19,8 +19,8 @@ SOURCES = \ driver2.spec \ driver3.c \ driver3.spec \ - driver4.c \ - driver4.spec \ + driver_netio.c \ + driver_netio.spec \ driver_pnp.c \ driver_pnp.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver_netio.c similarity index 99% rename from dlls/ntoskrnl.exe/tests/driver4.c rename to dlls/ntoskrnl.exe/tests/driver_netio.c index d2a053e6b7a..3d783dbef0d 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -1,5 +1,5 @@ /* - * ntoskrnl.exe testing framework + * Unit tests for netio.sys (kernel sockets) * * Copyright 2020 Paul Gofman for CodeWeavers * @@ -39,8 +39,8 @@ static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *device_obj; -static const WCHAR driver_link[] = L"\\DosDevices\\WineTestDriver4"; -static const WCHAR device_name[] = L"\\Device\\WineTestDriver4"; +static const WCHAR driver_link[] = L"\\DosDevices\\winetest_netio"; +static const WCHAR device_name[] = L"\\Device\\winetest_netio"; static WSK_CLIENT_NPI client_npi; static WSK_REGISTRATION registration; diff --git a/dlls/ntoskrnl.exe/tests/driver4.spec b/dlls/ntoskrnl.exe/tests/driver_netio.spec similarity index 100% rename from dlls/ntoskrnl.exe/tests/driver4.spec rename to dlls/ntoskrnl.exe/tests/driver_netio.spec diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 18f5189e382..4667915f621 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -899,14 +899,14 @@ static DWORD WINAPI wsk_test_thread(void *parameter) return TRUE; } -static void test_driver4(struct testsign_context *ctx) +static void test_driver_netio(struct testsign_context *ctx) { WCHAR filename[MAX_PATH]; SC_HANDLE service; HANDLE hthread; BOOL ret; - if (!(service = load_driver(ctx, filename, L"driver4.dll", L"WineTestDriver4"))) + if (!(service = load_driver(ctx, filename, L"driver_netio.dll", L"winetest_netio"))) return; if (!start_driver(service, TRUE)) @@ -915,7 +915,7 @@ static void test_driver4(struct testsign_context *ctx) return; } - device = CreateFileA("\\\\.\\WineTestDriver4", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + device = CreateFileA("\\\\.\\winetest_netio", 0, 0, NULL, OPEN_EXISTING, 0, NULL); ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); hthread = CreateThread(NULL, 0, wsk_test_thread, NULL, 0, NULL); @@ -1260,8 +1260,8 @@ START_TEST(ntoskrnl) ok(ret, "DeleteFile failed: %u\n", GetLastError()); test_driver3(&ctx); - subtest("driver4"); - test_driver4(&ctx); + subtest("driver_netio"); + test_driver_netio(&ctx); test_pnp_driver(&ctx);

1 0

Zebediah Figura : ntoskrnl/tests: Open the test output file using a hardcoded path.
by Alexandre Julliard April 5, 2021

April 5, 2021

Module: wine Branch: master Commit: cf1f8c6718ead3f3dd4d6ff9f4dce5232e596f67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf1f8c6718ead3f3dd4d6ff9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:47 2021 -0500 ntoskrnl/tests: Open the test output file using a hardcoded path. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 7 ++++--- dlls/ntoskrnl.exe/tests/driver.h | 1 - dlls/ntoskrnl.exe/tests/driver4.c | 7 ++++--- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 24 ++++++++---------------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index ec2d8d33900..179d2d5e02d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2126,13 +2126,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st return STATUS_BUFFER_TOO_SMALL; attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, test_input->path); + RtlInitUnicodeString(&pathU, L"\\??\\C:\\windows\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; attr.ObjectName = &pathU; - attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ + ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); pExEventObjectType = get_proc_address("ExEventObjectType"); ok(!!pExEventObjectType, "ExEventObjectType not found\n"); diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 58a92d4838e..d55dd95cf20 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -46,7 +46,6 @@ struct test_input DWORD process_id; SIZE_T teststr_offset; ULONG64 *modified_value; - WCHAR path[1]; }; static inline char *drv_strrchr( const char *str, char ch ) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 45ea90260a8..a29ba3b55ab 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -487,13 +487,14 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st return STATUS_BUFFER_TOO_SMALL; attr.Length = sizeof(attr); - RtlInitUnicodeString(&pathU, test_input->path); + RtlInitUnicodeString(&pathU, L"\\??\\C:\\winetest_ntoskrnl_okfile"); running_under_wine = test_input->running_under_wine; winetest_debug = test_input->winetest_debug; winetest_report_success = test_input->winetest_report_success; attr.ObjectName = &pathU; - attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ - ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ + ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); netio_init(); test_wsk_get_address_info(); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 73f96789f06..1987019a6c5 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -367,22 +367,20 @@ static ULONG64 modified_value; static void main_test(void) { - WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; - DWORD len, written, read; - UNICODE_STRING pathU; + DWORD written, read; LONG new_failures; char buffer[512]; HANDLE okfile; BOOL res; /* Create a temporary file that the driver will write ok/trace output to. */ - GetTempPathW(MAX_PATH, temppathW); - GetTempFileNameW(temppathW, L"dok", 0, pathW); - pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); - len = pathU.Length + sizeof(WCHAR); - test_input = heap_alloc( offsetof( struct test_input, path[len / sizeof(WCHAR)]) ); + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + + test_input = heap_alloc( sizeof(*test_input) ); test_input->running_under_wine = !strcmp(winetest_platform, "wine"); test_input->winetest_report_success = winetest_report_success; test_input->winetest_debug = winetest_debug; @@ -391,16 +389,11 @@ static void main_test(void) test_input->modified_value = &modified_value; modified_value = 0; - memcpy(test_input->path, pathU.Buffer, len); - res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, - offsetof( struct test_input, path[len / sizeof(WCHAR)]), + res = DeviceIoControl(device, IOCTL_WINETEST_MAIN_TEST, test_input, sizeof(*test_input), &new_failures, sizeof(new_failures), &written, NULL); ok(res, "DeviceIoControl failed: %u\n", GetLastError()); ok(written == sizeof(new_failures), "got size %x\n", written); - okfile = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(okfile != INVALID_HANDLE_VALUE, "failed to create %s: %u\n", wine_dbgstr_w(pathW), GetLastError()); - /* Print the ok/trace output and then add to our failure count. */ do { ReadFile(okfile, buffer, sizeof(buffer), &read, NULL); @@ -408,10 +401,9 @@ static void main_test(void) } while (read == sizeof(buffer)); winetest_add_failures(new_failures); - pRtlFreeUnicodeString(&pathU); heap_free(test_input); CloseHandle(okfile); - DeleteFileW(pathW); + DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); } static void test_basic_ioctl(void)

1 0

Alexandre Julliard : reg: Avoid non-portable Unicode character.
by Alexandre Julliard April 5, 2021

April 5, 2021

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

Zebediah Figura : ntoskrnl/tests: Remove some duplicate tests from the netio driver.
by Alexandre Julliard April 5, 2021

April 5, 2021

Module: wine Branch: master Commit: 3d3c411d0567d567579c731c090946e061cc2656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3c411d0567d567579c731c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:48 2021 -0500 ntoskrnl/tests: Remove some duplicate tests from the netio driver. These are already tested in the main driver; there's no need to test them again. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver4.c | 68 +++----------------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 --- 2 files changed, 4 insertions(+), 68 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index a29ba3b55ab..d2a053e6b7a 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -37,19 +37,10 @@ #include "utils.h" static DRIVER_OBJECT *driver_obj; -static DEVICE_OBJECT *lower_device, *upper_device; - -static unsigned int create_count, close_count; +static DEVICE_OBJECT *device_obj; static const WCHAR driver_link[] = L"\\DosDevices\\WineTestDriver4"; static const WCHAR device_name[] = L"\\Device\\WineTestDriver4"; -static const WCHAR upper_name[] = L"\\Device\\WineTestUpper4"; - -static FILE_OBJECT *last_created_file; -static void *create_caller_thread; -static PETHREAD create_irp_thread; - -static POBJECT_TYPE *pIoDriverObjectType; static WSK_CLIENT_NPI client_npi; static WSK_REGISTRATION registration; @@ -525,10 +516,6 @@ static NTSTATUS WINAPI driver_iocontrol(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_MAIN_TEST: status = main_test(device, irp, stack); break; - case IOCTL_WINETEST_DETACH: - IoDetachDevice(lower_device); - status = STATUS_SUCCESS; - break; default: break; } @@ -543,17 +530,6 @@ static NTSTATUS WINAPI driver_iocontrol(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_create(DEVICE_OBJECT *device, IRP *irp) { - IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); - - last_created_file = irpsp->FileObject; - ++create_count; - if (context) - *context = create_count; - irpsp->FileObject->FsContext = context; - create_caller_thread = KeGetCurrentThread(); - create_irp_thread = irp->Tail.Overlay.Thread; - irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -561,13 +537,8 @@ static NTSTATUS WINAPI driver_create(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_close(DEVICE_OBJECT *device, IRP *irp) { - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); - netio_uninit(); - ++close_count; - if (stack->FileObject->FsContext) - ExFreePool(stack->FileObject->FsContext); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -582,17 +553,13 @@ static VOID WINAPI driver_unload(DRIVER_OBJECT *driver) RtlInitUnicodeString(&linkW, driver_link); IoDeleteSymbolicLink(&linkW); - IoDeleteDevice(upper_device); - IoDeleteDevice(lower_device); + IoDeleteDevice(device_obj); } NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { - static const WCHAR IoDriverObjectTypeW[] = L"IoDriverObjectType"; - static const WCHAR driver_nameW[] = L"\\Driver\\WineTestDriver4"; UNICODE_STRING nameW, linkW; NTSTATUS status; - void *obj; DbgPrint("Loading driver.\n"); @@ -603,41 +570,14 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_iocontrol; driver->MajorFunction[IRP_MJ_CLOSE] = driver_close; - RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); - pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); - - RtlInitUnicodeString(&nameW, driver_nameW); - if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) - return status; - if (obj != driver) - { - ObDereferenceObject(obj); - return STATUS_UNSUCCESSFUL; - } - ObDereferenceObject(obj); - RtlInitUnicodeString(&nameW, device_name); RtlInitUnicodeString(&linkW, driver_link); if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) + FILE_DEVICE_SECURE_OPEN, FALSE, &device_obj))) { status = IoCreateSymbolicLink(&linkW, &nameW); - lower_device->Flags &= ~DO_DEVICE_INITIALIZING; - } - - if (!status) - { - RtlInitUnicodeString(&nameW, upper_name); - - status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); - } - - if (!status) - { - IoAttachDeviceToDeviceStack(upper_device, lower_device); - upper_device->Flags &= ~DO_DEVICE_INITIALIZING; + device_obj->Flags &= ~DO_DEVICE_INITIALIZING; } return status; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 1987019a6c5..18f5189e382 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -904,7 +904,6 @@ static void test_driver4(struct testsign_context *ctx) WCHAR filename[MAX_PATH]; SC_HANDLE service; HANDLE hthread; - DWORD written; BOOL ret; if (!(service = load_driver(ctx, filename, L"driver4.dll", L"WineTestDriver4"))) @@ -923,9 +922,6 @@ static void test_driver4(struct testsign_context *ctx) main_test(); WaitForSingleObject(hthread, INFINITE); - ret = DeviceIoControl(device, IOCTL_WINETEST_DETACH, NULL, 0, NULL, 0, &written, NULL); - ok(ret, "DeviceIoControl failed: %u\n", GetLastError()); - CloseHandle(device); unload_driver(service);

1 0