July 2022 - Wine-devel - list.winehq.org

[PATCH v2] wpcap: Implement pcap_dispatch.
by Roman Pišl 06 Jul '22

06 Jul '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53104 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/wpcap/wpcap.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index a295819f7fe..1a245ab4917 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -99,15 +99,6 @@ const char * CDECL pcap_datalink_val_to_name( int link ) return ret; } -int CDECL pcap_dispatch( struct pcap *pcap, int count, - void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), - unsigned char *user ) -{ - /* FIXME: reimplement on top of pcap_next_ex */ - FIXME( "%p, %d, %p, %p: not implemented\n", pcap, count, callback, user ); - return -1; -} - void CDECL pcap_dump( unsigned char *user, const struct pcap_pkthdr_win32 *hdr, const unsigned char *packet ) { struct dump_params params = { user, hdr, packet }; @@ -543,6 +534,38 @@ const unsigned char * CDECL pcap_next( struct pcap *pcap, struct pcap_pkthdr_win return data; } +int CDECL pcap_dispatch( struct pcap *pcap, int count, + void (CALLBACK *callback)(unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char *), + unsigned char *user ) +{ + int processed = 0; + TRACE( "%p, %d, %p, %p\n", pcap, count, callback, user ); + + while (processed < count) + { + struct pcap_pkthdr_win32 *hdr = NULL; + const unsigned char *data = NULL; + + int ret = pcap_next_ex( pcap, &hdr, &data ); + + if (ret == 1) + processed++; + else if (ret == 0) + break; + else if (ret == -2) + { + if (processed == 0) return -2; + break; + } + else + return ret; + + (*callback)( user, hdr, data ); + } + + return processed; +} + static char *strdupWA( const WCHAR *src ) { char *dst; -- 2.30.2

2 1

[PATCH v6 0/7] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon 06 Jul '22

06 Jul '22

-- v6: qasf: Configure WMReader stream selection in asf_reader_init_stream. qasf: Configure WMReader stream format in asf_reader_init_stream. winegstreamer: Implement IWMOutputMediaProps_SetMediaType. wmvcore/tests: Add some IWMOutputMediaProps_SetMediaType tests. qasf: Implement ASF Reader filter init_stream and cleanup_stream. qasf: Implement ASF Reader filter pin DecideBufferSize. qasf: Implement ASF Reader filter pin_get_media_type. https://gitlab.winehq.org/wine/wine/-/merge_requests/140

2 13

[PATCH v3] sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.
by Dmitry Timoshkov 06 Jul '22

06 Jul '22

