May 2022 - Wine-Devel - list.winehq.org

[PATCH] kernel32/tests: Fix the HAVE_SYS_INOTIFY_H checks.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus_udev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 6b4bf09a773..39573162afa 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1773,7 +1773,7 @@ NTSTATUS udev_bus_init(void *args) goto error; } -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H if (options.disable_udevd) monitor_fd = create_inotify(); if (monitor_fd < 0) options.disable_udevd = FALSE; #else @@ -1798,7 +1798,7 @@ NTSTATUS udev_bus_init(void *args) poll_count = 2; if (!options.disable_udevd) build_initial_deviceset_udevd(); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else build_initial_deviceset_direct(); #endif @@ -1841,7 +1841,7 @@ NTSTATUS udev_bus_wait(void *args) if (pfd[0].revents) { if (udev_monitor) process_monitor_event(udev_monitor); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else process_inotify_event(pfd[0].fd); #endif } -- 2.30.2

May 2, 2022

[PATCH] kernel32/tests: Fix a cpoy/paste error in an ok() message.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0f945f9c4fe..0bb3c57e782 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2192,7 +2192,7 @@ static void test_MoveFileW(void) ret = MoveFileW(source, dest); ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, - "CopyFileW: unexpected error %ld\n", GetLastError()); + "MoveFileW: unexpected error %ld\n", GetLastError()); ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError()); -- 2.30.2

May 2, 2022

[tools 2/2] testbot/cgi: Don't offer to save the item if no field is editable.

by Francois Gouget

This allows derived pages to offer a read-only view of the item details just by overriding DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 1b77eea01..8bea816b0 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -132,10 +132,7 @@ sub GetActions($) { my ($self) = @_; - my @Actions = @{$self->SUPER::GetActions()}; - push @Actions, "Save", "Cancel"; - - return \@Actions; + return $self->{HasRW} ? ["Save", "Cancel"] : []; } sub RedirectToList($) -- 2.30.2

May 2, 2022

[tools 1/2] testbot/cgi: Add an HasRW property to form pages.

by Francois Gouget

