- Wine-Devel - list.winehq.org

[tools] testbot/web: Only show the patches day and time to limit line wrapping.
by Francois Gouget April 26, 2022

April 26, 2022

This adds ValueFormatter::GenerateDayTimeTipDate(). As usual the full date is shown as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 55 ++++++++++++++++++- testbot/web/PatchesList.pl | 3 +- testbot/web/WineTestBot.css | 1 + testbot/web/js/datetime.js | 13 +++++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index d987cee55..41d1e14aa 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -23,7 +23,7 @@ package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime - GenerateTimeTipDate GenerateValueHTML); + GenerateDayTimeTipDate GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -151,6 +151,51 @@ sub GenerateTipDateTime($$;$$) =pod =over 12 +=item C<GenerateDayTimeTipDate()> + +Show the timestamp's day and time with the date as a tooltip. + +The timestamp is shown in the user's timezone if JavaScript is available and +in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateDayTimeTipDate($;$$) +{ + my ($Sec1970, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}daytimetipdate' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d'>%d %H:%M:%S", localtime($Sec1970)), + "</$Tag>"; + } + else + { + print " "; + } +} + +=pod +=over 12 + =item C<GenerateTimeTipDate()> Show the timestamp's time with the date as a tooltip. @@ -221,6 +266,9 @@ for timestamp properties. =item "timetipdate" Same as above but put the date part in a tooltip. +=item "daytimetipdate" +Show the day and time and put the full date as a tooltip. + =back =back @@ -250,6 +298,11 @@ sub GenerateValueHTML($$$;$) GenerateTimeTipDate($Value); return; } + if ($Format eq "daytimetipdate") + { + GenerateDayTimeTipDate($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 30cfc7547..fc074ada1 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,7 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + return $PropertyName eq "Received" ? ("ro", "daytimetipdate") : + $PropertyName =~ /^(?:Disposition|FromName|Subject)$/ ? "ro" : ""; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 350ab64a4..a8756dfce 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -410,6 +410,7 @@ pre a.title { color:inherit; text-decoration: none; } a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } +a.daytimetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 23b7b2718..d21bf5c6e 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -40,6 +40,16 @@ function ShowDateTime(dom, attr) } } +function ShowDayTimeTipDate(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.setAttribute('title', dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) + +'-'+ Pad2(dt.getDate())); + dom.innerHTML = Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()); +} + function ShowTimeTipDate(dom) { const sec1970 = dom.getAttribute("timestamp"); @@ -58,6 +68,9 @@ function init() document.querySelectorAll(".tipdatetime").forEach(dom => { ShowDateTime(dom, 'title'); }); + document.querySelectorAll(".daytimetipdate").forEach(dom => { + ShowDayTimeTipDate(dom); + }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); }); -- 2.30.2

1 0

[tools] testbot/web: Tweak the Activity page VMs iteration.
by Francois Gouget April 26, 2022

April 26, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- 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 ffdf0fef6..adf5a4525 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -158,7 +158,7 @@ sub GenerateBody($) print "<td class='Record'> </td>"; } - foreach my $Col (0..(a)SortedVMs-1) + foreach my $Col (0..$#SortedVMs) { my $VM = $SortedVMs[$Col]; my $VMStatus = $Group->{statusvms}->{$VM->Name}; -- 2.30.2

1 0

[tools] testbot: Tweak the error groups iteration.
by Francois Gouget April 26, 2022

April 26, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 2 +- testbot/web/JobDetails.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 954edaebd..37949e45f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -350,7 +350,7 @@ EOF next if (!$Group->{NewCount}); push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); - foreach my $ErrIndex (0..@{$Group->{Errors}} - 1) + foreach my $ErrIndex (0..$#{$Group->{Errors}}) { if ($Group->{IsNew}->[$ErrIndex]) { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0b2edf735..17cfc3525 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1052,7 +1052,7 @@ sub _WriteLogErrorsToFh($$) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; print $Fh "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) + foreach my $Index (0..$#{$Group->{Errors}}) { my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 33a952553..c04266330 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -513,7 +513,7 @@ sub GenerateFullLog($$$$) next if ($Group->{LineNo}); print "<div class='LogDllName'>$GroupName</div>\n"; - for my $ErrIndex (0..@{$Group->{Errors}} - 1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { if ($IsEmpty) { -- 2.30.2

1 0

[tools] testbot/web: Show the job start / end dates as tooltips on the job details page.
by Francois Gouget April 26, 2022

April 26, 2022

This also delegates the timestamp formatting to ValueFormatter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This also fixes the Time column tooltip because, just like for the main index page, they relied on the old ShowDateTime() JavaScript function. --- testbot/web/JobDetails.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 591a47ee9..33a952553 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -26,7 +26,8 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; -use POSIX qw(strftime); + +use ObjectModel::CGI::ValueFormatter; use WineTestBot::Utils; use WineTestBot::Missions; @@ -50,6 +51,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Id|PreviousNo|Type|FileType|Missions)$/ ? "" : + $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -67,9 +69,13 @@ sub GenerateHeaderView($$$) { print "Arguments / <span class='MissionHeader'>Missions</span>"; } + elsif ($PropertyName eq "Started") + { + print "<a class='title' title='Start Date'>Start</a>"; + } elsif ($PropertyName eq "Ended") { - print "<a class='title' title='Execution ended'>Time</a>"; + print "<a class='title' title='End Time'>Time</a>"; } else { @@ -129,13 +135,7 @@ sub GenerateDataView($$$) if (defined $StepTask->Ended) { my $Duration = $StepTask->Ended - $StepTask->Started; - my $TagId = "E". $StepTask->Id; - print "<a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), - "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>"; + GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); } else { -- 2.30.2

1 0

[PATCH v3] ntdll: Use 32-bit time_t when calling __NR_futex syscall.
by Piotr Caban April 26, 2022

April 26, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

[PATCH 09/11] winex11: Directly use ntdll in uri_to_dos.
by Jacek Caban April 26, 2022

April 26, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)

2 1

[PATCH v2 12/12] win32u: Use user mode callback for registering builtin classes.
by Huw Davies April 26, 2022

April 26, 2022

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/class.c | 15 ++------------- dlls/user32/controls.h | 1 - dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 1 + dlls/win32u/class.c | 16 ++++++++++++++++ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/window.c | 2 +- dlls/win32u/winstation.c | 2 +- include/ntuser.h | 1 + 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index aaa8f75bebe..620477f1b14 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(class); #define MAX_ATOM_LEN 255 /* from dlls/kernel32/atom.c */ -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -307,9 +305,9 @@ static void load_uxtheme(void) } /*********************************************************************** - * register_builtins + * User32RegisterBuiltinClasses */ -static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ) { register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); @@ -330,15 +328,6 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte } -/*********************************************************************** - * register_builtin_classes - */ -void register_builtin_classes(void) -{ - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); -} - - /*********************************************************************** * register_desktop_class */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a410bf27460..5dcdd9bb935 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -104,7 +104,6 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; -extern void register_builtin_classes(void) DECLSPEC_HIDDEN; extern void register_desktop_class(void) DECLSPEC_HIDDEN; /* defwnd proc */ diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 1258181c88a..1400597eb5d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -172,7 +172,6 @@ static const struct user_callbacks user_funcs = post_dde_message, process_rawinput_message, rawinput_device_get_usages, - register_builtin_classes, SCROLL_SetStandardScrollPainted, unpack_dde_message, register_imm, @@ -207,6 +206,7 @@ static const void *kernel_callback_table[NtUserCallCount] = User32CallWindowsHook, User32FreeCachedClipboardData, User32LoadDriver, + User32RegisterBuiltinClasses, User32RenderSsynthesizedFormat, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f28fc66bbf2..aa3e1565bfa 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -124,6 +124,7 @@ BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, BOOL WINAPI User32CallWinEventHook( const struct win_event_hook_params *params, ULONG size ); BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ); BOOL WINAPI User32CallWindowsHook( const struct win_hook_params *params, ULONG size ); +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ); /* message spy definitions */ diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index ba60794ccd7..c52fcad6025 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -972,3 +972,19 @@ WORD get_class_word( HWND hwnd, INT offset ) release_class_ptr( class ); return retvalue; } + +static void register_builtins(void) +{ + void *ret_ptr; + ULONG ret_len; + KeUserModeCallback( NtUserRegisterBuiltinClasses, NULL, 0, &ret_ptr, &ret_len ); +} + +/*********************************************************************** + * register_builtin_classes + */ +void register_builtin_classes(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + pthread_once( &init_once, register_builtins ); +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 632cb16d23a..fe9d7e18bc9 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -46,7 +46,6 @@ struct user_callbacks DWORD type ); BOOL (CDECL *process_rawinput_message)( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ); BOOL (CDECL *rawinput_device_get_usages)(HANDLE handle, USHORT *usage_page, USHORT *usage); - void (CDECL *register_builtin_classes)(void); void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); @@ -303,6 +302,7 @@ WNDPROC get_winproc( WNDPROC proc, BOOL ansi ) DECLSPEC_HIDDEN; void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; +extern void register_builtin_classes(void) DECLSPEC_HIDDEN; /* cursoricon.c */ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e206881e596..edafc522d14 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4732,7 +4732,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, else assert( full_parent == thread_info->top_window ); if (full_parent && !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); } else /* HWND_MESSAGE parent */ { diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 4cd223750c2..0f6fb66a2b2 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -499,7 +499,7 @@ HWND get_desktop_window(void) if (!thread_info->top_window || !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR_(win)( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); return thread_info->top_window; } diff --git a/include/ntuser.h b/include/ntuser.h index cad90b91882..58486fcfcb0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -34,6 +34,7 @@ enum NtUserCallWindowsHook, NtUserFreeCachedClipboardData, NtUserLoadDriver, + NtUserRegisterBuiltinClasses, NtUserRenderSynthesizedFormat, /* win16 hooks */ NtUserCallFreeIcon, -- 2.25.1

1 0

[PATCH v2 11/12] winex11: Directly use win32u and ntdll in a few more places.
by Huw Davies April 26, 2022

April 26, 2022

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index eb357ed4643..a0ccc3ebc96 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -203,7 +203,7 @@ static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; - if (GetClipboardFormatNameW( id, buffer, 256 )) + if (NtUserGetClipboardFormatName( id, buffer, ARRAYSIZE(buffer) )) return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) ); switch (id) @@ -349,7 +349,8 @@ static void register_win32_formats( const UINT *ids, UINT size ) for (count = 0; count < 256 && size; ids++, size--) { if (find_win32_format( *ids )) continue; /* it already exists */ - if (!GetClipboardFormatNameW( *ids, buffer, 256 )) continue; /* not a named format */ + if (!NtUserGetClipboardFormatName( *ids, buffer, ARRAYSIZE(buffer) )) + continue; /* not a named format */ if (!(len = WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL ))) continue; if (!(names[count] = malloc( len ))) continue; WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, names[count], len, NULL, NULL ); @@ -434,6 +435,14 @@ static void put_property( Display *display, Window win, Atom prop, Atom type, in } +static void selection_sleep(void) +{ + LARGE_INTEGER timeout; + timeout.QuadPart = (ULONGLONG)SELECTION_WAIT * -10000; + NtDelayExecution( FALSE, &timeout ); +} + + /************************************************************************** * convert_selection */ @@ -455,7 +464,7 @@ static BOOL convert_selection( Display *display, Window win, Atom selection, Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); if (res && event.xselection.selection == selection && event.xselection.target == format->atom) return read_property( display, win, event.xselection.property, type, data, size ); - Sleep( SELECTION_WAIT ); + selection_sleep(); } ERR( "Timed out waiting for SelectionNotify event\n" ); return FALSE; @@ -1414,7 +1423,7 @@ static UINT *get_clipboard_formats( UINT *size ) for (;;) { if (!(ids = malloc( *size * sizeof(*ids) ))) return NULL; - if (GetUpdatedClipboardFormats( ids, *size, size )) break; + if (NtUserGetUpdatedClipboardFormats( ids, *size, size )) break; free( ids ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; } @@ -1706,7 +1715,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, if (res && xe.xproperty.atom == prop && xe.xproperty.state == PropertyNewValue) break; - Sleep(SELECTION_WAIT); + selection_sleep(); } if (i >= SELECTION_RETRIES || @@ -1863,14 +1872,14 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size != size || memcmp( last_data, data, size )); - if (!changed || !OpenClipboard( clipboard_hwnd )) + if (!changed || !NtUserOpenClipboard( clipboard_hwnd, 0 )) { free( data ); return FALSE; } TRACE( "selection changed, importing\n" ); - EmptyClipboard(); + NtUserEmptyClipboard(); is_clipboard_owner = TRUE; rendered_formats = 0; @@ -1884,9 +1893,9 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_data = data; last_size = size; last_clipboard_update = GetTickCount64(); - CloseClipboard(); + NtUserCloseClipboard(); if (!use_xfixes) - SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); + NtUserSetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING ); return TRUE; } -- 2.25.1

