wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Francois Gouget : testbot/cgi: Standardize access to the FormPage property descriptors.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: tools Branch: master Commit: 6d5e0b25b33feda5a0658a442b5c4752e2c9ec38 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6d5e0b25b33feda5a0658a4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 17:30:35 2022 +0200 testbot/cgi: Standardize access to the FormPage property descriptors. Note that this requires the list of property descriptors to always be set. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 9e34a73..2565c07 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -117,8 +117,7 @@ sub GetPropertyDescriptorByName($$) { my ($self, $Name) = @_; - my $PropertyDescriptors = $self->GetPropertyDescriptors(); - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) { if ($PropertyDescriptor->GetName() eq $Name) {

1 0

Francois Gouget : testbot/web: Use the property descriptors in the Activity page.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: tools Branch: master Commit: ba10f7463580848d383f7e6b5e3b629939b8cc1d URL: https://source.winehq.org/git/tools.git/?a=commit;h=ba10f7463580848d383f7e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 17:30:31 2022 +0200 testbot/web: Use the property descriptors in the Activity page. The whole point is to pass them to _initialize() so FormPage::Validate() can then do its job. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 272215f..d98f50a 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -45,7 +45,7 @@ sub _initialize($$$) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 3), ); - $self->SUPER::_initialize($Request, $RequiredRole); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); $self->{Method} = "get"; if (!$self->GetParam("Hours") or !$self->Validate() or

1 0

Francois Gouget : testbot/cgi: Remove the PageBase::SetCurrentSession() $Page parameter.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: tools Branch: master Commit: 78809ac6fe37b332b71e14bfe521b9c9e03d526e URL: https://source.winehq.org/git/tools.git/?a=commit;h=78809ac6fe37b332b71e14b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 17:29:12 2022 +0200 testbot/cgi: Remove the PageBase::SetCurrentSession() $Page parameter. It is unused and there is no indication it may be needed one day. With that change none of the 'session management' methods take a $Page parameter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 014324f..d587412 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -241,7 +241,7 @@ sub SetCurrentSession($$) { my ($self, $Session) = @_; - $self->{PageBase}->SetCurrentSession($self, $Session); + $self->{PageBase}->SetCurrentSession($Session); } sub Redirect($$) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index cab14e1..695dde3 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -224,9 +224,9 @@ sub GetCurrentSession($) return $self->{Session}; } -sub SetCurrentSession($$$) +sub SetCurrentSession($$) { - my ($self, $Page, $Session) = @_; + my ($self, $Session) = @_; $self->{Session} = $Session; if (! defined($Session))

1 0

Francois Gouget : testbot/cgi: PageBase::*Cookies() do not take a $Page parameter.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: tools Branch: master Commit: 34440654366951f7ed43863e25c55ab43ce73bde URL: https://source.winehq.org/git/tools.git/?a=commit;h=34440654366951f7ed43863… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 17:29:04 2022 +0200 testbot/cgi: PageBase::*Cookies() do not take a $Page parameter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 85e94b3..014324f 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -220,14 +220,14 @@ sub UnsetCookies($) { my ($self) = @_; - $self->{PageBase}->UnsetCookies($self); + $self->{PageBase}->UnsetCookies(); } sub SetCookies($) { my ($self) = @_; - $self->{PageBase}->SetCookies($self); + $self->{PageBase}->SetCookies(); } sub GetCurrentSession($)

1 0

Francois Gouget : testbot/cgi: Remove the Page parameter from PageBase's Redirect().
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: tools Branch: master Commit: 4a2fb45b2c6ae9b6b9b9bce256112ea233a898f9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4a2fb45b2c6ae9b6b9b9bce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 17:28:45 2022 +0200 testbot/cgi: Remove the Page parameter from PageBase's Redirect(). PageBase::Redirect() does not use the Page parameter and there is no reason for it to need that parameter since it has $self->{Request} and thus can already get any relevant HTTP request information. CheckSecurePage() only has a $Page parameter in order to pass it to Redirect() and the CheckSecurePage() callers never provide the $Page parameter anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d598880..85e94b3 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -248,7 +248,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - return $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($Location); } diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 20e8a2c..cab14e1 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -92,7 +92,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - exit($self->Redirect($Page, MakeSecureURL($LoginURL))); + exit($self->Redirect(MakeSecureURL($LoginURL))); } } @@ -253,9 +253,9 @@ sub SessionActive($) return !1; } -sub Redirect($$$) +sub Redirect($$) { - my ($self, $Page, $Location) = @_; + my ($self, $Location) = @_; $self->SetCookies(); if (substr($Location, 0, 4) ne "http") @@ -278,13 +278,13 @@ sub Redirect($$$) return 0; # a suitable exit code } -sub CheckSecurePage($$) +sub CheckSecurePage($) { - my ($self, $Page) = @_; + my ($self) = @_; if ($UseSSL && ! SecureConnection()) { - exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); + exit($self->Redirect(MakeSecureURL($ENV{"REQUEST_URI"}))); } }

1 0

Alexandre Julliard : Wine release 7.5
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: website Branch: master Commit: 7fbaa42a7bc53cddef8effdd8fd5ab6be72231d6 URL: https://source.winehq.org/git/website.git/?a=commit;h=7fbaa42a7bc53cddef8ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 21:28:40 2022 +0100 Wine release 7.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022032501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2022032501.xml b/news/en/2022032501.xml new file mode 100644 index 00000000..94b368ad --- /dev/null +++ b/news/en/2022032501.xml @@ -0,0 +1,18 @@ +<news> +<date>March 25, 2022</date> +<title>Wine 7.5 Released</title> +<body> + The Wine development release 7.5 is now available. + <a href="{$root}/announce/7.5">What's new</a> in this release: +<ul> + <li>ALSA driver converted to PE.</li> + <li>Locale database generated from Unicode CLDR.</li> + <li>HLSL compiler support with the bundled vkd3d.</li> + <li>Initial support for the OCSP protocol.</li> + <li>More cleanups to support 'long' type.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.5 : Alexandre Julliard : Release 7.5
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: refs/tags/wine-7.5 Tag: d816c0e87852bce6739ac51b29fa72e65ea9fae5 URL: https://source.winehq.org/git/wine.git/?a=tag;h=d816c0e87852bce6739ac51b29f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 21:26:21 2022 +0100 Release 7.5

1 0

Alexandre Julliard : Release 7.5.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 4bbb43d6c7ee824ff533628020c6309c4ff86c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bbb43d6c7ee824ff5336280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 21:26:21 2022 +0100 Release 7.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1044 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 467 insertions(+), 598 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4bbb43d6c7ee824ff533…

1 0

Eric Pouech : conhost: Support relative cursor positioning.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: bb05f13fd85543394c5b33011d69b8993a1d67b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb05f13fd85543394c5b3301… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 14:46:46 2022 +0100 conhost: Support relative cursor positioning. Also add fallback method when legacy console APIs where used. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 18 ++++++++++++++++++ programs/conhost/conhost.h | 1 + 2 files changed, 19 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 461adc05bcc..d494e3f53a5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -328,6 +328,12 @@ static void init_tty_output( struct console *console ) console->tty_cursor_visible = TRUE; } +/* no longer use relative cursor positionning (legacy API have been used) */ +static void enter_absolute_mode( struct console *console ) +{ + console->use_relative_cursor = 0; +} + static void scroll_to_cursor( struct screen_buffer *screen_buffer ) { unsigned int cursor_x = get_bounded_cursor_x( screen_buffer ); @@ -1920,13 +1926,17 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, if (screen_buffer->cursor_x != info->cursor_x || screen_buffer->cursor_y != info->cursor_y) { + struct console *console = screen_buffer->console; screen_buffer->cursor_x = info->cursor_x; screen_buffer->cursor_y = info->cursor_y; + if (console->use_relative_cursor) + set_tty_cursor_relative( console, screen_buffer->cursor_x, screen_buffer->cursor_y ); scroll_to_cursor( screen_buffer ); } } if (params->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) { + enter_absolute_mode( screen_buffer->console ); /* new screen-buffer cannot be smaller than actual window */ if (info->width < screen_buffer->win.right - screen_buffer->win.left + 1 || info->height < screen_buffer->win.bottom - screen_buffer->win.top + 1) @@ -1962,6 +1972,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, } if (params->mask & SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW) { + enter_absolute_mode( screen_buffer->console ); if (info->win_left < 0 || info->win_left > info->win_right || info->win_right >= screen_buffer->width || info->win_top < 0 || info->win_top > info->win_bottom || @@ -1980,6 +1991,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, } if (params->mask & SET_CONSOLE_OUTPUT_INFO_MAX_SIZE) { + enter_absolute_mode( screen_buffer->console ); screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } @@ -2085,6 +2097,7 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct char_info_t *dest; char *src; + enter_absolute_mode( screen_buffer->console ); if (*out_size == sizeof(SMALL_RECT) && !params->width) return STATUS_INVALID_PARAMETER; entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); @@ -2187,6 +2200,7 @@ static NTSTATUS read_output( struct screen_buffer *screen_buffer, const struct c unsigned int x, y, width; unsigned int i, count; + enter_absolute_mode( screen_buffer->console ); x = params->x; y = params->y; mode = params->mode; @@ -2265,6 +2279,7 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c TRACE( "(%u %u) mode %u\n", params->x, params->y, params->mode ); + enter_absolute_mode( screen_buffer->console ); if (params->y >= screen_buffer->height) return STATUS_SUCCESS; dest = screen_buffer->data + min( params->y * screen_buffer->width + params->x, screen_buffer->height * screen_buffer->width ); @@ -2318,6 +2333,7 @@ static NTSTATUS scroll_output( struct screen_buffer *screen_buffer, const struct RECT update_rect; SMALL_RECT clip; + enter_absolute_mode( screen_buffer->console ); xsrc = params->scroll.Left; ysrc = params->scroll.Top; w = params->scroll.Right - params->scroll.Left + 1; @@ -2736,6 +2752,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) if (code == IOCTL_CONDRV_INIT_OUTPUT) { TRACE( "initializing output %x\n", output ); + enter_absolute_mode( console ); if (console->active) create_screen_buffer( console, output, console->active->width, console->active->height ); else @@ -2862,6 +2879,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!wcscmp( argv[i], L"--unix")) { console.is_unix = 1; + console.use_relative_cursor = 1; headless = 1; continue; } diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 35876689419..8ca09bb80d0 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -78,6 +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 */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */

1 0

Eric Pouech : conhost: Correctly recompute start of edit line on ReadConsole.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 9198ca27d09c68c4e1f2bac4e0b9867632ee5ed7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9198ca27d09c68c4e1f2bac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 24 14:46:40 2022 +0100 conhost: Correctly recompute start of edit line on ReadConsole. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 11e97993fd8..461adc05bcc 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1426,8 +1426,8 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ if (offset > ctx->home_x) { int deltay; - offset -= ctx->home_x; - deltay = offset / console->active->width; + offset -= ctx->home_x + 1; + deltay = offset / console->active->width + 1; if (ctx->home_y >= deltay) ctx->home_y -= deltay; else

1 0

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 March 2022