April 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Move NtUserCloseClipboard implementation from user32.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 22de82978eafef97b84248203503e284ca557783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22de82978eafef97b8424820… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:11:25 2022 +0200 win32u: Move NtUserCloseClipboard implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 25 ------------------------- dlls/user32/edit.c | 4 ++-- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 25 +++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 9 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index b45ddf9c7c0..64b1ba2fe17 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -674,31 +674,6 @@ BOOL WINAPI OpenClipboard( HWND hwnd ) } -/************************************************************************** - * CloseClipboard (USER32.@) - */ -BOOL WINAPI CloseClipboard(void) -{ - HWND viewer = 0, owner = 0; - BOOL ret; - - TRACE( "\n" ); - - SERVER_START_REQ( close_clipboard ) - { - if ((ret = !wine_server_call_err( req ))) - { - viewer = wine_server_ptr_handle( reply->viewer ); - owner = wine_server_ptr_handle( reply->owner ); - } - } - SERVER_END_REQ; - - if (viewer) SendNotifyMessageW( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); - return ret; -} - - /************************************************************************** * EmptyClipboard (USER32.@) * Empties and acquires ownership of the clipboard diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 02ed19dffd5..4037ea7b1c1 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3107,7 +3107,7 @@ static void EDIT_WM_Paste(EDITSTATE *es) /* clear selected text in password edit box even with empty clipboard */ EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); } - CloseClipboard(); + NtUserCloseClipboard(); } @@ -3136,7 +3136,7 @@ static void EDIT_WM_Copy(EDITSTATE *es) OpenClipboard(es->hwndSelf); EmptyClipboard(); SetClipboardData(CF_UNICODETEXT, hdst); - CloseClipboard(); + NtUserCloseClipboard(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 2c4dba5cd86..b8b27ff49ba 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -73,7 +73,7 @@ @ stub ClientThreadSetup @ stdcall ClientToScreen(long ptr) @ stdcall -import ClipCursor(ptr) NtUserClipCursor -@ stdcall CloseClipboard() +@ stdcall CloseClipboard() NtUserCloseClipboard @ stdcall CloseDesktop(long) NtUserCloseDesktop @ stdcall CloseTouchInputHandle(long) @ stdcall CloseWindow(long) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 585a2aae631..8ab915d5931 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -76,6 +76,31 @@ static const char *debugstr_format( UINT id ) } } +/************************************************************************** + * NtUserCloseClipboard (win32u.@) + */ +BOOL WINAPI NtUserCloseClipboard(void) +{ + HWND viewer = 0, owner = 0; + BOOL ret; + + TRACE( "\n" ); + + SERVER_START_REQ( close_clipboard ) + { + if ((ret = !wine_server_call_err( req ))) + { + viewer = wine_server_ptr_handle( reply->viewer ); + owner = wine_server_ptr_handle( reply->owner ); + } + } + SERVER_END_REQ; + + if (viewer) NtUserMessageCall( viewer, WM_DRAWCLIPBOARD, (WPARAM)owner, 0, + 0, FNID_SENDNOTIFYMESSAGE, FALSE ); + return ret; +} + /************************************************************************** * NtUserCountClipboardFormats (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 1a569048f69..0679715c8fd 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1159,6 +1159,7 @@ static struct unix_funcs unix_funcs = NtUserCallTwoParam, NtUserChangeDisplaySettings, NtUserClipCursor, + NtUserCloseClipboard, NtUserCountClipboardFormats, NtUserCreateWindowEx, NtUserDeferWindowPosAndBand, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 295f4780d71..6f75b802a51 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -793,7 +793,7 @@ @ stub NtUserChildWindowFromPointEx @ stub NtUserClearForeground @ stdcall NtUserClipCursor(ptr) -@ stub NtUserCloseClipboard +@ stdcall NtUserCloseClipboard() @ stdcall -syscall NtUserCloseDesktop(long) @ stdcall -syscall NtUserCloseWindowStation(long) @ stub NtUserCompositionInputSinkLuidFromPoint diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7677747b6f0..874cc92f4d4 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -194,6 +194,7 @@ struct unix_funcs LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); BOOL (WINAPI *pNtUserClipCursor)( const RECT *rect ); + BOOL (WINAPI *pNtUserCloseClipboard)(void); INT (WINAPI *pNtUserCountClipboardFormats)(void); HWND (WINAPI *pNtUserCreateWindowEx)( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 63018dcb063..4a4ed00ef58 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -749,6 +749,12 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return unix_funcs->pNtUserCallHwndParam( hwnd, param, code ); } +BOOL WINAPI NtUserCloseClipboard(void) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserCloseClipboard(); +} + LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { diff --git a/include/ntuser.h b/include/ntuser.h index 3de271a7174..53c8fb17139 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -507,6 +507,7 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); BOOL WINAPI NtUserClipCursor( const RECT *rect ); +BOOL WINAPI NtUserCloseClipboard(void); BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); INT WINAPI NtUserCopyAcceleratorTable( HACCEL src, ACCEL *dst, INT count );

1 0

Mohamad Al-Jaf : wusa: Support wow64 architecture identifier.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 3b851296026e63d33ee7cec38eed4bc24abeeade URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b851296026e63d33ee7cec3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 6 13:18:07 2022 +0200 wusa: Support wow64 architecture identifier. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..53534628c31 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -477,6 +477,14 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) return TRUE; } +static BOOL assembly_is_wow64(const struct assembly_entry *assembly) +{ +#ifdef __x86_64__ + return !wcsicmp(assembly->identity.architecture, L"x86") || !wcsicmp(assembly->identity.architecture, L"wow64"); +#endif + return FALSE; +} + static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; @@ -484,25 +492,19 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; + if (assembly_is_wow64(assembly)) csidl = CSIDL_SYSTEMX86; + else csidl = CSIDL_SYSTEM; } else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; else if (!wcsicmp(key, L"runtime.programfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILESX86; + else csidl = CSIDL_PROGRAM_FILES; } else if (!wcsicmp(key, L"runtime.commonfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILES_COMMONX86; + else csidl = CSIDL_PROGRAM_FILES_COMMON; } #ifdef __x86_64__ else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86;

1 0

Hans Leidekker : cryptnet: Support verifying certificate revocation with OCSP.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 60e10a057168847fadf0fd70e0bc49f53ebcc052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60e10a057168847fadf0fd70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:15:32 2022 +0200 cryptnet: Support verifying certificate revocation with OCSP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/Makefile.in | 2 +- dlls/cryptnet/cryptnet_main.c | 391 +++++++++++++++++++++++++++++++++++++++--- include/wincrypt.h | 4 + 3 files changed, 375 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60e10a057168847fadf0…

1 0

Huw Davies : combase: Don't start dllhost if the CLSID key doesn't exist.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 2192f2de1b983d7e05f2251096c733dbcf56a8b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2192f2de1b983d7e05f22510… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 15:22:29 2022 +0100 combase: Don't start dllhost if the CLSID key doesn't exist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/rpc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index f620339f19e..c8401fe0cbd 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -538,6 +538,12 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + hr = open_key_for_clsid(rclsid, NULL, KEY_READ, &key); + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + hr = open_key_for_clsid(rclsid, NULL, opposite | KEY_READ, &key); + if (FAILED(hr)) return hr; + RegCloseKey(key); + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) {

1 0

Andrew Eikum : evr/presenter: Fix hns-to-msec conversion multiplier.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 09572681038c344c9ebf15705f4ac4b47ea1589d URL: https://source.winehq.org/git/wine.git/?a=commit;h=09572681038c344c9ebf1570… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 6 17:41:57 2022 +0300 evr/presenter: Fix hns-to-msec conversion multiplier. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 7e14cb2f720..1b119ce9cab 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -548,7 +548,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter, if (delta > 3 * presenter->frame_time_threshold) { /* Convert 100ns -> msec */ - wait = (delta - 3 * presenter->frame_time_threshold) / 100000; + wait = (delta - 3 * presenter->frame_time_threshold) / 10000; present = FALSE; } }