Derived pages can use it to determine whether the form has any editable field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index e286880fd..224bf3687 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -90,6 +90,7 @@ sub _initialize($$$$) $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; $self->{Method} = "post"; + $self->{HasRW} = !1; } =pod @@ -437,6 +438,7 @@ sub GenerateField($$$$) my $Value = $self->GetFormValue($PropertyDescriptor); if ($Display eq "rw") { + $self->{HasRW} = 1; print "<div class='ItemValue'>"; $self->GenerateValueInput($PropertyDescriptor, $Value, $Format); print "</div>"; -- 2.30.2

May 2, 2022

[tools] testbot/web: Standardise escaping of the job details page URLs.

by Francois Gouget

There is no need to call uri_escape() on integers. Also don't call escapeHTML() on simple URLs that contain no ampersand. But do call it any time they may contain one such as the return value of GetMoreInfoLink(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c04266330..748153f28 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,7 +91,7 @@ sub GenerateDataView($$$) my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "VM") { - print "<a href='#k", $self->escapeHTML($Row->{Item}->GetKey()), "'>"; + print "<a href='#k", $StepTask->GetKey(), "'>"; print $self->escapeHTML($StepTask->VM->Name); print "</a>"; } @@ -101,11 +101,9 @@ sub GenerateDataView($$$) if ($FileName and -r $FileName) { my $JobId = $self->{EnclosingPage}->GetJob()->Id; - my $URI = "/GetFile.pl?JobKey=" . uri_escape($JobId) . - "&StepKey=" . uri_escape($StepTask->StepNo); - print "<a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($StepTask->FileName); - print "</a>"; + my $URI = "/GetFile.pl?JobKey=$JobId&StepKey=". $StepTask->StepNo; + print "<a href='", $self->escapeHTML($URI), "'>", + $self->escapeHTML($StepTask->FileName), "</a>"; } else { @@ -371,7 +369,7 @@ sub GetMoreInfoLink($$$$;$) { my ($self, $LinkKey, $Label, $Set, $Value) = @_; - my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); + my $Url = $ENV{"SCRIPT_NAME"} ."?Key=$self->{JobId}"; my $Action = "Show". ($Set eq "Full" and $Label !~ /old/ ? " full" : ""); foreach my $Key (sort keys %{$self->{More}}) @@ -423,11 +421,11 @@ sub GenerateMoreInfoLink($$$$;$$) my $Html = "<a href='". $self->escapeHTML($Url) ."'$Title>$Action $Label</a>"; if (defined $Value) { - $Url = "/GetTaskFile.pl?Job=". uri_escape($self->{JobId}) - ."&Step=". uri_escape($StepTask->StepNo) - ."&Task=". uri_escape($StepTask->TaskNo) + $Url = "/GetTaskFile.pl?Job=$self->{JobId}" + ."&Step=". $StepTask->StepNo + ."&Task=". $StepTask->TaskNo ."&File=". uri_escape($Value); - $Html = "<a href='$Url'>↓</a> $Html"; + $Html = "<a href='". $self->escapeHTML($Url) ."'>↓</a> $Html"; } if ($Action eq "Hide") { @@ -585,11 +583,11 @@ EOF { if ($MoreInfo->{Screenshot}) { - my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($StepTask->StepNo) . - "&TaskKey=" . uri_escape($StepTask->TaskNo); - print "<div class='Screenshot'><img src='" . - $self->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; + my $URI = "/Screenshot.pl?JobKey=$self->{JobId}" + ."&StepKey=". $StepTask->StepNo + ."&TaskKey=". $StepTask->TaskNo; + print "<div class='Screenshot'><img src='", $self->escapeHTML($URI), + "' alt='Screenshot'/></div>\n"; } $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } @@ -665,7 +663,7 @@ EOF if (defined $LogInfo->{BadLog}) { my ($_Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); - print "<pre class='log-note'>The error summary is not available (<a href='$Url'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; + print "<pre class='log-note'>The error summary is not available (<a href='", $self->escapeHTML($Url), "'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; } elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) { -- 2.30.2

May 2, 2022

[tools] testbot/SetWinLocale: Copy the locales again after a revert.

by Francois Gouget

Most of the time the system and default user account locales are not impacted when the current account's --locale and --country locales are reverted after a reboot. But for some locales they are reverted too so that SetWinLocale needs to set them again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes creating the snapshots for the en-AE, mx-MX and pt-PT locales. --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e41af2088..0752df5ba 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -946,7 +946,7 @@ if ($OptReboot) if ($Reverted) { Warning("$Expected got reverted to $Reverted. Setting them again but this will not stick across reboots\n"); - SetWinLocales(undef, undef, $OptLocale, $CountryId, undef, undef, undef, undef); + SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, undef, undef, undef, undef); last; } sleep(2); -- 2.30.2

May 2, 2022

[PATCH 1/1] include/guiddef.h: use Mingw64's __uuidof when present

by Eric Pouech

From: Eric Pouech <eric.pouech(a)gmail.com> otherwise Wine's and Mingw64's __uuidof() enter in conflict (C++) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/guiddef.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 912fcea0cbe..5c8a1ab8a72 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -44,7 +44,11 @@ typedef struct _GUID /* Macros for __uuidof emulation */ #ifdef __cplusplus # if defined(__MINGW32__) -# define __WINE_UUID_ATTR __attribute__((selectany)) +/* Mingw64 can provide support for __uuidof and __CRT_UUID_DECL... use Mingw64's when present */ +# if !defined(__uuidof) +# define __WINE_UUID_ATTR __attribute__((selectany)) +# undef __CRT_UUID_DECL +# endif # elif defined(__GNUC__) # define __WINE_UUID_ATTR __attribute__((visibility("hidden"),weak)) # endif @@ -76,7 +80,7 @@ extern "C++" { #define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid -#else /* __WINE_UUID_ATTR */ +#elif !defined(__CRT_UUID_DECL) /* __WINE_UUID_ATTR */ #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/21

May 2, 2022

[PATCH 0/1] MR21: include/guiddef.h: use Mingw64's __uuidof when present

by eric pouech (＠epo)

otherwise Wine's and Mingw64's __uuidof() enter in conflict (C++) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/21

May 2, 2022

Re: [PATCH 8/9] wined3d: Store clear colors in subresources.

by Henri Verbeet

On Sun, 1 May 2022 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -2519,6 +2520,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont > begin_info.clearValueCount = 0; > for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) > { > + > if (!(view = state->fb.render_targets[i]) || view->format->id == WINED3DFMT_NULL) > continue; Stray newline.

May 2, 2022

Re: [PATCH 6/9] wined3d: Add a memory_colour_fill for clearing the entire level to zero.

by Henri Verbeet

On Sun, 1 May 2022 at 20:39, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + /* Fast and simple path for setting everything to zero. The C library's memset is > + * more sophisticated than our code below. Also this works for block formats, which > + * we still need to zero-initialize for newly created resources. */ > + if (!colour->r && !colour->g && !colour->b && !colour->a && > + !memcmp(box, &level_box, sizeof(*box))) > + { The "&&" should go to the start of the next line.

May 2, 2022