wine-devel April 2022

wine-devel@winehq.org

87 participants
938 discussions

[tools] testbot/web: Simplify linking patches to the job details pages.
by Francois Gouget 18 Apr '22

18 Apr '22

There is no need to call uri_escape() on integers. Also the URL is simple (no ampersand) and does not need to go through escapeHTML(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/PatchesList.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 943b9c5bb..48c8382e7 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -25,7 +25,6 @@ package PatchesBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use URI::Escape; use WineTestBot::Patches; @@ -54,9 +53,7 @@ sub GenerateDataView($$$) $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; - my $URI = "/JobDetails.pl?Key=" . uri_escape($JobId); - print "<a href='" . $self->escapeHTML($URI) . "'>" . - "Job " . $self->escapeHTML($JobId) . "</a>"; + print "<a href='/JobDetails.pl?Key=$JobId'>Job $JobId</a>"; } else { -- 2.30.2

1 0

[tools] testbot: Add User::AddRole().
by Francois Gouget 18 Apr '22

18 Apr '22

This simplifies adding a role to a user, particularly with regards to making sure the user's Roles collection is up to date. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Users.pm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index bd9cf358b..f2f2a199d 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -106,22 +106,25 @@ sub GenerateResetCode($) } } +sub AddRole($$) +{ + my ($self, $Role) = @_; + + my $UserRole = $self->Roles->Add(); + my $OldKey = $UserRole->GetKey(); + $UserRole->Role($Role); + $self->Roles->KeyChanged($OldKey, $Role->GetKey()); +} + sub AddDefaultRoles($) { my ($self) = @_; - my $UserRoles = $self->Roles; my $DefaultRoles = CreateRoles(); $DefaultRoles->AddFilter("IsDefaultRole", [1]); - foreach my $RoleKey (@{$DefaultRoles->GetKeys()}) + foreach my $Role (@{$DefaultRoles->GetItems()}) { - if (! defined($UserRoles->GetItem($RoleKey))) - { - my $NewRole = $UserRoles->Add(); - my $OldKey = $NewRole->GetKey(); - $NewRole->Role($DefaultRoles->GetItem($RoleKey)); - $UserRoles->KeyChanged($OldKey, $RoleKey); - } + $self->AddRole($Role) if (!$self->Roles->GetItem($Role->Name)); } } -- 2.30.2

1 0

[tools] testbot/cgi: Introduce ValueFormatter to handle value formatting.
by Francois Gouget 18 Apr '22

18 Apr '22

This allows sharing code between CollectionBlock and FormPage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 38 +++------- testbot/lib/ObjectModel/CGI/FormPage.pm | 11 +-- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 69 +++++++++++++++++++ 3 files changed, 82 insertions(+), 36 deletions(-) create mode 100644 testbot/lib/ObjectModel/CGI/ValueFormatter.pm diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 435c44e7f..36f1b0188 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -47,6 +47,8 @@ our @EXPORT = qw(new); use POSIX qw(strftime); use URI::Escape; +use ObjectModel::CGI::ValueFormatter; + =pod =over 12 @@ -280,35 +282,15 @@ sub GenerateDataView($$$) my $PropertyName = $PropertyDescriptor->GetName(); my $Value = $Row->{Item}->$PropertyName; - if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "DT" and defined $Value) { - # Note: This only supports single-key Itemrefs - foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) - { - if ($ValuePD->GetIsKey()) - { - $PropertyName = $ValuePD->GetName(); - print $self->escapeHTML($Value->$PropertyName); - return; - } - } - } - elsif ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - print $Value ? "Yes" : "No"; - return; - } - if ($PropertyDescriptor->GetType() eq "DT" and defined $Value) - { - print "<script type='text/javascript'></script><noscript><div>", - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), - "</div></noscript>\n"; - return; - } + print "<script type='text/javascript'></script><noscript><div>", + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), + "</div></noscript>\n"; + return; } print defined $Value ? $self->escapeHTML($Value) : " "; } diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 4f29efec7..7fd2f561e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -57,6 +57,8 @@ $MyFormPage->GeneratePage(); use ObjectModel::CGI::Page; our @ISA = qw(ObjectModel::CGI::Page); +use ObjectModel::CGI::ValueFormatter; + =pod =over 12 @@ -280,14 +282,7 @@ sub GenerateValueView($$$) { my ($self, $PropertyDescriptor, $Value) = @_; - if ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - print $Value ? "Yes" : "No"; - } - } - print defined $Value ? $self->escapeHTML($Value) : " "; + GenerateValueHTML($self, $PropertyDescriptor, $Value); } sub GetInputType($$) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm new file mode 100644 index 000000000..cad6eee1b --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -0,0 +1,69 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Generates HTML providing a user-readable representation of a given value +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::ValueFormatter; + +use Exporter 'import'; +our @EXPORT = qw(GenerateValueHTML); + + +=pod +=over 12 + +=item C<GenerateValueHTML()> + +Generates an HTML snippet representing the value in a user-readable form. + +The Parent parameter must point to a class that implements the escapeHTML() +method. + +=back +=cut + +sub GenerateValueHTML($$$); + +sub GenerateValueHTML($$$) +{ + my ($Parent, $PropertyDescriptor, $Value) = @_; + + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + return; + } + if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + { + # Note: This only supports single-key Itemrefs + foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) + { + if ($ValuePD->GetIsKey()) + { + my $PropertyName = $ValuePD->GetName(); + GenerateValueHTML($Parent, $ValuePD, $Value->$PropertyName); + return; + } + } + } + print defined $Value ? $Parent->escapeHTML($Value) : " "; +} + +1; -- 2.30.2

1 0

[PATCH v2] cmd/tests: Add tests for the magic environment variables.
by Francois Gouget 18 Apr '22

18 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Chop off the AM/PM time /t suffix. I'll resend the rest of the series once the base tests have proven they work for a while. --- programs/cmd/tests/test_builtins.cmd | 41 +++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 15 ++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..d4f4306391a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -585,7 +585,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo CD value %CD% echo %% echo P% echo %P @@ -1789,6 +1788,46 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +if defined cd (echo Has %%cd%%) else (echo Not defined) +echo CD value %CD% + +rem Some locales include the day-of-week either before or after the +rem day-month-year part. This makes it impossible to check the content of %date% +if defined date (echo Has %%date%%) else (echo Not defined) +set WINE_foo=%date:~9,1% +if defined WINE_foo (echo Good %%date%%) else (echo Too short) + +set WINE_before=%date% +for /f "usebackq tokens=*" %%i in (`date /t`) do set WINE_foo=%%i +set WINE_after=%date% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before% " (if not "%WINE_foo%"=="%WINE_after% " (echo date /t != %%date%%) else (echo Match)) else (echo Match) + +if defined errorlevel (echo Has %%errorlevel%%) else (echo Not defined) + +if defined time (echo Has %%time%%) else (echo Not defined) +set WINE_foo=%time:~7,1% +if defined WINE_foo (echo %%time%% has seconds) else (echo Too short) +set WINE_foo=%time:~10,1% +if defined WINE_foo (echo %%time%% has 1/100s) else (echo Too short) +set WINE_foo=%time:~11,1% +if not defined WINE_foo (echo End of %%time%%) else (echo Too long) + +rem %time% has a leading space instead of a zero so ignore the first character. +rem It is also in 24h mode while time /t may be in am/pm mode so ignore the +rem second character too. +set WINE_before=%time:~2,3% +for /f "usebackq tokens=*" %%i in (`time /t`) do set WINE_foo=%%i +set WINE_after=%time:~2,3% +set WINE_foo=%WINE_foo:~2,3% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before%" (if not "%WINE_foo%"=="%WINE_after%" (echo time /t != %%time:~2,3%%) else (echo Match)) else (echo Match) + +if defined random (echo Has %%random%%) else (echo Not defined) +set WINE_foo=%random% +if %WINE_foo% neq %random% (echo %%random%% looks random) else (echo Constant?) + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..15fda131a5c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -500,7 +500,6 @@ I'm here!@space@ ~dp0 should be directory containing batch file @drive@@path@ @drive@@path@ -CD value @pwd@@or_broken@CD value@space@ % P P @@ -1216,6 +1215,20 @@ WINE_foo correctly 7 WINE_foo correctly 8@or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6@or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +@todo_wine@Has %cd% +CD value @pwd@@or_broken@CD value@space@ +@todo_wine@Has %date% +@todo_wine@Good %date% +@todo_wine@Match +@todo_wine@Has %errorlevel% +@todo_wine@Has %time% +@todo_wine@%time% has seconds +@todo_wine@%time% has 1/100s +End of %time% +@todo_wine@Match +@todo_wine@Has %random% +%random% looks random --- for /F ------ string argument a -- 2.30.2

2 1

[PATCH 1/5] cmd/tests: Add tests for the magic environment variables.
by Francois Gouget 18 Apr '22

18 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 41 +++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 15 ++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..cc0b960a50a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -585,7 +585,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo CD value %CD% echo %% echo P% echo %P @@ -1789,6 +1788,46 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +if defined cd (echo Has %%cd%%) else (echo Not defined) +echo CD value %CD% + +rem Some locales include the day-of-week either before or after the +rem day-month-year part. This makes it impossible to check the content of %date% +if defined date (echo Has %%date%%) else (echo Not defined) +set WINE_foo=%date:~9,1% +if defined WINE_foo (echo Good %%date%%) else (echo Too short) + +set WINE_before=%date% +for /f "usebackq tokens=*" %%i in (`date /t`) do set WINE_foo=%%i +set WINE_after=%date% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before% " (if not "%WINE_foo%"=="%WINE_after% " (echo date /t != %%date%%) else (echo Match)) else (echo Match) + +if defined errorlevel (echo Has %%errorlevel%%) else (echo Not defined) + +if defined time (echo Has %%time%%) else (echo Not defined) +set WINE_foo=%time:~7,1% +if defined WINE_foo (echo %%time%% has seconds) else (echo Too short) +set WINE_foo=%time:~10,1% +if defined WINE_foo (echo %%time%% has 1/100s) else (echo Too short) +set WINE_foo=%time:~11,1% +if not defined WINE_foo (echo End of %%time%%) else (echo Too long) + +rem %time% has a leading space instead of a zero so ignore the first character. +rem It is also in 24h mode while time /t may be in am/pm mode so ignore the +rem second character too. +set WINE_before=%time:~2,3% +for /f "usebackq tokens=*" %%i in (`time /t`) do set WINE_foo=%%i +set WINE_after=%time:~2,3% +set WINE_foo=%WINE_foo:~2,99% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before%" (if not "%WINE_foo%"=="%WINE_after%" (echo time /t != %%time:~2,3%%) else (echo Match)) else (echo Match) + +if defined random (echo Has %%random%%) else (echo Not defined) +set WINE_foo=%random% +if %WINE_foo% neq %random% (echo %%random%% looks random) else (echo Constant?) + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..15fda131a5c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -500,7 +500,6 @@ I'm here!@space@ ~dp0 should be directory containing batch file @drive@@path@ @drive@@path@ -CD value @pwd@@or_broken@CD value@space@ % P P @@ -1216,6 +1215,20 @@ WINE_foo correctly 7 WINE_foo correctly 8@or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6@or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +@todo_wine@Has %cd% +CD value @pwd@@or_broken@CD value@space@ +@todo_wine@Has %date% +@todo_wine@Good %date% +@todo_wine@Match +@todo_wine@Has %errorlevel% +@todo_wine@Has %time% +@todo_wine@%time% has seconds +@todo_wine@%time% has 1/100s +End of %time% +@todo_wine@Match +@todo_wine@Has %random% +%random% looks random --- for /F ------ string argument a -- 2.30.2

2 10

[PATCH] template/en/default/index.html.tmpl: remove a couple dead links
by Austin English 17 Apr '22

17 Apr '22

Remove: * Add Bugzilla to Sidebar (requires a Mozilla browser like Mozilla Firefox) * Install the Quick Search plugin (requires Firefox 2 or Internet Explorer 7) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52802 Reported-By: Artem S. Tashkinov <aros(a)gmx.com> Signed-off-by: Austin English <austinenglish(a)gmail.com> --- template/en/default/index.html.tmpl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 7934785..e86f5ac 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -114,14 +114,6 @@ YAHOO.util.Event.onDOMReady(onLoadActions); [% IF Param('createemailregexp') && user.authorizer.user_can_create_account %] [% END %] [% END %] - - <ul> - <li id="bugsidebar"><a href="javascript:addSidebar()">Add [% terms.Bugzilla %] to Sidebar</a> (requires a Mozilla browser like Mozilla Firefox)</li> - <li id="quick_search_plugin"> - <a href="javascript:window.external.AddSearchProvider('[% urlbase FILTER html %]search_plugin.cgi')">Install - the Quick Search plugin</a> (requires Firefox 2 or Internet Explorer 7) - </li> - </ul> </div> </div> -- 2.35.1

1 0

[PATCH v3] ntdll: Implement reading multiple entries in NtQueryDirectoryObject.
by Zebediah Figura 16 Apr '22

16 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52585 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: fix a missing dereference in sizeof (thanks Jinoh Kang) dlls/ntdll/tests/om.c | 57 +++++++++----------- dlls/ntdll/unix/sync.c | 118 +++++++++++++++++++++++++++-------------- server/directory.c | 74 ++++++++++++++++++++------ server/object.c | 1 - server/protocol.def | 20 ++++--- server/trace.c | 34 ++++++++++++ 6 files changed, 209 insertions(+), 95 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2e03abd13ed..a4408b6e0e6 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2537,9 +2537,9 @@ static void test_query_directory(void) context = 0xdeadbeef; size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; @@ -2555,9 +2555,9 @@ static void test_query_directory(void) size = 0xdeadbeef; memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2653,37 +2653,31 @@ static void test_query_directory(void) memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); - todo_wine ok( !status, "got %#lx\n", status ); - if (!status) - { - ok( context == 2, "got context %#lx\n", context ); - check_unicode_string( &info[0].ObjectName, name1 ); - check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - check_unicode_string( &info[1].ObjectName, name2 ); - check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); - ok( !memcmp( &info[2], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); - } + ok( !status, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + check_unicode_string( &info[1].ObjectName, name2 ); + check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[2], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); needed_size = size; size = 0xdeadbeef; context = 0xdeadbeef; memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, needed_size - 1, FALSE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_MORE_ENTRIES, "got %#lx\n", status ); - if (status == STATUS_MORE_ENTRIES) - { - ok( context == 1, "got context %#lx\n", context ); - ok( size > 0 && size < needed_size, "got size %lu\n", size ); - check_unicode_string( &info[0].ObjectName, name1 ); - check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); - } + ok( status == STATUS_MORE_ENTRIES, "got %#lx\n", status ); + ok( context == 1, "got context %#lx\n", context ); + ok( size > 0 && size < needed_size, "got size %lu\n", size ); + check_unicode_string( &info[0].ObjectName, name1 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); size = 0xdeadbeef; context = 0xdeadbeef; memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(*info), FALSE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_MORE_ENTRIES + ok( status == STATUS_MORE_ENTRIES || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); if (status == STATUS_MORE_ENTRIES) { @@ -2695,7 +2689,7 @@ static void test_query_directory(void) size = 0xdeadbeef; context = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, FALSE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_MORE_ENTRIES + ok( status == STATUS_MORE_ENTRIES || broken(status == STATUS_BUFFER_TOO_SMALL) /* wow64 */, "got %#lx\n", status ); if (status == STATUS_MORE_ENTRIES) { @@ -2706,14 +2700,11 @@ static void test_query_directory(void) context = 1; memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); - todo_wine ok( !status, "got %#lx\n", status ); - if (!status) - { - ok( context == 2, "got context %#lx\n", context ); - check_unicode_string( &info[0].ObjectName, name2 ); - check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); - } + ok( !status, "got %#lx\n", status ); + ok( context == 2, "got context %#lx\n", context ); + check_unicode_string( &info[0].ObjectName, name2 ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); NtClose( child1 ); NtClose( child2 ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1695e6ed570..b17aad46c9f 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1095,57 +1095,95 @@ NTSTATUS WINAPI NtOpenDirectoryObject( HANDLE *handle, ACCESS_MASK access, const /************************************************************************** * NtQueryDirectoryObject (NTDLL.@) */ -NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATION *buffer, +NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATION *info, ULONG size, BOOLEAN single_entry, BOOLEAN restart, ULONG *context, ULONG *ret_size ) { + unsigned int i, count, total_len, pos, used_size, used_count; ULONG index = restart ? 0 : *context; - NTSTATUS ret; + struct directory_entry *buffer; + NTSTATUS status; + char *p; - if (single_entry) + if (!(buffer = malloc( size ))) return STATUS_NO_MEMORY; + + SERVER_START_REQ( get_directory_entries ) { - SERVER_START_REQ( get_directory_entry ) + req->handle = wine_server_obj_handle( handle ); + req->index = index; + req->max_count = single_entry ? 1 : UINT_MAX; + wine_server_set_reply( req, buffer, size ); + status = wine_server_call( req ); + count = reply->count; + total_len = reply->total_len; + } + SERVER_END_REQ; + + if (status && status != STATUS_MORE_ENTRIES) + { + free( buffer ); + return status; + } + + used_count = 0; + used_size = sizeof(*info); /* null terminator */ + for (i = pos = 0; i < count; ++i) + { + const struct directory_entry *entry = (const struct directory_entry *)((char *)buffer + pos); + unsigned int entry_size = sizeof(*info) + entry->name_len + entry->type_len + 2 * sizeof(WCHAR); + + if (used_size + entry_size > size) { - req->handle = wine_server_obj_handle( handle ); - req->index = index; - if (size >= 2 * sizeof(*buffer) + 2 * sizeof(WCHAR)) - wine_server_set_reply( req, buffer + 2, size - 2 * sizeof(*buffer) - 2 * sizeof(WCHAR) ); - if (!(ret = wine_server_call( req ))) - { - buffer->ObjectName.Buffer = (WCHAR *)(buffer + 2); - buffer->ObjectName.Length = reply->name_len; - buffer->ObjectName.MaximumLength = reply->name_len + sizeof(WCHAR); - buffer->ObjectTypeName.Buffer = (WCHAR *)(buffer + 2) + reply->name_len/sizeof(WCHAR) + 1; - buffer->ObjectTypeName.Length = wine_server_reply_size( reply ) - reply->name_len; - buffer->ObjectTypeName.MaximumLength = buffer->ObjectTypeName.Length + sizeof(WCHAR); - /* make room for the terminating null */ - memmove( buffer->ObjectTypeName.Buffer, buffer->ObjectTypeName.Buffer - 1, - buffer->ObjectTypeName.Length ); - buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; - buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; - - memset( &buffer[1], 0, sizeof(buffer[1]) ); - - *context = index + 1; - } - else if (ret == STATUS_NO_MORE_ENTRIES) - { - if (size > sizeof(*buffer)) - memset( buffer, 0, sizeof(*buffer) ); - if (ret_size) *ret_size = sizeof(*buffer); - } - - if (ret_size && (!ret || ret == STATUS_BUFFER_TOO_SMALL)) - *ret_size = 2 * sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); + status = STATUS_MORE_ENTRIES; + break; } - SERVER_END_REQ; + used_count++; + used_size += entry_size; + pos += sizeof(*entry) + ((entry->name_len + entry->type_len + 3) & ~3); } - else + + p = (char *)&info[used_count + 1]; /* after the null terminator */ + for (i = pos = 0; i < used_count; ++i) { - FIXME("multiple entries not implemented\n"); - ret = STATUS_NOT_IMPLEMENTED; + const struct directory_entry *entry = (const struct directory_entry *)((char *)buffer + pos); + + info[i].ObjectName.Buffer = (WCHAR *)p; + info[i].ObjectName.Length = entry->name_len; + info[i].ObjectName.MaximumLength = entry->name_len + sizeof(WCHAR); + memcpy( p, (entry + 1), entry->name_len ); + info[i].ObjectName.Buffer[entry->name_len / sizeof(WCHAR)] = 0; + p += entry->name_len + sizeof(WCHAR); + + info[i].ObjectTypeName.Buffer = (WCHAR *)p; + info[i].ObjectTypeName.Length = entry->type_len; + info[i].ObjectTypeName.MaximumLength = entry->type_len + sizeof(WCHAR); + memcpy( p, (char *)(entry + 1) + entry->name_len, entry->type_len ); + info[i].ObjectTypeName.Buffer[entry->type_len / sizeof(WCHAR)] = 0; + p += entry->type_len + sizeof(WCHAR); + + pos += sizeof(*entry) + ((entry->name_len + entry->type_len + 3) & ~3); } - return ret; + + if (size >= sizeof(*info)) + memset( &info[used_count], 0, sizeof(info[used_count]) ); + + free( buffer ); + + if (!count && !status) + { + if (ret_size) *ret_size = sizeof(*info); + return STATUS_NO_MORE_ENTRIES; + } + + if (single_entry && !used_count) + { + if (ret_size) *ret_size = 2 * sizeof(*info) + 2 * sizeof(WCHAR) + total_len; + return STATUS_BUFFER_TOO_SMALL; + } + + *context = index + used_count; + if (ret_size) *ret_size = (char *)p - (char *)info; + return status; } diff --git a/server/directory.c b/server/directory.c index 23d7eb0a2b7..30636b93a83 100644 --- a/server/directory.c +++ b/server/directory.c @@ -533,32 +533,76 @@ DECL_HANDLER(open_directory) } /* get a directory entry by index */ -DECL_HANDLER(get_directory_entry) +DECL_HANDLER(get_directory_entries) { struct directory *dir = (struct directory *)get_handle_obj( current->process, req->handle, DIRECTORY_QUERY, &directory_ops ); if (dir) { - struct object *obj = find_object_index( dir->entries, req->index ); - if (obj) + struct directory_entry *entry; + struct object *obj; + data_size_t size; + unsigned int i; + char *buffer; + + reply->total_len = 0; + + size = 0; + for (i = 0; i < req->max_count; ++i) { + const struct unicode_str *type_name; data_size_t name_len; - const struct unicode_str *type_name = &obj->ops->type->name; - const WCHAR *name = get_object_name( obj, &name_len ); + size_t entry_size; - reply->total_len = name_len + type_name->len; + if (!(obj = find_object_index( dir->entries, req->index + i ))) + break; + type_name = &obj->ops->type->name; + get_object_name( obj, &name_len ); + entry_size = (sizeof(*entry) + name_len + type_name->len + 3) & ~3; + reply->total_len += name_len + type_name->len; + release_object( obj ); - if (reply->total_len <= get_reply_max_size()) + if (size + entry_size > get_reply_max_size()) { - void *ptr = set_reply_data_size( reply->total_len ); - if (ptr) - { - reply->name_len = name_len; - memcpy( ptr, name, name_len ); - memcpy( (char *)ptr + name_len, type_name->str, type_name->len ); - } + set_error( STATUS_MORE_ENTRIES ); + break; + } + size += entry_size; + } + reply->count = i; + + if (!(buffer = set_reply_data_size( size ))) + { + release_object( dir ); + return; + } + + size = 0; + for (i = 0; i < reply->count; ++i) + { + const struct unicode_str *type_name; + data_size_t name_len; + const WCHAR *name; + + obj = find_object_index( dir->entries, req->index + i ); + assert( obj ); + type_name = &obj->ops->type->name; + name = get_object_name( obj, &name_len ); + + entry = (struct directory_entry *)(buffer + size); + entry->name_len = name_len; + entry->type_len = type_name->len; + + size += sizeof(*entry); + memcpy( buffer + size, name, name_len ); + size += name_len; + memcpy( buffer + size, type_name->str, type_name->len ); + size += type_name->len; + if (size & 3) + { + memset( buffer + size, 0, 4 - (size & 3) ); + size += 4 - (size & 3); } - else set_error( STATUS_BUFFER_TOO_SMALL ); release_object( obj ); } diff --git a/server/object.c b/server/object.c index 907bc087444..84c8e70e6a2 100644 --- a/server/object.c +++ b/server/object.c @@ -485,7 +485,6 @@ struct object *find_object_index( const struct namespace *namespace, unsigned in if (!index--) return grab_object( ptr->obj ); } } - set_error( STATUS_NO_MORE_ENTRIES ); return NULL; } diff --git a/server/protocol.def b/server/protocol.def index 9b7b99ae86a..bb619195d0c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -847,6 +847,14 @@ typedef struct lparam_t info; } cursor_pos_t; +struct directory_entry +{ + data_size_t name_len; + data_size_t type_len; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(type,unicode_str,type_len); */ +}; + /****************************************************************/ /* Request declarations */ @@ -3270,15 +3278,15 @@ struct handle_info @END -/* Get a directory entry by index */ -@REQ(get_directory_entry) +/* Get directory entries */ +@REQ(get_directory_entries) obj_handle_t handle; /* handle to the directory */ - unsigned int index; /* entry index */ + unsigned int index; /* index of first entry */ + unsigned int max_count; /* maximum number of entries to return */ @REPLY data_size_t total_len; /* total length needed for strings */ - data_size_t name_len; /* length of the entry name in bytes */ - VARARG(name,unicode_str,name_len); /* entry name */ - VARARG(type,unicode_str); /* entry type */ + unsigned int count; /* number of entries returned */ + VARARG(entries,directory_entries); @END diff --git a/server/trace.c b/server/trace.c index d71561e1247..d3866b088ce 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1349,6 +1349,40 @@ static void dump_varargs_handle_infos( const char *prefix, data_size_t size ) fputc( '}', stderr ); } +static void dump_varargs_directory_entries( const char *prefix, data_size_t size ) +{ + fprintf( stderr, "%s{", prefix ); + while (size) + { + const struct directory_entry *entry = cur_data; + data_size_t entry_size; + const char *next; + + if (size < sizeof(*entry) || + (size - sizeof(*entry) < entry->name_len) || + (size - sizeof(*entry) - entry->name_len < entry->type_len)) + { + fprintf( stderr, "***invalid***}" ); + remove_data( size ); + return; + } + + next = (const char *)(entry + 1); + fprintf( stderr, "{name=L\"" ); + dump_strW( (const WCHAR *)next, entry->name_len, stderr, "\"\"" ); + next += entry->name_len; + fprintf( stderr, "\",type=L\"" ); + dump_strW( (const WCHAR *)next, entry->type_len, stderr, "\"\"" ); + fprintf( stderr, "\"}" ); + + entry_size = min( size, (sizeof(*entry) + entry->name_len + entry->type_len + 3) & ~3 ); + size -= entry_size; + remove_data( entry_size ); + if (size) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + typedef void (*dump_func)( const void *req ); /* Everything below this line is generated automatically by tools/make_requests */ -- 2.34.1

2 1

[PATCH] include: Remove duplicate definitions of UOI_* macros.
by Jinoh Kang 16 Apr '22

16 Apr '22

Commit 5ec458fd41f (Add declarations for GetClassLongPtr{A,W}, GCLP_* defines and user object information defines., 2004-10-14) inadvertently introduced duplicate definitions of UOI_* macros. While multiple identical definitions of a macro do not cause compilation problems, deduplicating them faciliates future expansion of UOI_* constants. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winuser.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 4f79face860..f9af7db0331 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2874,12 +2874,6 @@ typedef struct { #define DSS_PREFIXONLY 0x0400 #define DSS_RIGHT 0x8000 -/* UserObjectInformation classes */ -#define UOI_FLAGS 1 -#define UOI_NAME 2 -#define UOI_TYPE 3 -#define UOI_USER_SID 4 - /* Sent as the lParam of a WM_DRAWITEM message to instruct how an * owner drawn control is to be drawn */ -- 2.34.1

1 0

[PATCH] conhost: Fix the spelling of a couple of comments.
by Francois Gouget 16 Apr '22

16 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/conhost/conhost.c | 2 +- programs/conhost/conhost.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6ea64395e1a..792daeb520f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -328,7 +328,7 @@ static void init_tty_output( struct console *console ) console->tty_cursor_visible = TRUE; } -/* no longer use relative cursor positionning (legacy API have been used) */ +/* no longer use relative cursor positioning (legacy API have been used) */ static void enter_absolute_mode( struct console *console ) { console->use_relative_cursor = 0; diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 65cf5d39ebd..9f2a90cd510 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -78,7 +78,7 @@ struct console unsigned int mode; /* input mode */ struct screen_buffer *active; /* active screen buffer */ int is_unix; /* UNIX terminal mode */ - int use_relative_cursor; /* use relative cursor positionning */ + int use_relative_cursor; /* use relative cursor positioning */ int no_window; /* don't create console window */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ -- 2.30.2

1 0

[PATCH] winegstreamer: Fix the spelling of a comment.
by Francois Gouget 16 Apr '22

16 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winegstreamer/wg_transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0327b92ce8e..49c7bfaa927 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -218,7 +218,7 @@ NTSTATUS wg_transform_create(void *args) { case WG_MAJOR_TYPE_H264: /* Call of Duty: Black Ops 3 doesn't care about the ProcessInput/ProcessOutput - * return values, it calls them in a specific order and and expects the decoder + * return values, it calls them in a specific order and expects the decoder * transform to be able to queue its input buffers. We need to use a buffer list * to match its expectations. */ -- 2.30.2

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
94
Older →

Jump to page:

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-devel April 2022