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

Francois Gouget : testbot/LogUtils: Detect and report the dll version errors.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: tools Branch: master Commit: f3833ecc460d7ab17dd2051b14857faf0c106a0a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f3833ecc460d7ab17dd2051… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 16:24:58 2021 +0200 testbot/LogUtils: Detect and report the dll version errors. There should be no native dll while running the tests in Wine. Also all expected CreateProcess() errors have explanations. So report the others as failures. This also relaxes the GetReportLineCategory() regexps a bit to match the new 'version error' lines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48062 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index dde4104..e6e89f5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -325,8 +325,8 @@ sub GetReportLineCategory($) { return "skip"; } - if ($Line =~ /^ \w+=dll is (?:missing|native|a stub)/ or - $Line =~ /^ \w+=(?:load error|version error \d+|version not (?:found|present))$/ or + if ($Line =~ /^ \w+=dll is (?:missing|a stub)/ or + $Line =~ /^ \w+=(?:version error \d+|version not (?:found|present))/ or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or $Line =~ /: this is the last test seen before the exception/) { @@ -538,6 +538,7 @@ sub ParseWineTestReport($$$) } my $LineNo = 0; + my $InDlls = 0; my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -547,7 +548,21 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+)%) + if ($InDlls == 0 and $Line =~ /^Dll info:$/) + { + $InDlls = 1; + } + elsif ($InDlls == 1 and + $Line =~ /^\s+\S+=(?:dll is native|load error \d+)$/) + { + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + $Cur->{LineFailures}++; + } + elsif ($Line =~ /^Test output:$/) + { + $InDlls = 2; + } + elsif ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+)%) { my ($Dll, $Unit, $Type) = ($1, $2, $3);

1 0

Francois Gouget : testbot/TestLauncher: Fix the missing dll error on Windows <= Vista.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: tools Branch: master Commit: ada2dd71f94e137de0a16e466611b40eaf029f4a URL: https://source.winehq.org/git/tools.git/?a=commit;h=ada2dd71f94e137de0a16e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 16:24:02 2021 +0200 testbot/TestLauncher: Fix the missing dll error on Windows <= Vista. On Vista and lower the critical error dialog title is different for missing dlls but that is unrelated to side-by-side dlls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 5f05aeb..fc67f92 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -183,14 +183,11 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) /* Followed by a reason */ Reason = NULL; - if (strcmp(Buffer + TestFileLen, " - System Error") == 0) + if (/* Windows >= 7 */ + strcmp(Buffer + TestFileLen, " - System Error") == 0 || + /* Windows <= Vista */ + strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0) Reason = "missing dll"; - else if (strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0) - { - /* Sadly Windows >= 7 reports this as "System Error" */ - Reason = "missing manifest for side-by-side dll"; - IsSkip = FALSE; - } else if (strcmp(Buffer + TestFileLen, " - Entry Point Not Found") == 0) Reason = "missing entry point"; else if (strcmp(Buffer + TestFileLen, " - Ordinal Not Found") == 0)

1 0

Francois Gouget : testbot/LogUtils: Fix handling of failures before the first test unit.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: tools Branch: master Commit: c5d7bace65a2bf27a86f87f727d618f00640dc62 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c5d7bace65a2bf27a86f87f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 16:24:55 2021 +0200 testbot/LogUtils: Fix handling of failures before the first test unit. This is necessary to be able to account for errors found in the "dll versions" block. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 60 ++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5f7046c..dde4104 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -407,7 +407,7 @@ sub _CloseTestUnit($$$) my ($LogInfo, $Cur, $Last) = @_; # Verify the summary lines - if (!$Cur->{IsBroken}) + if ($Cur->{Dll} ne "" and !$Cur->{IsBroken}) { _CheckSummaryCounter($LogInfo, $Cur, "Failures", "failure"); _CheckSummaryCounter($LogInfo, $Cur, "Todos", "todo"); @@ -418,37 +418,41 @@ sub _CloseTestUnit($$$) # so only use them as a fallback. $Cur->{LineFailures} ||= $Cur->{SummaryFailures}; - if ($Cur->{UnitSize} > $MaxUnitSize) + if ($Cur->{Dll} ne "") { - _AddExtra($LogInfo, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); - } - if (!$Cur->{IsBroken} and defined $Cur->{Rc}) - { - # Check the exit code, particularly against failures reported - # after the 'done' line (e.g. by subprocesses). - if ($Cur->{LineFailures} != 0 and $Cur->{Rc} == 0) + if ($Cur->{UnitSize} > $MaxUnitSize) { - _AddExtra($LogInfo, "returned success despite having failures", $Cur); + _AddExtra($LogInfo, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); } - elsif (!$LogInfo->{IsWineTest} and $Cur->{Rc} != 0) + if (!$Cur->{IsBroken} and defined $Cur->{Rc}) { - _AddExtra($LogInfo, "The test returned a non-zero exit code"); - } - elsif ($LogInfo->{IsWineTest} and $Cur->{LineFailures} == 0 and $Cur->{Rc} != 0) - { - _AddExtra($LogInfo, "returned a non-zero exit code despite reporting no failures", $Cur); - } - } - # For executables TestLauncher's done line may not be recognizable. - elsif ($LogInfo->{IsWineTest} and !defined $Cur->{Rc}) - { - if (!$Last) - { - _AddExtra($LogInfo, "has no done line (or it is garbled)", $Cur); + # Check the exit code, particularly against failures reported + # after the 'done' line (e.g. by subprocesses). + if ($Cur->{LineFailures} != 0 and $Cur->{Rc} == 0) + { + _AddExtra($LogInfo, "returned success despite having failures", $Cur); + } + elsif (!$LogInfo->{IsWineTest} and $Cur->{Rc} != 0) + { + _AddExtra($LogInfo, "The test returned a non-zero exit code"); + } + elsif ($LogInfo->{IsWineTest} and $Cur->{LineFailures} == 0 and + $Cur->{Rc} != 0) + { + _AddExtra($LogInfo, "returned a non-zero exit code despite reporting no failures", $Cur); + } } - elsif ($Last and !$LogInfo->{TaskTimedOut}) + # For executables TestLauncher's done line may not be recognizable. + elsif ($LogInfo->{IsWineTest} and !defined $Cur->{Rc}) { - _AddExtra($LogInfo, "The report seems to have been truncated"); + if (!$Last) + { + _AddExtra($LogInfo, "has no done line (or it is garbled)", $Cur); + } + elsif ($Last and !$LogInfo->{TaskTimedOut}) + { + _AddExtra($LogInfo, "The report seems to have been truncated"); + } } } @@ -548,7 +552,7 @@ sub ParseWineTestReport($$$) my ($Dll, $Unit, $Type) = ($1, $2, $3); # Close the previous test unit - _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); + _CloseTestUnit($LogInfo, $Cur, 0); $Cur = _NewCurrentUnit($Dll, $Unit); $LogInfo->{TestUnitCount}++; @@ -689,7 +693,7 @@ sub ParseWineTestReport($$$) # First close the current test unit taking into account # it may have been polluted by the new one. $Cur->{IsBroken} = 1; - _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); + _CloseTestUnit($LogInfo, $Cur, 0); # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have

1 0

Francois Gouget : testbot/PatchUtils: Document the make_* scripts indirect impacts.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: tools Branch: master Commit: 2ac989fd8548d6546061d0e26cda0e33f8b3c037 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ac989fd8548d6546061d0e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 11:24:26 2021 +0200 testbot/PatchUtils: Document the make_* scripts indirect impacts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7ae58d3..a7d33f6 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -443,6 +443,8 @@ sub GetPatchImpacts($) $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_requests essentially impacts every test but these + # indirect impacts are ignored (use test=all if it really matters). } elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { @@ -461,18 +463,30 @@ sub GetPatchImpacts($) $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeOpenGL} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_opengl impacts other dlls through header changes so + # it could make sense for the TestBot to rerun the corresponding tests + # when test=module. But that would require either hardcoding the list + # of impacted modules, or detecting changed source files (and thus the + # list of tests to run) at build time which is incompatible with the + # current architecture. + # So these indirect impacts are ignored for now. A workaround is to + # use test=all. } elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_vulkan impacts other dlls through header changes. + # See the make_opengl comment. } elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeUnicode} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_unicode changes the source for many dlls. + # See the make_opengl comment. } elsif ($Line =~ m=^--- /dev/null$=) {

1 0

Francois Gouget : testbot/PatchUtils: Take into account module subdirectories.
by Alexandre Julliard April 6, 2021

April 6, 2021

Module: tools Branch: master Commit: 2377f26807488984a76c702af779a4f58ee23f42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2377f26807488984a76c702… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 6 11:23:24 2021 +0200 testbot/PatchUtils: Take into account module subdirectories. Patches to files in in a subdirectory of a dll or program should be treated the same as regular dll/program patches. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 0d60fdb..7ae58d3 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -240,7 +240,7 @@ sub _HandleFile($$$) $Impacts->{MakeMakefiles} = 1; } } - elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) + elsif ($FilePath =~ m~^(dlls|programs)/([^/\s]+)/((?:[^\s]+/)?[^/\s]+)$~) { my ($Root, $PatchedDir, $File) = ($1, $2, $3);

1 0

Jacek Caban : include: Add IHTMLStyleElement2 declaration.
by Alexandre Julliard April 5, 2021

April 5, 2021

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

Zebediah Figura : ntoskrnl/tests: Use a hard-coded file path in test_obj_reference().
by Alexandre Julliard April 5, 2021

April 5, 2021

Module: wine Branch: master Commit: fa928d16c31c37599c15f50f276822323c4e896a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa928d16c31c37599c15f50f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 4 22:36:46 2021 -0500 ntoskrnl/tests: Use a hard-coded file path in test_obj_reference(). 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 | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d9d712418ee..ec2d8d33900 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1166,7 +1166,7 @@ static void WINAPI thread_proc(void *arg) PsTerminateSystemThread(STATUS_SUCCESS); } -static void test_ob_reference(const WCHAR *test_path) +static void test_ob_reference(void) { POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); OBJECT_ATTRIBUTES attr = { sizeof(attr) }; @@ -1177,8 +1177,6 @@ static void test_ob_reference(const WCHAR *test_path) POBJECT_TYPE obj1_type; UNICODE_STRING pathU; IO_STATUS_BLOCK io; - WCHAR *tmp_path; - SIZE_T len; NTSTATUS status; pObGetObjectType = get_proc_address("ObGetObjectType"); @@ -1189,18 +1187,12 @@ static void test_ob_reference(const WCHAR *test_path) status = ZwCreateEvent(&event_handle, SYNCHRONIZE, &attr, NotificationEvent, TRUE); ok(!status, "ZwCreateEvent failed: %#x\n", status); - len = wcslen(test_path); - tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(L".tmp")); - memcpy(tmp_path, test_path, len * sizeof(WCHAR)); - memcpy(tmp_path + len, L".tmp", sizeof(L".tmp")); - - RtlInitUnicodeString(&pathU, tmp_path); + RtlInitUnicodeString(&pathU, L"\\??\\C:\\windows\\winetest_ntoskrnl_file.tmp"); attr.ObjectName = &pathU; - attr.Attributes = OBJ_KERNEL_HANDLE; + attr.Attributes = OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE; status = ZwCreateFile(&file_handle, DELETE | FILE_WRITE_DATA | SYNCHRONIZE, &attr, &io, NULL, 0, 0, FILE_CREATE, FILE_DELETE_ON_CLOSE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(!status, "ZwCreateFile failed: %#x\n", status); - ExFreePool(tmp_path); status = ZwDuplicateObject(NtCurrentProcess(), file_handle, NtCurrentProcess(), &file_handle2, 0, OBJ_KERNEL_HANDLE, DUPLICATE_SAME_ACCESS); @@ -2164,7 +2156,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_version(); test_stack_callout(); test_lookaside_list(); - test_ob_reference(test_input->path); + test_ob_reference(); test_resource(); test_lookup_thread(); test_IoAttachDeviceToDeviceStack();

1 0

Jacek Caban : mshtml: Add IHTMLStyleElement::onload and onerror implementation.
by Alexandre Julliard April 5, 2021

April 5, 2021

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 : mshtml: Don't expose readyState property to elements in IE11 mode.
by Alexandre Julliard April 5, 2021

April 5, 2021

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 April 5, 2021

April 5, 2021

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