1 0

Andrew Eikum : evr/presenter: Place early samples back to the front of the queue.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 2bf3a585185d4e594793d87bb93b364a4c772bf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bf3a585185d4e594793d87b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 6 17:41:58 2022 +0300 evr/presenter: Place early samples back to the front of the queue. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 1b119ce9cab..e70e25a19a7 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -429,15 +429,20 @@ static HRESULT video_presenter_sample_queue_init(struct video_presenter *present return S_OK; } -static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample) +static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample, + BOOL at_front) { struct sample_queue *queue = &presenter->thread.queue; + unsigned int idx; EnterCriticalSection(&presenter->cs); if (queue->used != queue->size) { - queue->back = (queue->back + 1) % queue->size; - queue->samples[queue->back] = sample; + if (at_front) + idx = queue->front = (queue->size + queue->front - 1) % queue->size; + else + idx = queue->back = (queue->back + 1) % queue->size; + queue->samples[idx] = sample; queue->used++; IMFSample_AddRef(sample); } @@ -556,7 +561,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter, if (present) video_presenter_sample_present(presenter, sample); else - video_presenter_sample_queue_push(presenter, sample); + video_presenter_sample_queue_push(presenter, sample, TRUE); IMFSample_Release(sample); @@ -580,7 +585,7 @@ static void video_presenter_schedule_sample(struct video_presenter *presenter, I if (presenter->clock) { - video_presenter_sample_queue_push(presenter, sample); + video_presenter_sample_queue_push(presenter, sample, FALSE); PostThreadMessageW(presenter->thread.tid, EVRM_PRESENT, 0, 0); } else

1 0

Francois Gouget : testbot/LibvirtTool: Use SetWinLocale's --vm option.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: tools Branch: master Commit: 7285b93ccb1b57c30cd2ab461241bed5e2b9ba9f URL: https://source.winehq.org/git/tools.git/?a=commit;h=7285b93ccb1b57c30cd2ab4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 6 14:17:20 2022 +0200 testbot/LibvirtTool: Use SetWinLocale's --vm option. This ensures SetWinLocale will use the right options to connect to the VM's TestAgentd server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index bd676f0..33760d3 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -719,7 +719,9 @@ sub CreateSnapshot($$$$) if (@Locale) { Debug(Elapsed($Start), " Setting up the @Locale locale on $VMKey\n"); - my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname); + # Use the --vm option to make sure SetWinLocale uses the right TestAgent + # connection parameters: port, ssh tunneling, etc. + my @Cmd = ("$BinDir/SetWinLocale", "--vm", $VMKey); if ($Config->{locale}) { push @Cmd, "--default", $Config->{locale};

1 0

Francois Gouget : testbot/cgi: Let CollectionBlock operate in read-only mode.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: tools Branch: master Commit: babda62efde5ad100101e5506167dc37e38728e6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=babda62efde5ad100101e55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 6 14:18:36 2022 +0200 testbot/cgi: Let CollectionBlock operate in read-only mode. When in read-only mode the CollectionBlock does not allow any per-item or global action to be performed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 39 ++++++++++++++++++++++---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 +++++ testbot/web/PatchesList.pl | 13 +-------- testbot/web/index.pl | 32 ++------------------- 4 files changed, 43 insertions(+), 48 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 40ad61b..13c2a62 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -53,7 +53,7 @@ use URI::Escape; =item C<new()> -Creates a table showing the content of the specified Collection with +Creates a table showing the content of the specified Collection with optional support for performing actions on selected rows, or performing global actions. Parameters: @@ -67,6 +67,8 @@ ObjectModel::CGI::Page interface. =back +Note that by default the table is in read-write mode (see SetReadWrite()). + =back =cut @@ -76,7 +78,9 @@ sub new($$$@) my ($Collection, $EnclosingPage) = @_; my $self = {Collection => $Collection, - EnclosingPage => $EnclosingPage}; + EnclosingPage => $EnclosingPage, + RW => 1, + }; $self = bless $self, $class; $self->_initialize(@_); return $self; @@ -92,6 +96,28 @@ sub Create($$@) return ObjectModel::CGI::CollectionBlock->new(@_); } +=pod +=over 12 + +=item C<SetReadWrite()> + +If set to true, the table allows selecting rows and applying actions to +them (see GetItemActions()), as well as performing global actions (see +GetActions()). + +Otherwise none of this is allowed, regardless of what GetItemActions() and +GetActions() return. + +=back +=cut + +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{RW} = $RW; +} + sub GetDetailsPage($) { my ($self) = @_; @@ -405,7 +431,7 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $ItemActions = $self->GetItemActions(); + my $ItemActions = $self->{RW} ? $self->GetItemActions() : []; $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; @@ -459,7 +485,7 @@ EOF print "</div>\n"; } - my $Actions = $self->GetActions(); + my $Actions = $self->{RW} ? $self->GetActions() : []; if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -499,6 +525,7 @@ column of checkboxes is added. sub GetItemActions($) { #my ($self) = @_; + return ["Delete"]; } @@ -523,7 +550,7 @@ sub OnItemAction($$$) { my ($self, $Item, $Action) = @_; - if ($Action eq "Delete") + if ($self->{RW} and $Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); if (defined $ErrMessage) @@ -587,7 +614,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "Add " . $self->{Collection}->GetItemName()) + if ($self->{RW} and $Action eq "Add ". $self->{Collection}->GetItemName()) { my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 2de667b..7bdd27e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -87,6 +87,13 @@ sub _initialize($$$$;$) $self->SUPER::_initialize($Request, $RequiredRole); } +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{CollectionBlock}->SetReadWrite($RW); +} + # # HTML page generation diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 49e16d8..854c276 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -64,18 +64,6 @@ sub GenerateDataCell($$$$$) } } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - package main; @@ -84,5 +72,6 @@ use WineTestBot::Patches; my $Request = shift; my $Page = ObjectModel::CGI::CollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); +$Page->SetReadWrite(0); $Page->SetRefreshInterval(60); $Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d2dd2b4..85f8df3 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -43,18 +43,6 @@ sub SortKeys($$) return \@SortedKeys; } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -207,18 +195,6 @@ sub SortKeys($$) return $self->{Collection}->SortKeysBySortOrder($Keys); } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -229,12 +205,6 @@ sub DisplayProperty($$) $PropertyName eq "Description"; } -sub GetDetailsPage($) -{ - #my ($self) = @_; - return undef; -} - package StatusPage; @@ -344,6 +314,7 @@ sub GenerateBody($) my $CutOff = time() - $Days * 24 * 60 * 60; $Jobs->AddFilter("Submitted", [$CutOff], ">="); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); + $JobsCollectionBlock->SetReadWrite(0); # We need to collect information about the tasks of all jobs except the # pretty rare queued jobs. But doing so one job at a time is inefficient so @@ -384,6 +355,7 @@ EOF print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); + $VMsCollectionBlock->SetReadWrite(0); $VMsCollectionBlock->GenerateList(); print "</div>\n";

1 0

Francois Gouget : testbot/web: Skip GetDisplayValue() for the JobDetails page.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: tools Branch: master Commit: 8de0125d8b61145721f7debd2238c2941742983b URL: https://source.winehq.org/git/tools.git/?a=commit;h=8de0125d8b61145721f7deb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 6 01:15:03 2022 +0200 testbot/web: Skip GetDisplayValue() for the JobDetails page. The job details page knows which property it is accessing so there is no need to go through the generic GetDisplayValue(). This makes the code more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ae99b21..5a24204 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -96,7 +96,7 @@ sub GenerateDataCell($$$$) if ($PropertyName eq "VM") { print "<td><a href='#k", $self->escapeHTML($StepTask->GetKey()), "'>"; - print $self->escapeHTML($self->GetDisplayValue($StepTask, $PropertyDescriptor)); + print $self->escapeHTML($StepTask->VM->Name); print "</a></td>\n"; } elsif ($PropertyName eq "FileName") @@ -108,7 +108,7 @@ sub GenerateDataCell($$$$) my $URI = "/GetFile.pl?JobKey=" . uri_escape($JobId) . "&StepKey=" . uri_escape($StepTask->StepNo); print "<td><a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($self->GetDisplayValue($StepTask, $PropertyDescriptor)); + print $self->escapeHTML($StepTask->FileName); print "</a></td>\n"; } else

1 0

Francois Gouget : testbot/cgi: Move SecureConnection() and MakeSecureURL() to PageBase.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: tools Branch: master Commit: 4e92d6eb5189e1b80e2c833a43d4f577c1a7d293 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4e92d6eb5189e1b80e2c833… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 6 01:15:10 2022 +0200 testbot/cgi: Move SecureConnection() and MakeSecureURL() to PageBase. This is where they are used and it is a reminder that they are meant for CGI scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 49 +++++++++++++++++++++++++++++++-- testbot/lib/WineTestBot/Utils.pm | 49 ++------------------------------- testbot/web/Login.pl | 3 +- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 06dba89..47f2da5 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -36,7 +36,7 @@ providing a common banner, navigation menu and cascading style sheets. =cut use Exporter 'import'; -our @EXPORT = qw(CreatePageBase); +our @EXPORT = qw(CreatePageBase MakeSecureURL); use Apache2::Const -compile => qw(REDIRECT); use CGI::Cookie; @@ -120,9 +120,54 @@ sub SetRefreshInterval($$) # -# Session management +# Session management and security # +=pod +=over 12 + +=item C<SecureConnection()> + +Returns true if the user accessed the website over a secure connection. + +This relies on the web server setting the $HTTPS environment variable for CGI +scripts. + +=back +=cut + +sub SecureConnection() +{ + return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; +} + +=pod +=over 12 + +=item C<MakeSecureURL()> + +Builds a URL that accesses this website using https if possible. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +This relies on the web server setting the $HTTP_HOST environment variable for +CGI scripts. However $HTTP_HOST which may not match the official website +hostname. As such this should only be used for providing URLs back to the user +accessing the website, not for URLs sent to third-parties. + +See also WineTestBot::Utils::MakeOfficialURL(). + +=back +=cut + +sub MakeSecureURL($) +{ + my ($URL) = @_; + + my $Protocol = ($UseSSL || SecureConnection()) ? "https://" : "http://"; + return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; +} + sub UnsetCookies($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 2ebad45..f24243e 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,7 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(SecureConnection MakeSecureURL MakeOfficialURL GetTaskURL +our @EXPORT = qw(MakeOfficialURL GetTaskURL GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName @@ -46,51 +46,6 @@ use WineTestBot::Config; =pod =over 12 -=item C<SecureConnection()> - -Returns true if the user accessed the website over a secure connection. - -This relies on the web server setting the $HTTPS environment variable for CGI -scripts. - -=back -=cut - -sub SecureConnection() -{ - return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; -} - -=pod -=over 12 - -=item C<MakeSecureURL()> - -Builds a URL that accesses this website using https if possible. -The parameter should be an absolute path that includes neither the protocol -nor the hostname. - -This relies on the web server setting the $HTTP_HOST environment variable for -CGI scripts. However $HTTP_HOST which may not match the official website -hostname. As such this should only be used for providing URLs back to the user -accessing the website, not for URLs sent to third-parties. - -See also MakeOfficialURL(). - -=back -=cut - -sub MakeSecureURL($) -{ - my ($URL) = @_; - - my $Protocol = ($UseSSL || SecureConnection()) ? "https://" : "http://"; - return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; -} - -=pod -=over 12 - =item C<MakeOfficialURL()> Creates a URL pointing to the official website. @@ -101,7 +56,7 @@ This is the method to use in non-CGI scripts and to build URLs sent to any third-party (e.g. via email); where a third party is any user other than the one currently browsing the website. -See also MakeSecureURL(). +See also WineTestBot::CGI::PageBase::MakeSecureURL(). =back =cut diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index b1f82a9..837617d 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -25,9 +25,10 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; + use WineTestBot::Config; use WineTestBot::Users; -use WineTestBot::Utils; +use WineTestBot::CGI::PageBase; use WineTestBot::CGI::Sessions;

1 0