wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Zebediah Figura : winegstreamer: Build with msvcrt.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 8abcae547501809d1cbf01b14669707c0bd66714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8abcae547501809d1cbf01b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 19 20:34:59 2021 -0600 winegstreamer: Build with msvcrt. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 2 ++ dlls/winegstreamer/audioconvert.c | 3 --- dlls/winegstreamer/gst_private.h | 3 --- dlls/winegstreamer/gstdemux.c | 7 +++---- dlls/winegstreamer/main.c | 2 +- dlls/winegstreamer/media_source.c | 6 +----- dlls/winegstreamer/mfplat.c | 3 --- dlls/winegstreamer/wg_parser.c | 4 ++++ 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index debdae2d4bb..996818fa457 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -5,6 +5,8 @@ EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audioconvert.c \ filter.c \ diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index f4e841fe3e4..3b6571ab60d 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <gst/gst.h> - #include "gst_private.h" #include "mfapi.h" diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index d2f6fee8971..ef84d611a09 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -25,9 +25,6 @@ #include <stdbool.h> #include <stdint.h> #include <stdio.h> -#include <gst/gst.h> -#include <gst/video/video.h> -#include <gst/audio/audio.h> #define COBJMACROS #define NONAMELESSSTRUCT diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 910abada48c..84e6bcd61e4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -20,17 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "gst_private.h" #include "gst_guids.h" #include "vfwmsgs.h" #include "amvideo.h" -#include "wine/unicode.h" #include "wine/debug.h" #include <assert.h> +#include <limits.h> #include "dvdmedia.h" #include "mmreg.h" @@ -1016,7 +1015,7 @@ static BOOL decodebin_parser_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - sprintfW(source_name, formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1677,7 +1676,7 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - sprintfW(source_name, formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index ee9f57b6c57..6f3be9095d6 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -19,9 +19,9 @@ */ #include "gst_private.h" +#include "winternl.h" #include "rpcproxy.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "initguid.h" #include "gst_guids.h" diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 32b4477ad88..e69370d2513 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <gst/gst.h> - #include "gst_private.h" #include <assert.h> @@ -1083,7 +1079,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ { IMFStreamDescriptor **descriptors = NULL; struct media_source *object; - gint64 total_pres_time = 0; + UINT64 total_pres_time = 0; struct wg_parser *parser; DWORD bytestream_caps; uint64_t file_size; diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 8891facdffe..439fc2ee5ed 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <gst/gst.h> - #include "gst_private.h" #include <assert.h> diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 257da2538af..a7b3e6348cf 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -29,7 +29,11 @@ #define WIN32_NO_STATUS #include "gst_private.h" #include "winternl.h" + #include <assert.h> +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);

1 0