v3: Add more tests with leading zero. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/security.c | 22 +++++++++++++++++++--- dlls/sechost/security.c | 3 +++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ed91ccc39d3..a47c4b2d529 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4219,6 +4219,7 @@ static void test_ConvertStringSecurityDescriptor(void) BOOL ret; DWORD GLE; DWORD altGLE; + DWORD ace_Mask; } cssd[] = { { "D:(A;;GA;;;WD)", 0xdeadbeef, FALSE, ERROR_UNKNOWN_REVISION }, @@ -4239,9 +4240,11 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(D;;GA;;; WD)", SDDL_REVISION_1, TRUE }, { "D:(D;;GA;;;WD )", SDDL_REVISION_1, TRUE }, /* test ACE string access rights */ - { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE }, - { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE }, + { "D:(A;;GA;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_ALL }, + { "D:(A;;1;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, 1 }, + { "D:(A;;020000000000;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ }, + { "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE }, + { "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, TRUE, 0, 0, READ_CONTROL | DELETE | WRITE_DAC | WRITE_OWNER }, { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, @@ -4275,7 +4278,20 @@ static void test_ConvertStringSecurityDescriptor(void) (cssd[i].altGLE && GLE == cssd[i].altGLE), "(%02u) Unexpected last error %ld\n", i, GLE); if (ret) + { + if (cssd[i].ace_Mask) + { + ACCESS_ALLOWED_ACE *ace; + + acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + ok(acl->AclRevision == ACL_REVISION, "(%02u) Got %u\n", i, acl->AclRevision); + + ace = (ACCESS_ALLOWED_ACE *)(acl + 1); + ok(ace->Mask == cssd[i].ace_Mask, "(%02u) Expected %08lx, got %08lx\n", + i, cssd[i].ace_Mask, ace->Mask); + } LocalFree(pSD); + } } /* test behaviour with NULL parameters */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 6916b3ad662..8a8ca0f051a 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -903,6 +903,9 @@ static DWORD parse_ace_right( const WCHAR **string_ptr ) if (string[0] == '0' && string[1] == 'x') return wcstoul( string, (WCHAR **)string_ptr, 16 ); + if (iswdigit( string[0] )) + return wcstoul( string, (WCHAR **)string_ptr, 0 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) -- 2.36.1

2 2

[PATCH 0/1] MR352: cmd: Don't loop infinitely on NUL.
by Arek Hiler (＠ivyl) 06 Jul '22

06 Jul '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/352

3 8

[tools] testbot/cgi: Allow calling AddError() without an error.
by Francois Gouget 06 Jul '22

06 Jul '22

This simplifies error handling for APIs that just return an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1df5392930..a8268754ac 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -356,6 +356,7 @@ Sets the error message to be shown to the user. =item ErrMessage A message to be shown on the page that describes why the form data is invalid. This should include the display name of the field(s) that need to be fixed. +If this parameter is false the error message is not modified. =item ErrField If the error concerns a specific field, the name of that field. This can be @@ -363,6 +364,9 @@ used by the page to highlight the field that needs to be corrected. =back +Returns the ErrMessage parameter. This allows checking whether an error +was actually added. + =back =cut @@ -370,8 +374,12 @@ sub AddError($$;$) { my ($self, $ErrMessage, $ErrField) = @_; - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = $ErrField; + if ($ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + $self->{ErrField} = $ErrField; + } + return $ErrMessage; } # FIXME: For legacy code, to be removed. -- 2.30.2

1 0

[tools] testbot/web: Use AddError() on the special jobs page.
by Francois Gouget 06 Jul '22

06 Jul '22

This is better than direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/SpecialJobs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 2c0bbd1105..d8294c1aaf 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -234,7 +234,7 @@ sub OnSubmit($) if (@Errors) { - $self->{ErrMessage} = join("\n", @Errors); + $self->AddError(join("\n", @Errors)); return undef; } -- 2.30.2

1 0

[tools] testbot/cgi: Use AddError() instead of direct field access in ItemPage.
by Francois Gouget 06 Jul '22

06 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index cd40ba2e4b..3ec201d99c 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -176,8 +176,13 @@ sub Save($) return !1 if (!$self->SUPER::Save()); - (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return !defined $self->{ErrMessage}; + my ($_ErrKey, $ErrProperty, $ErrMessage) = $self->{Collection}->Save(); + if (defined $ErrMessage) + { + $self->AddError($ErrMessage, $ErrProperty); + return undef; + } + return 1; } 1; -- 2.30.2

1 0

[tools] testbot/web: Use AddError() in the failure details page.
by Francois Gouget 06 Jul '22

06 Jul '22

This is better than direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index 02803ed27a..b4226f60c5 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -203,7 +203,7 @@ sub OnAction($$) { if (!$self->{RW}) { - $self->{ErrMessage} = "Only admin users can create or modify failures"; + $self->AddError("Only admin users can create or modify failures"); return 0; } if (($self->{Item}->BugId || "") ne $self->GetParam("BugId")) -- 2.30.2

1 0

[tools] testbot/web: Use AddError() to set the item list action error.
by Francois Gouget 06 Jul '22

06 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailuresList.pl | 4 ++-- testbot/web/admin/UsersList.pl | 4 ++-- testbot/web/admin/VMsList.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index 2cb40c482e..d1f8de6d8e 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -138,8 +138,8 @@ sub OnItemAction($$$) my ($_ErrProperty, $ErrMessage) = $Failure->Save(); if (defined $ErrMessage) { - # Setting ErrField is only useful on form pages - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + # Setting the error field is only useful on form pages + $self->{EnclosingPage}->AddError($ErrMessage); return 0; } return 1; diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 5f9f47b46c..6fdb06d0cf 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -109,8 +109,8 @@ sub OnItemAction($$$) my ($_ErrProperty, $ErrMessage) = $User->Save(); if (defined $ErrMessage) { - # Setting ErrField is only useful on form pages - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + # Setting the error field is only useful on form pages + $self->{EnclosingPage}->AddError($ErrMessage); return 0; } diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 6c3ff2036f..3361c03fa3 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -52,8 +52,8 @@ sub OnItemAction($$$) my ($_ErrProperty, $ErrMessage) = $VM->Save(); if (defined $ErrMessage) { - # Setting ErrField is only useful on form pages - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + # Setting the error field is only useful on form pages + $self->{EnclosingPage}->AddError($ErrMessage); return 0; } return 1; -- 2.30.2

1 0

[tools] testbot/cgi: Highlight the name of the invalid field(s) on form errors.
by Francois Gouget 06 Jul '22

06 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 +++- testbot/web/WineTestBot.css | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index f2fd0f09cd..67b3fa00d3 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -432,7 +432,9 @@ sub GenerateField($$$$) { my ($self, $PropertyDescriptor, $Display, $Format) = @_; - print "<div class='ItemProperty'><label>", + my $Class = $self->IsErrField($PropertyDescriptor->GetName()) ? + " class='errorfield'" : ""; + print "<div class='ItemProperty'><label$Class>", $self->escapeHTML($self->GetDisplayName($PropertyDescriptor)), "</label>"; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 78d33f886d..fd6acac86d 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -377,6 +377,7 @@ pre margin-bottom: 2em; background-color: red; } +.errorfield { color: red; } .right { float: right; } -- 2.30.2

1 0