1 0

[PATCH v2 10/12] winex11: Directly use ntdll in uri_to_dos.
by Huw Davies April 26, 2022

April 26, 2022

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec0392f3ec8..eb357ed4643 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -569,6 +569,29 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) } +/* based on wine_get_dos_file_name */ +static WCHAR *get_dos_file_name( const char *path ) +{ + ULONG len = strlen( path ) + 9; /* \??\unix prefix */ + WCHAR *ret; + + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + if (wine_unix_to_nt_file_name( path, ret, &len )) + { + free( ret ); + return NULL; + } + + if (ret[5] == ':') + { + /* get rid of the \??\ prefix */ + memmove( ret, ret + 4, (len - 4) * sizeof(WCHAR) ); + } + else ret[1] = '\\'; + return ret; +} + + /*********************************************************************** * uri_to_dos * @@ -616,7 +639,7 @@ static WCHAR* uri_to_dos(char *encodedURI) if (uri[7] == '/') { /* file:///path/to/file (nautilus, thunar) */ - ret = wine_get_dos_file_name(&uri[7]); + ret = get_dos_file_name( &uri[7] ); } else if (uri[7]) { @@ -629,14 +652,14 @@ static WCHAR* uri_to_dos(char *encodedURI) if (strcmp(&uri[7], "localhost") == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } else if (gethostname(hostname, sizeof(hostname)) == 0) { if (strcmp(hostname, &uri[7]) == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } } } @@ -645,7 +668,7 @@ static WCHAR* uri_to_dos(char *encodedURI) else if (uri[6]) { /* file:/path/to/file (konqueror) */ - ret = wine_get_dos_file_name(&uri[5]); + ret = get_dos_file_name( &uri[5] ); } } free( uri ); @@ -938,7 +961,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) memcpy(&out[total], path, pathSize * sizeof(WCHAR)); total += pathSize; done: - HeapFree( GetProcessHeap(), 0, path ); + free( path ); if (out == NULL) break; } -- 2.25.1

