January 2021 - Wine-commits

Zebediah Figura : winegstreamer: Make push_data() into a POSIX thread.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: ed3ed4d8abbea862c990c25c87143e86bf6be85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed3ed4d8abbea862c990c25c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 16:18:47 2021 -0600 winegstreamer: Make push_data() into a POSIX thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e73693de939..a4d49c75a1b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -74,7 +74,7 @@ struct parser pthread_cond_t init_cond; bool no_more_pads, has_duration, error; - HANDLE push_thread; + pthread_t push_thread; HANDLE read_thread; pthread_cond_t read_cond, read_done_cond; @@ -823,7 +823,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer); -static DWORD CALLBACK push_data(LPVOID iface) +static void *push_data(void *iface) { struct parser *This = iface; GstBuffer *buffer; @@ -834,7 +834,7 @@ static DWORD CALLBACK push_data(LPVOID iface) if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) { GST_ERROR("Failed to allocate memory."); - return 0; + return NULL; } maxlen = This->stop ? This->stop : This->filesize; @@ -869,7 +869,7 @@ static DWORD CALLBACK push_data(LPVOID iface) GST_DEBUG("Stopping push thread."); - return 0; + return NULL; } static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -1426,16 +1426,22 @@ static gboolean activate_push(GstPad *pad, gboolean activate) TRACE("Deactivating\n"); IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { - WaitForSingleObject(This->push_thread, -1); - CloseHandle(This->push_thread); - This->push_thread = NULL; + pthread_join(This->push_thread, NULL); + This->push_thread = 0; } IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) { + int ret; + TRACE("Activating\n"); - This->push_thread = CreateThread(NULL, 0, push_data, This, 0, NULL); + if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) + { + GST_ERROR("Failed to create push thread: %s", strerror(errno)); + This->push_thread = 0; + return FALSE; + } } LeaveCriticalSection(&This->filter.filter_cs); return TRUE;

1 0

Zebediah Figura : include: Include ntddndis.h in ndis.h.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: d23a474f91149acab7c335e9afd25dcb271a312d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d23a474f91149acab7c335e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 19:27:33 2021 -0600 include: Include ntddndis.h in ndis.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ndis.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index a4b0e540fa1..38eec8a7ac4 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -21,6 +21,8 @@ #ifndef _NDIS_ #define _NDIS_ +#include <ntddndis.h> + typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL;

1 0

Zebediah Figura : ndis.sys: Avoid including ntddndis.h directly.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: ac023acce9da337c3e3532b86c73ff9da4677681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac023acce9da337c3e3532b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 27 19:27:34 2021 -0600 ndis.sys: Avoid including ntddndis.h directly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50426 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 1 - dlls/ndis.sys/tests/ndis.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 358dc61dc72..94c19ffca53 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -32,7 +32,6 @@ #include "ws2ipdef.h" #include "iphlpapi.h" #include "netioapi.h" -#include "ntddndis.h" #include "ddk/wdm.h" #include "ddk/ndis.h" #include "winreg.h" diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index 679d29130c0..d6a2db0fd9d 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -22,7 +22,6 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winioctl.h> -#include <ntddndis.h> #include <winsock2.h> #include <ws2ipdef.h> #include <iphlpapi.h>

1 0