Zebediah Figura : winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 9638a5092e366181896b596507682d70519c9440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9638a5092e366181896b5965… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 19 20:34:58 2021 -0600 winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures. The latter has inconsistent alignment between the Unix and Win32 sides. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 03d19af1031..d2f6fee8971 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -150,17 +150,18 @@ struct wg_parser_event struct { /* pts and duration are in 100-nanosecond units. */ - uint64_t pts, duration; + ULONGLONG pts, duration; uint32_t size; bool discontinuity, preroll, delta, has_pts, has_duration; } buffer; struct { - uint64_t position, stop; - double rate; + ULONGLONG position, stop; + DOUBLE rate; } segment; } u; }; +C_ASSERT(sizeof(struct wg_parser_event) == 40); struct unix_funcs {

1 0

Andrey Gusev : vkd3d-shader: Add a fall-through to default case in shader_sm4_read_param().
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: vkd3d Branch: master Commit: 24537d369372252ca5da4fb066433e1d1ff6d824 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=24537d369372252ca5da4fb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Feb 20 16:41:16 2021 +0200 vkd3d-shader: Add a fall-through to default case in shader_sm4_read_param(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index bfc3cce..d2cf87e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1551,6 +1551,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr default: FIXME("Skipping modifier 0x%08x.\n", m); + /* fall-through */ case VKD3D_SM4_REGISTER_MODIFIER_NONE: *modifier = VKD3DSPSM_NONE; break;

1 0

Floris Renaud : website: Update Dutch translation.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: website Branch: master Commit: 9f3acf7b917c30a4e778ccc26f490f2172fb17ee URL: https://source.winehq.org/git/website.git/?a=commit;h=9f3acf7b917c30a4e778c… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 20 00:03:17 2021 +0100 website: Update Dutch translation. Point the links to the Dutch wiki. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/nl/documentation.template | 2 +- templates/nl/forums.template | 2 +- templates/nl/getinvolved.template | 2 +- templates/nl/help.template | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/nl/documentation.template b/templates/nl/documentation.template index f379c9ca..4ef1989e 100644 --- a/templates/nl/documentation.template +++ b/templates/nl/documentation.template @@ -6,7 +6,7 @@ <h2>Handleidingen</h2> <ul> <li> - <a href="https://wiki.winehq.org/Wine User's Guide">Gebruikershandleiding van Wine</a><br> + <a href="https://wiki.winehq.org/Gebruikershandleiding">Gebruikershandleiding van Wine</a><br> Wine gebruiken en aanpassen om Windows programma's uit te voeren.<br> </li><br> diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 8ac7740b..f4bb72c1 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -103,7 +103,7 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam.</p> [<a href="//www.winehq.org/pipermail/wine-bugs/">Archief 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archief 2</a>]<br> Een drukke lijst (100/dag) die alle activiteit op de - <a href="//bugs.winehq.org/">Bug Tracking Database</a>laat zien. + <a href="//bugs.winehq.org/">Bug Tracking Database</a> laat zien. </li> </ul> diff --git a/templates/nl/getinvolved.template b/templates/nl/getinvolved.template index 6ce0ac3f..cb07e0fa 100644 --- a/templates/nl/getinvolved.template +++ b/templates/nl/getinvolved.template @@ -14,7 +14,7 @@ Op deze pagina staat hoe u betrokken raakt bij Wine.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Main_Page#Contribute">Bijdragen aan Wine</a> + <a href="https://wiki.winehq.org/Startpagina#Meedoen">Bijdragen aan Wine</a> </div> <div class="col-xs-9 col-md-10"> Een lijst met manieren om aan Wine bij te dragen. diff --git a/templates/nl/help.template b/templates/nl/help.template index 80e44789..656c06c0 100644 --- a/templates/nl/help.template +++ b/templates/nl/help.template @@ -22,11 +22,11 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/FAQ"><i class="fas fa-info-circle fa-2x"></i><br>FAQ</a> + <a href="https://wiki.winehq.org/FAQ_nl"><i class="fas fa-info-circle fa-2x"></i><br>FAQ</a> </div> <div class="col-xs-10 col-md-11"> Veel vragen worden snel beantwoord op onze - <a href="https://wiki.winehq.org/FAQ">Veel Gestelde Vragen</a> pagina. + <a href="https://wiki.winehq.org/FAQ_nl">Veel Gestelde Vragen</a> pagina. Bekijk deze pagina eerst om te zien of de vraag al beantwoord is. </div> </div> @@ -44,10 +44,10 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/"><i class="fas fa-book fa-2x"></i><br>Wiki</a> + <a href="https://wiki.winehq.org/Startpagina"><i class="fas fa-book fa-2x"></i><br>Wiki</a> </div> <div class="col-xs-10 col-md-11"> - Doorzoek ook de <a href="https://wiki.winehq.org/">Wiki</a> om een + Doorzoek ook de <a href="https://wiki.winehq.org/Startpagina">Wiki</a> om een antwoord te vinden. </div> </div>

1 0

Francois Gouget : testbot: Deduplicate matching errors in ParseWineTestReport().
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: tools Branch: master Commit: c101616e143d09309e3343694e9660de3fb433ec URL: https://source.winehq.org/git/tools.git/?a=commit;h=c101616e143d09309e33436… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 22 06:26:28 2021 +0100 testbot: Deduplicate matching errors in ParseWineTestReport(). Let ParseWineTestReport() populate the list of errors, and only use GetReportLineCategory() as a fallback. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 59 +++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index dae8292..267dcd9 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -368,6 +368,8 @@ sub _NewCurrentUnit($$) IsBroken => 0, Rc => undef, Pids => {}, + Group => undef, + GroupLineNo => 0, }; } @@ -462,6 +464,25 @@ sub _CloseTestUnit($$$) $LogInfo->{Failures} += $Cur->{LineFailures}; } +sub _AddReportError($$$$) +{ + my ($LogInfo, $Cur, $LineNo, $Line) = @_; + + # Make the timeout messages more user-friendly + my $ErrLine = $Line; + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + { + my $Unit = $1; + $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + + if (!$Cur->{Group}) + { + $Cur->{Group} = _AddLogGroup($LogInfo, $Cur->{Dll}, $Cur->{GroupLineNo} || $LineNo); + } + _AddLogError($LogInfo, $Cur->{Group}, $ErrLine, $LineNo); +} + =pod =over 12 @@ -522,8 +543,6 @@ sub ParseWineTestReport($$$) } my $LineNo = 0; - my $CurGroupName = ""; - my ($CurGroup, $CurGroupLineNo); my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -533,23 +552,6 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if (GetReportLineCategory($Line) eq "error") - { - # Make the timeout messages more user-friendly - my $ErrLine = $Line; - if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) - { - my $Unit = $1; - $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - - if (!$CurGroup) - { - $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); - } - _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); - } - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -563,9 +565,8 @@ sub ParseWineTestReport($$$) $Cur->{Rc} = 0 if ($Type eq "skipped"); # The next error will be in a new error group - $CurGroupName = $Dll; - $CurGroupLineNo = $LineNo; - $CurGroup = undef; + $Cur->{GroupLineNo} = $LineNo; + $Cur->{Group} = undef; } elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) { @@ -586,6 +587,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -614,6 +616,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; $LogInfo->{IsWineTest} = 1; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -629,6 +632,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif ($Line =~ /Unhandled exception: .* in .* code /) @@ -636,6 +640,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -650,6 +655,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -704,6 +710,7 @@ sub ParseWineTestReport($$$) $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; + _AddReportError($LogInfo, $Cur, $LineNo, $&); } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -729,6 +736,14 @@ sub ParseWineTestReport($$$) } $Cur->{Rc} = $Rc; } + elsif (GetReportLineCategory($Line) eq "error") + { + # This should only happen on very garbled lines, or if there is an + # inconsistency between GetReportLineCategory() and + # ParseWineTestReport(). + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + } + } $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); _CloseTestUnit($LogInfo, $Cur, 1);

1 0

Francois Gouget : testbot/TestWTBS: Check that no extra test units have been run.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: tools Branch: master Commit: d03ed1fe17bf4a73232a51bdff6080f5cc92f53d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d03ed1fe17bf4a73232a51b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 22 06:26:12 2021 +0100 testbot/TestWTBS: Check that no extra test units have been run. TestUnits is now an exhaustive list of test units that are expected to be run. Any extra test unit is reported as a failure. To compensate one can now add a module name to accept any test unit from that module. This allows dealing with the test=module configurations. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 8a77b00..1467c4b 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1038,11 +1038,15 @@ p win.HasTask 0 =item <tests.TestUnits> -Checks that the TestBot ran at least the test units mentioned in this -space-separated list on the VMs matching the specified category. +Checks that the TestBot ran the test units mentioned in this space-separated +list on the VMs matching the specified category. Each entry is either of the +form module:unit, or just module in which case it matches any test unit of the +specified module. Each entry in the list must match at least one test unit. +Two entries can match the same test unit(s). +This is useful when test=module, in which case the TestBot may run many tests. For instance: -p win.TestUnits cabinet:extract cabinet:fdi +p win.TestUnits cabinet:newunit cabinet =item <patch.Grep> =item <patch.GrepV> @@ -1168,11 +1172,31 @@ sub CheckJobTree($;$) my $MissionInfo = $TestInfo->{$MissionType}; next if (!CheckValue($MissionInfo->{TestUnits})); - foreach my $TestUnit (split / +/, $MissionInfo->{TestUnits}) + foreach my $TestGrep (split / +/, $MissionInfo->{TestUnits}) { - ok($TestUnits->{$MissionType}->{$TestUnit}, "Check that $TestUnit was tested by $MissionType VMs for job $JobId") + if ($TestGrep =~ /:/) + { + if (exists $TestUnits->{$MissionType}->{$TestGrep}) + { + $TestUnits->{$MissionType}->{$TestGrep} = 0; + next; + } + fail("Check that $MissionType VMs ran $TestGrep for job $JobId") + or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); + } + my $Matched; + foreach my $TestUnit (keys %{$TestUnits->{$MissionType}}) + { + next if ($TestUnit !~/^\Q$TestGrep:\E/); + $TestUnits->{$MissionType}->{$TestUnit} = 0; + $Matched = 1; + } + ok($Matched, "Check that $MissionType VMs ran $TestGrep for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } + my @ExtraUnits = grep { $TestUnits->{$MissionType}->{$_} } keys %{$TestUnits->{$MissionType}}; + ok(!@ExtraUnits, "Check that $MissionType VMs ran no extra test units") + or diag("Extraneous test runs=". join(" ", sort @ExtraUnits)); } }

1 0

Jacek Caban : ntdll: Use syscall frame for x86_64 YMM context in NtGetContextThread.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 4de079bb7247c8b849558c0f27a280a9546c5570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4de079bb7247c8b849558c0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:09:03 2021 +0100 ntdll: Use syscall frame for x86_64 YMM context in NtGetContextThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 82 +++++++++++++---------------------------- 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ca0f9117cd5..8d3353e959d 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1540,56 +1540,6 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex } -/*********************************************************************** - * save_xstate - * - * Save the XState context - */ -static inline NTSTATUS save_xstate( CONTEXT *context ) -{ - CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); - DECLSPEC_ALIGN(64) struct - { - XSAVE_FORMAT xsave; - XSTATE xstate; - } - xsave_area; - XSTATE *xs; - - if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) - return STATUS_SUCCESS; - - if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) - || context_ex->XState.Length > sizeof(XSTATE)) - return STATUS_INVALID_PARAMETER; - - if (user_shared_data->XState.CompactionEnabled) - { - /* xsavec doesn't use anything from the save area. */ - __asm__ volatile( "xsavec %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->CompactionMask & (1 << XSTATE_AVX))), "d" (0) ); - } - else - { - /* xsave preserves those bits in the mask which are not in EDX:EAX, so zero it. */ - xsave_area.xstate.Mask = xsave_area.xstate.CompactionMask = 0; - __asm__ volatile( "xsave %0" : "=m"(xsave_area) - : "a" ((unsigned int)(xs->Mask & (1 << XSTATE_AVX))), "d" (0) ); - } - - memcpy(xs, &xsave_area.xstate, offsetof(XSTATE, YmmContext)); - if (xs->Mask & (1 << XSTATE_AVX)) - { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - - memcpy(&xs->YmmContext, &xsave_area.xstate.YmmContext, sizeof(xs->YmmContext)); - } - - return STATUS_SUCCESS; -} - - /*********************************************************************** * restore_context * @@ -1895,17 +1845,14 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) */ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) { - NTSTATUS ret, xsave_status; + NTSTATUS ret; DWORD needed_flags; struct syscall_frame *frame = amd64_thread_data()->syscall_frame; BOOL self = (handle == GetCurrentThread()); + XSTATE *xstate; if (!context) return STATUS_INVALID_PARAMETER; - /* Save xstate before any calls which can potentially change volatile ymm registers. - * E. g., debug output will clobber ymm registers. */ - xsave_status = self ? save_xstate( context ) : STATUS_SUCCESS; - needed_flags = context->ContextFlags & ~CONTEXT_AMD64; /* debug registers require a server call */ @@ -1975,9 +1922,32 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) amd64_thread_data()->dr6 = context->Dr6; amd64_thread_data()->dr7 = context->Dr7; } + if (user_shared_data->XState.EnabledFeatures && (xstate = xstate_from_context( context ))) + { + struct syscall_xsave *xsave = get_syscall_xsave( frame ); + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + const BOOL compaction_enabled = user_shared_data->XState.CompactionEnabled; + unsigned int mask; + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) + || context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + + mask = (compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; + xstate->Mask = xsave->xstate.Mask & mask; + xstate->CompactionMask = compaction_enabled ? (0x8000000000000000 | mask) : 0; + memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); + if (xstate->Mask) + { + if (context_ex->XState.Length < sizeof(XSTATE)) + return STATUS_BUFFER_OVERFLOW; + + memcpy( &xstate->YmmContext, &xsave->xstate.YmmContext, sizeof(xstate->YmmContext) ); + } + } } - return xsave_status; + return STATUS_SUCCESS; } extern void CDECL raise_func_trampoline( void *dispatcher );

1 0

Jacek Caban : ntdll: Store x86_64 YMM context in syscall frame.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 11e3d43c264bf24657b20c1435cbabfa78e0b1f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e3d43c264bf24657b20c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:08:59 2021 +0100 ntdll: Store x86_64 YMM context in syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 20 +++++++++++++----- tools/winebuild/import.c | 45 ++++++++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index bed4958f251..ca0f9117cd5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -270,9 +270,10 @@ C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); struct syscall_xsave { XMM_SAVE_AREA32 xsave; + XSTATE xstate; }; -C_ASSERT( sizeof(struct syscall_xsave) == 0x200 ); +C_ASSERT( sizeof(struct syscall_xsave) == 0x340 ); struct syscall_frame { @@ -2147,7 +2148,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, "movq %gs:0x30,%rdx\n\t" "movq 0x328(%rdx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq -0x200(%rax),%r8\n\t" + "leaq -0x340(%rax),%r8\n\t" "andq $~63,%r8\n\t" "fxrstor64 (%r8)\n\t" "movq 0x8(%rax),%rbx\n\t" /* frame->rbx */ @@ -2793,14 +2794,23 @@ void signal_init_process(void) */ void *signal_init_syscalls(void) { - void *ptr; + SYSTEM_CPU_INFORMATION cpu_info; + void *ptr, *syscall_dispatcher; + + extern void __wine_syscall_dispatcher_xsave(void) DECLSPEC_HIDDEN; + + NtQuerySystemInformation( SystemCpuInformation, &cpu_info, sizeof(cpu_info), NULL ); + if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) + syscall_dispatcher = __wine_syscall_dispatcher_xsave; + else + syscall_dispatcher = __wine_syscall_dispatcher; /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ ptr = (char *)user_shared_data + page_size; anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); - *(void **)ptr = __wine_syscall_dispatcher; + *(void **)ptr = syscall_dispatcher; - return __wine_syscall_dispatcher; + return syscall_dispatcher; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 85bd31b8e08..0fddbaf6134 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1426,13 +1426,14 @@ static int cmp_link_name( const void *e1, const void *e2 ) /* output dispatcher for system calls */ -static void output_syscall_dispatcher( int count ) +static void output_syscall_dispatcher( int count, const char *variant ) { const unsigned int invalid_param = 0xc000000d; /* STATUS_INVALID_PARAMETER */ + const char *symbol = strmake( "__wine_syscall_dispatcher%s", variant ); output( "\t.align %d\n", get_alignment(4) ); - output( "\t%s\n", func_declaration("__wine_syscall_dispatcher") ); - output( "%s\n", asm_globl("__wine_syscall_dispatcher") ); + output( "\t%s\n", func_declaration(symbol) ); + output( "%s\n", asm_globl(symbol) ); output_cfi( ".cfi_startproc" ); switch (target_cpu) { @@ -1493,7 +1494,7 @@ static void output_syscall_dispatcher( int count ) output_cfi( ".cfi_def_cfa_register %%rbp" ); output( "\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpushfq\n" ); - output( "\tsubq $0x280,%%rsp\n" ); + output( "\tsubq $0x3c0,%%rsp\n" ); output( "\tandq $~63,%%rsp\n" ); output( "\tmovq %%rbx,-0x90(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rbx,-144" ); @@ -1520,14 +1521,29 @@ static void output_syscall_dispatcher( int count ) output( "\tmovw %%ss,-0x8(%%rbp)\n" ); output( "\tmovw %%gs,-0x6(%%rbp)\n" ); output( "\tmovq %%rsp,%%r12\n" ); - output( "\tfxsave64 (%%r12)\n" ); + output( "\tmovq %%rax,%%r11\n" ); + if (!*variant) + { + output( "\tfxsave64 (%%r12)\n" ); + } + else + { + output( "\tmovl $7,%%eax\n" ); + output( "\tmovq %%rdx,%%rsi\n" ); + output( "\txorq %%rdx,%%rdx\n" ); + output( "\tmovq %%rdx,0x200(%%r12)\n" ); + output( "\tmovq %%rdx,0x208(%%r12)\n" ); + output( "\tmovq %%rdx,0x210(%%r12)\n" ); + output( "\txsave64 (%%r12)\n" ); + output( "\tmovq %%rsi,%%rdx\n" ); + } output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ - output( "\tcmpq $%u,%%rax\n", count ); + output( "\tcmpq $%u,%%r11\n", count ); output( "\tjae 3f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); - output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); + output( "\tmovzbl (%%rcx,%%r11),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); output( "\tjbe 1f\n" ); output( "\tsubq %%rcx,%%rsp\n" ); @@ -1540,7 +1556,7 @@ static void output_syscall_dispatcher( int count ) output( "1:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); - output( "\tcallq *(%%r10,%%rax,8)\n" ); + output( "\tcallq *(%%r10,%%r11,8)\n" ); output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); output( "\tfxrstor64 (%%r12)\n" ); @@ -1682,7 +1698,7 @@ static void output_syscall_dispatcher( int count ) assert(0); } output_cfi( ".cfi_endproc" ); - output_function_size( "__wine_syscall_dispatcher" ); + output_function_size( symbol ); } @@ -1707,7 +1723,16 @@ void output_syscalls( DLLSPEC *spec ) if (unix_lib) { - output_syscall_dispatcher( count ); + output_syscall_dispatcher( count, "" ); + + switch( target_cpu ) + { + case CPU_x86_64: + output_syscall_dispatcher( count, "_xsave" ); + break; + default: + break; + } output( "\t.data\n" ); output( "\t.align %d\n", get_alignment( get_ptr_size() ) );

1 0

Jacek Caban : winebuild: Factor out output_syscall_dispatcher.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: a06d60bd5f614d0014f013e5a2cc38b7bd8754ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a06d60bd5f614d0014f013e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:08:51 2021 +0100 winebuild: Factor out output_syscall_dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 516 ++++++++++++++++++++++++----------------------- 1 file changed, 262 insertions(+), 254 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a06d60bd5f614d0014f0…

1 0

Jacek Caban : ntdll: Introduce signal_init_syscalls.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: a0a62463e3d1d053459a194e2e1bcc91bfbec0f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a62463e3d1d053459a194e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 19 19:08:48 2021 +0100 ntdll: Introduce signal_init_syscalls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 4 +++- dlls/ntdll/unix/signal_arm.c | 9 +++++++++ dlls/ntdll/unix/signal_arm64.c | 10 ++++++++++ dlls/ntdll/unix/signal_i386.c | 9 +++++++++ dlls/ntdll/unix/signal_x86_64.c | 17 +++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 6 ------ 7 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 8b1fd6edb7a..c4f897f3d0d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -104,6 +104,7 @@ void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NU void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); +static void *syscall_dispatcher; #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); @@ -883,7 +884,7 @@ static void load_ntdll_functions( HMODULE module ) if ((ptr = (void *)find_named_export( module, ntdll_exports, #name ))) *ptr = val; \ else ERR( "%s not found\n", #name ) - SET_PTR( __wine_syscall_dispatcher, __wine_syscall_dispatcher ); + SET_PTR( __wine_syscall_dispatcher, syscall_dispatcher ); #ifdef __i386__ SET_PTR( __wine_ldt_copy, &__wine_ldt_copy ); #endif @@ -1650,6 +1651,7 @@ static void start_main_thread(void) startup_info_size = server_init_process(); virtual_map_user_shared_data(); init_cpu_info(); + syscall_dispatcher = signal_init_syscalls(); init_files(); init_startup_info(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 385e4807990..2de58925c84 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -963,6 +963,15 @@ void signal_init_process(void) } +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 95042de45e1..9a36746f5bc 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1120,6 +1120,16 @@ void signal_init_process(void) exit(1); } + +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index f2d58dc654d..09529a1ea96 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2467,6 +2467,15 @@ void signal_init_process(void) } +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 892d208e43a..bed4958f251 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -34,6 +34,7 @@ #include <stdarg.h> #include <stdio.h> #include <sys/types.h> +#include <sys/mman.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -2787,6 +2788,22 @@ void signal_init_process(void) } +/********************************************************************** + * signal_init_syscalls + */ +void *signal_init_syscalls(void) +{ + void *ptr; + + /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ + ptr = (char *)user_shared_data + page_size; + anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); + *(void **)ptr = __wine_syscall_dispatcher; + + return __wine_syscall_dispatcher; +} + + /*********************************************************************** * init_thread_context */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1a864b6fb5d..65f526d0f7d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -208,6 +208,7 @@ extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; +extern void *signal_init_syscalls(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, void *thunk, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index c35f9c2fc07..3350dc665c1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2597,12 +2597,6 @@ TEB *virtual_alloc_first_teb(void) exit(1); } -#ifdef __x86_64__ /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ - ptr = (char *)user_shared_data + page_size; - anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); - *(void **)ptr = __wine_syscall_dispatcher; -#endif - NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
92
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 February 2021