1 0

[PATCH v2 09/12] winex11: Use data-only NtUserGetClipboardData to export clipboard data.
by Huw Davies April 26, 2022

April 26, 2022

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 167 ++++++++++++++++------------------- 1 file changed, 75 insertions(+), 92 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 02456ef3870..ec0392f3ec8 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -97,7 +97,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); #define SELECTION_UPDATE_DELAY 2000 /* delay between checks of the X11 selection */ -typedef BOOL (*EXPORTFUNC)( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +typedef BOOL (*EXPORTFUNC)( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); typedef HANDLE (*IMPORTFUNC)( Atom type, const void *data, size_t size ); struct clipboard_format @@ -121,19 +121,18 @@ static HANDLE import_text_html( Atom type, const void *data, size_t size ); static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ); static HANDLE import_targets( Atom type, const void *data, size_t size ); -static BOOL export_data( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +static BOOL export_data( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_text( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); static BOOL read_property( Display *display, Window w, Atom prop, Atom *type, unsigned char **data, unsigned long *datasize ); @@ -167,7 +166,7 @@ static const struct { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, - { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, + { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_data }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, @@ -1099,13 +1098,9 @@ static HANDLE render_format( UINT id ) * * Generic export clipboard data routine. */ -static BOOL export_data( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_data( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - void *ptr = GlobalLock( handle ); - - if (!ptr) return FALSE; - put_property( display, win, prop, target, 8, ptr, GlobalSize( handle )); - GlobalUnlock( handle ); + put_property( display, win, prop, target, 8, data, size ); return TRUE; } @@ -1115,18 +1110,19 @@ static BOOL export_data( Display *display, Window win, Atom prop, Atom target, H * * Convert CF_UNICODETEXT data to a string in the specified codepage. */ -static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size ) +static char *string_from_unicode_text( UINT codepage, const WCHAR *string, size_t string_size, size_t *size ) { UINT i, j; char *str; - WCHAR *strW = GlobalLock( handle ); - UINT lenW = GlobalSize( handle ) / sizeof(WCHAR); - DWORD len = WideCharToMultiByte( codepage, 0, strW, lenW, NULL, 0, NULL, NULL ); + UINT lenW = string_size / sizeof(WCHAR); + DWORD len; + + if (!string_size) return NULL; + len = WideCharToMultiByte( codepage, 0, string, lenW, NULL, 0, NULL, NULL ); if ((str = malloc( len ))) { - WideCharToMultiByte( codepage, 0, strW, lenW, str, len, NULL, NULL); - GlobalUnlock( handle ); + WideCharToMultiByte( codepage, 0, string, lenW, str, len, NULL, NULL); /* remove carriage returns */ for (i = j = 0; i < len; i++) @@ -1138,7 +1134,6 @@ static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size *size = j; TRACE( "returning %s\n", debugstr_an( str, j )); } - GlobalUnlock( handle ); return str; } @@ -1148,15 +1143,13 @@ static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size * * Export CF_UNICODETEXT converting the string to XA_STRING. */ -static BOOL export_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - UINT size; - char *text = string_from_unicode_text( 28591, handle, &size ); + char *text = string_from_unicode_text( 28591, data, size, &size ); if (!text) return FALSE; put_property( display, win, prop, target, 8, text, size ); free( text ); - GlobalUnlock( handle ); return TRUE; } @@ -1166,15 +1159,14 @@ static BOOL export_string( Display *display, Window win, Atom prop, Atom target, * * Export CF_UNICODE converting the string to UTF8. */ -static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, + void *data, size_t size ) { - UINT size; - char *text = string_from_unicode_text( CP_UTF8, handle, &size ); + char *text = string_from_unicode_text( CP_UTF8, data, size, &size ); if (!text) return FALSE; put_property( display, win, prop, target, 8, text, size ); free( text ); - GlobalUnlock( handle ); return TRUE; } @@ -1184,9 +1176,9 @@ static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom ta * * Export CF_UNICODE to the polymorphic TEXT type, using UTF8. */ -static BOOL export_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_text( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - return export_utf8_string( display, win, prop, x11drv_atom(UTF8_STRING), handle ); + return export_utf8_string( display, win, prop, x11drv_atom(UTF8_STRING), data, size ); } @@ -1195,12 +1187,12 @@ static BOOL export_text( Display *display, Window win, Atom prop, Atom target, H * * Export CF_UNICODE to COMPOUND_TEXT */ -static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, + void *data, size_t size ) { XTextProperty textprop; XICCEncodingStyle style; - UINT size; - char *text = string_from_unicode_text( CP_UNIXCP, handle, &size ); + char *text = string_from_unicode_text( CP_UNIXCP, data, size, &size ); if (!text) return FALSE; if (target == x11drv_atom(COMPOUND_TEXT)) @@ -1225,18 +1217,16 @@ static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom * * Export CF_DIB to XA_PIXMAP. */ -static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { Pixmap pixmap; - BITMAPINFO *pbmi; + BITMAPINFO *pbmi = data; struct gdi_image_bits bits; - pbmi = GlobalLock( handle ); bits.ptr = (LPBYTE)pbmi + bitmap_info_size( pbmi, DIB_RGB_COLORS ); bits.free = NULL; bits.is_copy = FALSE; pixmap = create_pixmap_from_image( 0, &default_visual, pbmi, &bits, DIB_RGB_COLORS ); - GlobalUnlock( handle ); put_property( display, win, prop, target, 32, &pixmap, 1 ); /* FIXME: free the pixmap when the property is deleted */ @@ -1249,13 +1239,13 @@ static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, * * Export CF_DIB to image/bmp. */ -static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - LPBYTE dibdata = GlobalLock( handle ); + LPBYTE dibdata = data; UINT bmpsize; BITMAPFILEHEADER *bfh; - bmpsize = sizeof(BITMAPFILEHEADER) + GlobalSize( handle ); + bmpsize = sizeof(BITMAPFILEHEADER) + size; bfh = malloc( bmpsize ); if (bfh) { @@ -1269,33 +1259,12 @@ static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom targ /* rest of bitmap is the same as the packed dib */ memcpy(bfh+1, dibdata, bmpsize-sizeof(BITMAPFILEHEADER)); } - GlobalUnlock( handle ); put_property( display, win, prop, target, 8, bfh, bmpsize ); free( bfh ); return TRUE; } -/************************************************************************** - * export_enhmetafile - * - * Export EnhMetaFile. - */ -static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) -{ - unsigned int size; - void *ptr; - - if (!(size = GetEnhMetaFileBits( handle, 0, NULL ))) return FALSE; - if (!(ptr = malloc( size ))) return FALSE; - - GetEnhMetaFileBits( handle, size, ptr ); - put_property( display, win, prop, target, 8, ptr, size ); - free( ptr ); - return TRUE; -} - - /************************************************************************** * export_text_html * @@ -1303,14 +1272,12 @@ static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom ta * * FIXME: We should attempt to add an <a base> tag and convert windows paths. */ -static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - const char *p, *data; + const char *p; UINT start = 0, end = 0; BOOL ret = TRUE; - if (!(data = GlobalLock( handle ))) return FALSE; - p = data; while (*p && *p != '<') { @@ -1319,12 +1286,11 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ if (!(p = strpbrk( p, "\r\n" ))) break; while (*p == '\r' || *p == '\n') p++; } - if (start && start < end && end <= GlobalSize( handle )) - put_property( display, win, prop, target, 8, data + start, end - start ); + if (start && start < end && end <= size) + put_property( display, win, prop, target, 8, (char *)data + start, end - start ); else ret = FALSE; - GlobalUnlock( handle ); return ret; } @@ -1334,14 +1300,13 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ * * Export CF_HDROP format to text/uri-list. */ -static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { char *textUriList = NULL; UINT textUriListSize = 32; UINT next = 0; const WCHAR *ptr; WCHAR *unicode_data = NULL; - void *data = GlobalLock( handle ); DROPFILES *drop_files = data; if (!drop_files->fWide) @@ -1406,7 +1371,6 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, return TRUE; failed: - GlobalUnlock( handle ); free( unicode_data ); free( textUriList ); return FALSE; @@ -1454,7 +1418,7 @@ static BOOL is_format_available( UINT format, const UINT *ids, unsigned int coun * * Service a TARGETS selection request event */ -static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { struct clipboard_format *format; UINT pos, count, *formats; @@ -1493,9 +1457,10 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target */ static BOOL export_selection( Display *display, Window win, Atom prop, Atom target ) { + struct get_clipboard_params params = { .data_only = TRUE }; struct clipboard_format *format; - HANDLE handle = 0; BOOL open = FALSE, ret = FALSE; + size_t buffer_size = 0; LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) { @@ -1504,26 +1469,44 @@ static BOOL export_selection( Display *display, Window win, Atom prop, Atom targ if (!format->id) { TRACE( "win %lx prop %s target %s\n", win, debugstr_xatom( prop ), debugstr_xatom( target )); - ret = format->export( display, win, prop, target, 0 ); + ret = format->export( display, win, prop, target, NULL, 0 ); break; } - if (!open && !(open = OpenClipboard( clipboard_hwnd ))) + if (!open && !(open = NtUserOpenClipboard( clipboard_hwnd, 0 ))) { ERR( "failed to open clipboard for %s\n", debugstr_xatom( target )); return FALSE; } - if ((handle = GetClipboardData( format->id ))) + + if (!buffer_size) { - TRACE( "win %lx prop %s target %s exporting %s %p\n", - win, debugstr_xatom( prop ), debugstr_xatom( target ), - debugstr_format( format->id ), handle ); + buffer_size = 1024; + if (!(params.data = malloc( buffer_size ))) break; + } - ret = format->export( display, win, prop, target, handle ); - break; + for (;;) + { + params.size = buffer_size; + if (NtUserGetClipboardData( format->id, &params )) + { + TRACE( "win %lx prop %s target %s exporting %s\n", + win, debugstr_xatom( prop ), debugstr_xatom( target ), + debugstr_format( format->id ) ); + + ret = format->export( display, win, prop, target, params.data, params.size ); + goto done; + } + if (!params.data_size) break; + free( params.data ); + if (!(params.data = malloc( params.data_size ))) goto done; + buffer_size = params.data_size; + params.data_size = 0; } /* keep looking for another Win32 format mapping to the same target */ } - if (open) CloseClipboard(); +done: + free( params.data ); + if (open) NtUserCloseClipboard(); return ret; } @@ -1541,7 +1524,7 @@ static BOOL export_selection( Display *display, Window win, Atom prop, Atom targ * 2. If we fail to convert the target named by an atom in the MULTIPLE property, * we replace the atom in the property by None. */ -static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { Atom atype; int aformat; @@ -1587,7 +1570,7 @@ static BOOL export_multiple( Display *display, Window win, Atom prop, Atom targe * * Export the timestamp that was used to acquire the selection */ -static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { Time time = CurrentTime; /* FIXME */ put_property( display, win, prop, XA_INTEGER, 32, &time, 1 ); -- 2.25.1

1 0