wine-devel

wine-devel@winehq.org

84463 discussions

[PATCH] ieframe: Make sure that history initial state is fully initialized.
by Dmitry Timoshkov 26 Apr '22

26 Apr '22

In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/dochost.c | 4 ++-- dlls/ieframe/ieframe.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..4e1e1d82fa1 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -436,7 +436,7 @@ static void update_travellog(DocHost *This) } if(!This->travellog.log) { - This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + This->travellog.log = heap_alloc_zero(4 * sizeof(*This->travellog.log)); if(!This->travellog.log) return; @@ -444,7 +444,7 @@ static void update_travellog(DocHost *This) }else if(This->travellog.size < This->travellog.position+1) { travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + new_travellog = heap_realloc_zero(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); if(!new_travellog) return; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 633906a70ca..1bae1f6781d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -340,6 +340,11 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, SIZE_T len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.35.3

2 4

[tools 1/2] testbot: Provide (quick) read access to Itemref columns.
by Francois Gouget 26 Apr '22

26 Apr '22

Specifically this provides read-only access to the Itemref column(s). For instance if a task refers to a VM using a VMName field, then one can now write $Task->VMName instead of $Task->VM->Name. Incidentally read accesses are also much faster, except for the first Itemref / Detailref access which has to go through the slow path to initialize the relevant hashtable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The speedup is about 40% for regular columns. In the Task + VM example this replaces two slow accesses with a single faster access, resulting in a ~70% speedup or even more if it avoids loading the VM object from the database. --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index c086aec40..d47238182 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -230,10 +230,29 @@ sub AUTOLOAD # strip fully-qualified portion my $PropertyName = substr($ObjectModel::Item::AUTOLOAD, rindex($ObjectModel::Item::AUTOLOAD, ':') + 1); + + if (!@_) + { + # Provide quick read access to all the columns and cached object refs + if (defined $self->{ColValues}{$PropertyName}) + { + return $self->{ColValues}{$PropertyName}; + } + elsif (defined $self->{Itemrefs}{$PropertyName}) + { + return $self->{Itemrefs}{$PropertyName}; + } + elsif (defined $self->{Details}{$PropertyName}) + { + return $self->{Details}{$PropertyName}; + } + } if ($PropertyName eq "DESTROY") { return; } + + # Populate the Itemrefs and Details hashtable if necessary foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) { if ($PropertyName eq $PropertyDescriptor->GetName()) -- 2.30.2

1 1

[tools] testbot/web: Only show the patches day and time to limit line wrapping.
by Francois Gouget 26 Apr '22

26 Apr '22

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 26 Apr '22

26 Apr '22

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..@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 26 Apr '22

26 Apr '22

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 26 Apr '22

26 Apr '22

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 26 Apr '22

26 Apr '22

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 26 Apr '22

26 Apr '22

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 26 Apr '22

26 Apr '22

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 26 Apr '22

26 Apr '22

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

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