wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Francois Gouget : testbot/LogUtils: Detect and report the dll version errors.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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/LogUtils: Fix handling of failures before the first test unit.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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/TestLauncher: Fix the missing dll error on Windows <= Vista.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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/PatchUtils: Document the make_* scripts indirect impacts.
by Alexandre Julliard 06 Apr '21

06 Apr '21

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 06 Apr '21

06 Apr '21

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

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

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

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

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 : 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

← Newer
1
...
75
76
77
78
79
80
81
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021