Brendan Shanks : winemac.drv: Use Metal to get a display's GPU info if possible.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: wine Branch: master Commit: ae319caa3bf97b0ab688b1f44418dfd9d522f115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae319caa3bf97b0ab688b1f4… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 27 11:16:46 2021 -0800 winemac.drv: Use Metal to get a display's GPU info if possible. Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ done: return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /***********************************************************************

1 0

Francois Gouget : testbot/LogUtils: Improve the misplaced subtest error message.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: tools Branch: master Commit: d7f11e34484a6d006a56b045ab0ecec1ee5e51e1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d7f11e34484a6d006a56b04… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 28 03:35:56 2021 +0100 testbot/LogUtils: Improve the misplaced subtest error message. A subtest line, misplaced or not, also proves this is a Wine test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d537af2..1b4ee7a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -579,8 +579,9 @@ sub ParseWineTestReport($$$) } else { - _AddExtra($LogInfo, "Misplaced $SubUnit subtest"); + _AddExtra($LogInfo, "$Unit has a misplaced $SubUnit subtest line"); } + $LogInfo->{IsWineTest} = 1; } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or

1 0

Francois Gouget : winetest/dissect: Improve the misplaced subtest error message.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: tools Branch: master Commit: aea9527affd292158986c81720f65af3387aaa98 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aea9527affd292158986c81… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 28 03:36:53 2021 +0100 winetest/dissect: Improve the misplaced subtest error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index c62f914..e9729db 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -624,7 +624,7 @@ while ($line = <IN>) { } else { - add_test_line("end", "Misplaced $l_subunit subtest\n"); + add_test_line("end", "$l_unit has a misplaced $l_subunit subtest line\n"); $extra_failures++; } }

1 0

Francois Gouget : testbot/TestWTBS: Add support for checking timeouts.
by Alexandre Julliard 28 Jan '21

28 Jan '21

Module: tools Branch: master Commit: cc359d12a2e19187aba7a30e3ffd536c86f1596b URL: https://source.winehq.org/git/tools.git/?a=commit;h=cc359d12a2e19187aba7a30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 28 04:18:19 2021 +0100 testbot/TestWTBS: Add support for checking timeouts. Timeouts can get reported in many different ways depending on whether they are detected by TestLauncher, the WineRun* script or the Engine. That makes a simple error matching or grep impossible. So provide specific support for checking that a task timed out. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 94 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 74 insertions(+), 20 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 67b1c8f..6f78406 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -402,7 +402,10 @@ sub LoadTestInfo($) my $Status = ($TestInfo->{job}->{Status} ne 'completed' or $TestInfo->{win32}->{TestFailures} or $TestInfo->{win64}->{TestFailures} or - $TestInfo->{wine}->{TestFailures}) ? "Failed" : "OK"; + $TestInfo->{wine}->{TestFailures} or + $TestInfo->{win32}->{HasTimeout} or + $TestInfo->{win64}->{HasTimeout} or + $TestInfo->{wine}->{HasTimeout}) ? "Failed" : "OK"; SetDefault($TestInfo, "webpatch", "Status", $Status); } @@ -555,6 +558,16 @@ sub IsMailingListJob($) return $Job->Remarks =~ /^\[\Q$PatchesMailingList\E\] /; } +sub IsTimeoutError($$) +{ + my ($GroupName, $Error) = @_; + + return (($GroupName ne "" and # Test dll or Report validation errors + $Error =~ /^[_a-z0-9]+: Timeout$/) or # Test unit + ($GroupName eq "" and # testbot.log case + $Error eq "The task timed out")); +} + =pod =item <tasks.(report|log|testbot).groupname> @@ -584,17 +597,19 @@ directives, win32 will not inherit anything from the win category. =cut -sub CheckLogErrors($$$) +sub CheckLogErrors($$$$) { - my ($LogInfo, $RefInfo, $LogKey) = @_; + my ($LogInfo, $RefInfo, $LogKey, $IgnoreTimeouts) = @_; + my $HasTimeout; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; - - my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + # Prevent $RefInfo from springing into existence + my $RefGroup = $RefInfo ? $RefInfo->{ErrGroups}->{$GroupName} : undef; if ($RefGroup) { + # Match the log errors to the expected errors for this group my $Diff = Algorithm::Diff->new($LogGroup->{Errors}, $RefGroup->{Errors}, { keyGen => \&WineTestBot::LogUtils::_GetLineKey }); my ($LogIndex, $RefIndex) = (0, 0); @@ -613,6 +628,12 @@ sub CheckLogErrors($$$) foreach (1..$ExtraCount) { next if (!$LogGroup->{IsNew}->[$LogIndex]); + if ($IgnoreTimeouts and + IsTimeoutError($GroupName, $LogGroup->{Errors}->[$LogIndex])) + { + next; + } + fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$LogIndex]"); $LogIndex++; } @@ -626,27 +647,39 @@ sub CheckLogErrors($$$) } } } - else + + # Check for timeouts and new errors if no error was expected for that group + foreach my $ErrIndex (0..@{$LogGroup->{Errors}} - 1) { - # Check that the log's extra errors are old errors - foreach my $ErrIndex (0..@{$LogGroup->{Errors}} - 1) + if (IsTimeoutError($GroupName, $LogGroup->{Errors}->[$ErrIndex])) + { + $HasTimeout = 1; + next if ($IgnoreTimeouts); # ignore expected timeouts + } + if ($RefInfo and !$RefGroup and $LogGroup->{IsNew}->[$ErrIndex]) { - next if (!$LogGroup->{IsNew}->[$ErrIndex]); fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$ErrIndex]"); } } } - foreach my $GroupName (@{$RefInfo->{ErrGroupNames}}) - { - my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; - next if ($LogGroup); - my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; - foreach my $Error (@{$RefGroup->{Errors}}) + if ($RefInfo) + { + # Check for groups missing from the log file + foreach my $GroupName (@{$RefInfo->{ErrGroupNames}}) { - fail("$LogKey is missing an error in $GroupName: $Error"); + my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; + next if ($LogGroup); + + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + foreach my $Error (@{$RefGroup->{Errors}}) + { + fail("$LogKey is missing an error in $GroupName: $Error"); + } } } + + return $HasTimeout; } sub GrepFile($$$$;$) @@ -716,6 +749,18 @@ By default the Status field should be 'completed'. Checks the value of the task's TestFailures field. By default the TestFailures field is not checked. +=item <tasks.HasTimeout> + +When true verifies that the task timed out. +This also disables reporting timeout errors as unexpected errors. + +Use this instead of looking for a specific error in the report because +timeouts can get reported in many different ways depending whether they are +detected by TestLauncher, the WineRun* script or the Engine. It can also +depend on whether the test was the last one run by the task (in the Wine case). +By default this check is skipped and timeout errors are reported like any +other unexpected error. + =item <tasks.(report|log|testbot).Grep> =item <tasks.(report|log|testbot).GrepV> @@ -754,7 +799,10 @@ sub CheckTask($$$$) $TestUnits->{$TaskType}->{"*skipped*"} = 1; } - my ($ReportCount, $NewFailures) = (0, 0); + my $CheckTimeouts = ($Task->Status eq "completed" and + CheckValue($TaskInfo->{HasTimeout})); + + my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { my $LogPath = $Task->GetDir() ."/$LogName"; @@ -777,13 +825,19 @@ sub CheckTask($$$$) $LogType = "testbot"; } - if ($TaskInfo->{"$LogType.errors"}) + if ($TaskInfo->{"$LogType.errors"} or $CheckTimeouts) { - CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, - TaskKeyStr($Task) ."/$LogName"); + my $HasTimeout = CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, + TaskKeyStr($Task) ."/$LogName", + $TaskInfo->{HasTimeout}); + $TimeoutCount++ if ($HasTimeout); } GrepTaskLog($Task, $LogName, $TaskInfo, "$LogType."); } + if ($CheckTimeouts) + { + ok($TimeoutCount >= $ReportCount, "Expecting 1+ timeout per report: $TimeoutCount timeouts, $ReportCount reports"); + } if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures})) { # Scale the expected TestFailures count with the number of times the test

1 0

Martin Storsjo : msvcrt: Fix reading BOM-less files opened with ccs=unicode.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: fb0fa9aacf0d58b3fd5f26255858a744b29ee000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb0fa9aacf0d58b3fd5f2625… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 27 19:07:26 2021 +0100 msvcrt: Fix reading BOM-less files opened with ccs=unicode. This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ba534568119..73e1a82476f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2329,6 +2329,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm msvcrt_set_errno(GetLastError()); return *_errno(); } + oflags |= _O_U16TEXT; } } else if (access & GENERIC_READ) @@ -2346,8 +2347,9 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm return *_errno(); if (oflags & _O_WTEXT) - get_ioinfo_nolock(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; - else if (oflags & _O_U16TEXT) + get_ioinfo_nolock(*fd)->exflag |= EF_UNK_UNICODE; + + if (oflags & _O_U16TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF16; else if (oflags & _O_U8TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF8; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ecf99e38b0e..0cf8bad124f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1039,6 +1039,40 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text + 1, ARRAY_SIZE(wchar_text) - 1, + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + utf8_text[ret] = 0; + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; utf8_text[i]; i++) + { + ch = fgetwc(tempfh); + ok(ch == (unsigned char) utf8_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, (unsigned char)utf8_text[i], i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + unlink(temppath); }

1 0

Jacek Caban : mshtml/tests: Use more winetest.js helpers in documentmode.js.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 44d58d35d19f3b9887f474e3528fcd874c63c7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d58d35d19f3b9887f474e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:21 2021 +0100 mshtml/tests: Use more winetest.js helpers in documentmode.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 79 ++++++++++++--------------------------- dlls/mshtml/tests/winetest.js | 8 ++++ 2 files changed, 31 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 4b788c970b9..d6589343dff 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -17,8 +17,9 @@ */ var compat_version; +var tests = []; -function test_elem_props() { +sync_test("elem_props", function() { var elem = document.documentElement; function test_exposed(prop, expect) { @@ -41,11 +42,9 @@ function test_elem_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); +}); - next_test(); -} - -function test_doc_props() { +sync_test("doc_props", function() { function test_exposed(prop, expect) { if(expect) ok(prop in document, prop + " not found in document."); @@ -66,11 +65,9 @@ function test_doc_props() { test_exposed("parentWindow", true); if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow"); +}); - next_test(); -} - -function test_docfrag_props() { +sync_test("docfrag_props", function() { var docfrag = document.createDocumentFragment(); function test_exposed(prop, expect) { @@ -83,11 +80,9 @@ function test_docfrag_props() { var v = document.documentMode; test_exposed("compareDocumentPosition", v >= 9); +}); - next_test(); -} - -function test_window_props() { +sync_test("window_props", function() { function test_exposed(prop, expect) { if(expect) ok(prop in window, prop + " not found in window."); @@ -108,11 +103,9 @@ function test_window_props() { test_exposed("getComputedStyle", v >= 9); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); +}); - next_test(); -} - -function test_xhr_props() { +sync_test("xhr_props", function() { var xhr = new XMLHttpRequest(); function test_exposed(prop, expect) { @@ -127,11 +120,9 @@ function test_xhr_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); +}); - next_test(); -} - -function test_style_props() { +sync_test("style_props", function() { var style = document.body.style; function test_exposed(prop, expect) { @@ -186,11 +177,9 @@ function test_style_props() { test_exposed("background-clip", v >= 9); test_exposed("transform", v >= 10); } +}); - next_test(); -} - -function test_javascript() { +sync_test("JS objs", function() { var g = window; function test_exposed(func, obj, expect) { @@ -239,11 +228,9 @@ function test_javascript() { test_parses("if(false) { o.default; }", v >= 9); test_parses("if(false) { o.with; }", v >= 9); test_parses("if(false) { o.if; }", v >= 9); +}); - next_test(); -} - -function test_elem_by_id() { +sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; var id_elem = document.getElementById("testid"); @@ -254,11 +241,9 @@ function test_elem_by_id() { ok(id_elem === name_elem, "id_elem != id_elem"); else ok(name_elem === null, "name_elem != null"); +}); - next_test(); -} - -function test_doc_mode() { +sync_test("doc_mode", function() { compat_version = parseInt(document.location.search.substring(1)); trace("Testing compatibility mode " + compat_version); @@ -275,11 +260,9 @@ function test_doc_mode() { ok(document.compatMode === "CSS1Compat", "document.compatMode = " + document.compatMode); else ok(document.compatMode === "BackCompat", "document.compatMode = " + document.compatMode); +}); - next_test(); -} - -function test_iframe_doc_mode() { +async_test("iframe_doc_mode", function() { var iframe = document.createElement("iframe"); iframe.onload = function() { @@ -293,9 +276,9 @@ function test_iframe_doc_mode() { iframe.src = "about:blank"; document.body.appendChild(iframe); -} +}); -function test_conditional_comments() { +sync_test("conditional_comments", function() { var div = document.createElement("div"); document.body.appendChild(div); @@ -323,20 +306,4 @@ function test_conditional_comments() { test_version(6); test_version(7); test_version(8); - - next_test(); -} - -var tests = [ - test_doc_mode, - test_iframe_doc_mode, - test_elem_props, - test_doc_props, - test_docfrag_props, - test_window_props, - test_javascript, - test_xhr_props, - test_style_props, - test_elem_by_id, - test_conditional_comments -]; +}); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 6d99adf12b2..ca7f2aab4c2 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -90,3 +90,11 @@ function sync_test(name, f) next_test(); }); } + +function async_test(name, f) +{ + tests.push(function() { + test_name = name; + f(); + }); +}

1 0

Jacek Caban : mshtml: Implement IHTMLCSSStyleDeclaration2::animation property.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: ee611b198d8de1251486b505cffb9cac96f5cacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee611b198d8de1251486b505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:38 2021 +0100 mshtml: Implement IHTMLCSSStyleDeclaration2::animation property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 43a71d6286c..0ae2dfe863e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -120,6 +120,12 @@ typedef struct { } style_tbl_entry_t; static const style_tbl_entry_t style_tbl[] = { + { + L"animation", + DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATION, + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 + }, { L"animation-name", DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, @@ -9689,15 +9695,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animationIterationCount(IHTML static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_ANIMATION, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_ANIMATION, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animationFillMode(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a21dfe88d38..25f87c802b2 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -44,6 +44,7 @@ struct HTMLStyle { /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { + STYLEID_ANIMATION, STYLEID_ANIMATION_NAME, STYLEID_BACKGROUND, STYLEID_BACKGROUND_ATTACHMENT, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 69f1e61cac1..255dc7f7900 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1106,6 +1106,36 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ok(hres == S_OK, "get_perspective failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"100px"), "perspective = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + /* animation property */ + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); + ok(hres == S_OK, "get_animation failed: %08x\n", hres); + ok(!str, "animation = %s\n", wine_dbgstr_w(str)); + + str = SysAllocString(L"test"); + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, str); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); + ok(hres == S_OK, "get_animation failed: %08x\n", hres); + todo_wine + ok(!lstrcmpW(str, L"test"), "animation = %s\n", wine_dbgstr_w(str)); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); + ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(!lstrcmpW(str, L"test"), "animationName = %s\n", wine_dbgstr_w(str)); + + str = SysAllocString(L"test"); + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0