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

Jacek Caban : win32u: Move NtUserFindWindowEx implementation from user32.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 0528f37fdd9b11cc95d074bb9e261d5127cb6ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0528f37fdd9b11cc95d074bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:34:44 2022 +0200 win32u: Move NtUserFindWindowEx 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/win.c | 61 ++++++++----------------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 49 +++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 16 +++++++++++++ include/ntuser.h | 2 ++ 7 files changed, 80 insertions(+), 52 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 511aa363af7..99ee93adba7 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -738,65 +738,24 @@ BOOL WINAPI OpenIcon( HWND hwnd ) /*********************************************************************** * FindWindowExW (USER32.@) */ -HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR title ) +HWND WINAPI FindWindowExW( HWND parent, HWND child, const WCHAR *class, const WCHAR *title ) { - HWND *list; - HWND retvalue = 0; - int i = 0, len = 0; - WCHAR *buffer = NULL; - - if (!parent && child) parent = GetDesktopWindow(); - else if (parent == HWND_MESSAGE) parent = get_hwnd_message_parent(); - - if (title) - { - len = lstrlenW(title) + 1; /* one extra char to check for chars beyond the end */ - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return 0; - } - - if (className) - { - UNICODE_STRING str; - if (IS_INTRESOURCE(className)) - { - str.Buffer = (WCHAR *)className; - str.Length = str.MaximumLength = 0; - } - else RtlInitUnicodeString( &str, className ); - list = list_window_children( 0, parent, &str, 0 ); - } - else list = list_window_children( 0, parent, NULL, 0 ); - if (!list) goto done; + UNICODE_STRING class_str, title_str; - if (child) - { - child = WIN_GetFullHandle( child ); - while (list[i] && list[i] != child) i++; - if (!list[i]) goto done; - i++; /* start from next window */ - } + if (title) RtlInitUnicodeString( &title_str, title ); - if (title) + if (class) { - while (list[i]) + if (IS_INTRESOURCE(class)) { - if (NtUserInternalGetWindowText( list[i], buffer, len + 1 )) - { - if (!wcsicmp( buffer, title )) break; - } - else - { - if (!title[0]) break; - } - i++; + class_str.Buffer = (WCHAR *)class; + class_str.Length = class_str.MaximumLength = 0; } + else RtlInitUnicodeString( &class_str, class ); } - retvalue = list[i]; - done: - HeapFree( GetProcessHeap(), 0, list ); - HeapFree( GetProcessHeap(), 0, buffer ); - return retvalue; + return NtUserFindWindowEx( parent, child, class ? &class_str : NULL, + title ? &title_str : NULL, 0 ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 437fe6d0758..f88b8fa30da 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -116,6 +116,7 @@ static void * const syscalls[] = NtUserCreateWindowStation, NtUserDestroyAcceleratorTable, NtUserFindExistingCursorIcon, + NtUserFindWindowEx, NtUserGetAncestor, NtUserGetAtomName, NtUserGetClassName, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index afb413f8726..98bfbb33a2d 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -882,7 +882,7 @@ @ stdcall NtUserExcludeUpdateRgn(long long) @ stub NtUserFillWindow @ stdcall -syscall NtUserFindExistingCursorIcon(ptr ptr ptr) -@ stub NtUserFindWindowEx +@ stdcall -syscall NtUserFindWindowEx(long long ptr ptr long) @ stdcall NtUserFlashWindowEx(ptr) @ stub NtUserForceWindowToDpiForTest @ stub NtUserFrostCrashedWindow diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 1026b706832..93d92c60de6 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2513,6 +2513,55 @@ NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULON return STATUS_SUCCESS; } +/*********************************************************************** + * NtUserFindWindowEx (USER32.@) + */ +HWND WINAPI NtUserFindWindowEx( HWND parent, HWND child, UNICODE_STRING *class, UNICODE_STRING *title, + ULONG unk ) +{ + HWND *list; + HWND retvalue = 0; + int i = 0, len = 0, title_len; + WCHAR *buffer = NULL; + + if (!parent && child) parent = get_desktop_window(); + else if (parent == HWND_MESSAGE) parent = get_hwnd_message_parent(); + + if (title) + { + len = title->Length / sizeof(WCHAR) + 1; /* one extra char to check for chars beyond the end */ + if (!(buffer = malloc( (len + 1) * sizeof(WCHAR) ))) return 0; + } + + if (!(list = list_window_children( 0, parent, class, 0 ))) goto done; + + if (child) + { + child = get_full_window_handle( child ); + while (list[i] && list[i] != child) i++; + if (!list[i]) goto done; + i++; /* start from next window */ + } + + if (title) + { + while (list[i]) + { + title_len = NtUserInternalGetWindowText( list[i], buffer, len + 1 ); + if (title_len * sizeof(WCHAR) == title->Length && + (!title_len || !wcsnicmp( buffer, title->Buffer, title_len ))) + break; + i++; + } + } + retvalue = list[i]; + + done: + free( list ); + free( buffer ); + return retvalue; +} + /* Retrieve the window text from the server. */ static data_size_t get_server_window_text( HWND hwnd, WCHAR *text, data_size_t count ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index c4e4f7ac219..c1d41c2be43 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -103,6 +103,7 @@ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ + SYSCALL_ENTRY( NtUserFindWindowEx ) \ SYSCALL_ENTRY( NtUserGetAncestor ) \ SYSCALL_ENTRY( NtUserGetAtomName ) \ SYSCALL_ENTRY( NtUserGetClassName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 2af398cfed9..d916680660a 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -259,6 +259,22 @@ NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) return status; } +NTSTATUS WINAPI wow64_NtUserFindWindowEx( UINT *args ) +{ + HWND parent = get_handle( &args ); + HWND child = get_handle( &args ); + UNICODE_STRING32 *class32 = get_ptr( &args ); + UNICODE_STRING32 *title32 = get_ptr( &args ); + ULONG unk = get_ulong( &args ); + + UNICODE_STRING class, title; + HWND ret; + + ret = NtUserFindWindowEx( parent, child, unicode_str_32to64( &class, class32 ), + unicode_str_32to64( &title, title32 ), unk ); + return HandleToUlong( ret ); +} + NTSTATUS WINAPI wow64_NtUserInternalGetWindowText( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 8eafd78beef..879eed4bf79 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -458,6 +458,8 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, INT WINAPI NtUserExcludeUpdateRgn( HDC hdc, HWND hwnd ); HICON WINAPI NtUserFindExistingCursorIcon( UNICODE_STRING *module, UNICODE_STRING *res_name, void *desc ); +HWND WINAPI NtUserFindWindowEx( HWND parent, HWND child, UNICODE_STRING *class, + UNICODE_STRING *title, ULONG unk ); BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ); HWND WINAPI NtUserGetAncestor( HWND hwnd, UINT type ); SHORT WINAPI NtUserGetAsyncKeyState( INT key );

1 0

Francois Gouget : testbot/cgi: Add support for importing JavaScript files.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: tools Branch: master Commit: e78e6669a170d6c4a906590bda81ffadc39614ba URL: https://source.winehq.org/git/tools.git/?a=commit;h=e78e6669a170d6c4a906590… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 19 17:27:50 2022 +0200 testbot/cgi: Add support for importing JavaScript files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 7 +++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d7463b5..406ca4f 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -369,6 +369,13 @@ sub GetTitle($) return undef; } +sub GenerateImportJS($$) +{ + my ($self, $Filename) = @_; + + $self->{PageBase}->GenerateImportJS($Filename); +} + sub GenerateHttpHeaders($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 6e55316..a4d1ebe 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -397,6 +397,17 @@ sub GetPageTitle($$) return $Title; } +sub GenerateImportJS($$) +{ + my ($self, $Filename) = @_; + + if (!$self->{js}->{$Filename}) + { + print "<script type='text/javascript' src='$Filename'></script>\n"; + $self->{js}->{$Filename} = 1; + } +} + sub GenerateHttpHeaders($) { my ($self) = @_;

1 0

Francois Gouget : testbot/web: Move the master checkbox code to a JavaScript file.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: tools Branch: master Commit: d8ceba5ebe14694c78338948aad4f70df8789109 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d8ceba5ebe14694c7833894… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 19 17:27:53 2022 +0200 testbot/web: Move the master checkbox code to a JavaScript file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Table.pm | 84 ++++++++++++++++++++++++++++++++++++ testbot/web/Submit.pl | 26 +++-------- testbot/web/js/table.js | 26 +++++++++++ 3 files changed, 116 insertions(+), 20 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Table.pm b/testbot/lib/ObjectModel/CGI/Table.pm new file mode 100644 index 0000000..b55fa41 --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/Table.pm @@ -0,0 +1,84 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Provides a wrapper for the table JavaScript code. +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::Table; + +use Exporter 'import'; +our @EXPORT = qw(GetTableJSFile GenerateMasterCheckbox); + + +=pod +=over 12 + +=item C<GetTableJSFile()> + +Returns the path to the file containing the table JavaScript code. + +=back +=cut + +sub GetTableJSFile() +{ + return "/js/table.js"; +} + + +=pod +=over 12 + +=item C<GenerateMasterCheckbox()> + +Generates a master checkbox that changes all the checkboxes with the specified +'cbgroup' value. + +=over + +=item CbGroup +A string identifying this group of checkboxes. + +=item Checked +True if the initial state should be checked. + +=item Attrs +A string containing extra attributes to be inserted in this master checkbox +tag. It should not contain the type, checked and onchange attributes. + +=back +=back +=cut + +sub GenerateMasterCheckbox($;$$) +{ + my ($CbGroup, $Checked, $Attrs) = @_; + + $Attrs ||= ""; + $Checked = $Checked ? " checked" : ""; + print <<EOF; +<script type='text/javascript'> + +</script> +EOF +} + +1; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 8a1cc3c..cf00ed5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -30,6 +30,8 @@ use POSIX qw(:fcntl_h); # For SEEK_XXX use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; +use ObjectModel::CGI::Table; + use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Engine::Notify; @@ -773,11 +775,12 @@ sub GenerateFields($) if ($self->{Page} == 2 or $self->{Page} == 4) { $self->_GenerateStateField("ShowAll"); + $self->GenerateImportJS(GetTableJSFile()); print "<div class='CollectionBlock'><table>\n"; print "<thead><tr><th class='Record'>"; # Check which VMs are selected and set the master default - my $MasterChecked = " checked"; + my $MasterChecked = 1; foreach my $VMRow (@{$self->{VMRows}}) { next if ($VMRow->{Incompatible}); @@ -793,27 +796,10 @@ sub GenerateFields($) { $VMRow->{Checked} = 1; } - $MasterChecked = "" if (!$VMRow->{Checked}); + $MasterChecked = 0 if (!$VMRow->{Checked}); } - # Add a "Toggle All" pseudo action - print <<EOF; -<script type='text/javascript'> - -</script> -EOF + GenerateMasterCheckbox("vmcb", $MasterChecked); print "</th>\n"; print "<th class='Record'>VM Name</th>\n"; print "<th class='Record'>Options</th>\n"; diff --git a/testbot/web/js/table.js b/testbot/web/js/table.js new file mode 100644 index 0000000..350dd84 --- /dev/null +++ b/testbot/web/js/table.js @@ -0,0 +1,26 @@ +/* Copyright 2022 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +"use strict"; + +function SetCheckboxes(master, group) +{ + var cbs = document.getElementsByClassName(group); + for (var i = 0; i < cbs.length; i++) + { + cbs[i].checked = master.checked; + } +}

1 0

Francois Gouget : testbot/cgi: Keep the master checkbox synchronized with the others.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: tools Branch: master Commit: 9fac7e24655bb635ac04ba611ad76fc205c936c6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9fac7e24655bb635ac04ba6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 19 17:27:56 2022 +0200 testbot/cgi: Keep the master checkbox synchronized with the others. The master checkbox is automatically checked / unchecked when the other checkboxes are. This also removes the need to figure out what the initial state of the master checkbox should be. And it simplifies the master checkbox HTML code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Table.pm | 22 ++++++---------- testbot/web/Submit.pl | 6 ++--- testbot/web/js/table.js | 49 +++++++++++++++++++++++++++++++----- 3 files changed, 52 insertions(+), 25 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Table.pm b/testbot/lib/ObjectModel/CGI/Table.pm index b55fa41..1e33d78 100644 --- a/testbot/lib/ObjectModel/CGI/Table.pm +++ b/testbot/lib/ObjectModel/CGI/Table.pm @@ -52,33 +52,25 @@ Generates a master checkbox that changes all the checkboxes with the specified =over =item CbGroup -A string identifying this group of checkboxes. +A string identifying this group of checkboxes. The 'cbgroup' attribute of all +checkboxes in this group must be set to this value: -=item Checked -True if the initial state should be checked. + <input type='checkbox' cbgroup='$CbGroup' name='...'> =item Attrs A string containing extra attributes to be inserted in this master checkbox -tag. It should not contain the type, checked and onchange attributes. +tag. It should not contain the type and hidden attributes. =back =back =cut -sub GenerateMasterCheckbox($;$$) +sub GenerateMasterCheckbox($;$) { - my ($CbGroup, $Checked, $Attrs) = @_; + my ($CbGroup, $Attrs) = @_; $Attrs ||= ""; - $Checked = $Checked ? " checked" : ""; - print <<EOF; -<script type='text/javascript'> - -</script> -EOF + print "<input$Attrs type='checkbox' hidden='true' mcbgroup='$CbGroup'>\n"; } 1; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index cf00ed5..9292d38 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -780,7 +780,6 @@ sub GenerateFields($) print "<thead><tr><th class='Record'>"; # Check which VMs are selected and set the master default - my $MasterChecked = 1; foreach my $VMRow (@{$self->{VMRows}}) { next if ($VMRow->{Incompatible}); @@ -796,10 +795,9 @@ sub GenerateFields($) { $VMRow->{Checked} = 1; } - $MasterChecked = 0 if (!$VMRow->{Checked}); } - GenerateMasterCheckbox("vmcb", $MasterChecked); + GenerateMasterCheckbox("vmcb"); print "</th>\n"; print "<th class='Record'>VM Name</th>\n"; print "<th class='Record'>Options</th>\n"; @@ -815,7 +813,7 @@ sub GenerateFields($) my $VM = $VMRow->{VM}; print "<tr class='", ($Even ? "even" : "odd"), - "'><td><input class='vmcb' name='$VMRow->{Field}' type='checkbox'"; + "'><td><input cbgroup='vmcb' name='$VMRow->{Field}' type='checkbox'"; $Even = !$Even; print " checked='checked'" if ($VMRow->{Checked}); print "/></td>\n"; diff --git a/testbot/web/js/table.js b/testbot/web/js/table.js index 350dd84..f617912 100644 --- a/testbot/web/js/table.js +++ b/testbot/web/js/table.js @@ -16,11 +16,48 @@ */ "use strict"; -function SetCheckboxes(master, group) +var mcb_count; +var mcb_checked; + +function SetCheckboxes(e) +{ + const master = e.target.closest("input"); + const group = master.getAttribute("mcbgroup"); + const selector = 'input[cbgroup="' + group + '"]'; + document.querySelectorAll(selector).forEach(cb => { + cb.checked = master.checked; + }); + mcb_checked[group] = master.checked ? mcb_count[group] : 0; +} + +function UpdateMasterCb(e) +{ + const cb = e.target.closest("input"); + const group = cb.getAttribute("cbgroup"); + mcb_checked[group] += cb.checked ? 1 : -1; + + const master = document.querySelector('input[mcbgroup="' + group + '"]'); + master.checked = (mcb_count[group] == mcb_checked[group]); +} + + +function InitMasterCbs() { - var cbs = document.getElementsByClassName(group); - for (var i = 0; i < cbs.length; i++) - { - cbs[i].checked = master.checked; - } + mcb_count = {}; + mcb_checked = {}; + document.querySelectorAll("input[mcbgroup]").forEach(master => { + const group = master.getAttribute("mcbgroup"); + mcb_count[group] = mcb_checked[group] = 0; + const selector = 'input[cbgroup="' + group + '"]'; + document.querySelectorAll(selector).forEach(cb => { + mcb_count[group]++; + if (cb.checked) mcb_checked[group]++; + cb.addEventListener('click', UpdateMasterCb); + }); + master.checked = (mcb_count[group] == mcb_checked[group]); + master.addEventListener('click', SetCheckboxes); + master.hidden = false; + }); } + +window.addEventListener('load', InitMasterCbs);

1 0

Francois Gouget : testbot/cgi: Replace 'toggle all' with a master checkbox.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: tools Branch: master Commit: 585788aae7865d77c85cc9dfa200cbea3ce1d10d URL: https://source.winehq.org/git/tools.git/?a=commit;h=585788aae7865d77c85cc9d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 19 17:30:25 2022 +0200 testbot/cgi: Replace 'toggle all' with a master checkbox. This brings the collection blocks in line with the Submit page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 36 ++++++++++---------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 36f1b01..3e3ee29 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -47,9 +47,12 @@ our @EXPORT = qw(new); use POSIX qw(strftime); use URI::Escape; +use ObjectModel::CGI::Table; use ObjectModel::CGI::ValueFormatter; +my $Unique; + =pod =over 12 @@ -82,6 +85,7 @@ sub new($$$@) my $self = {Collection => $Collection, EnclosingPage => $EnclosingPage, RW => 1, + Unique => $Unique++, }; $self = bless $self, $class; $self->_initialize(@_); @@ -331,9 +335,12 @@ sub GenerateHeaderRow($$$) my ($self, $Row) = @_; print "<tr>\n"; - if (@{$Row->{ItemActions}}) + if (@{$Row->{ItemActions}} and $Row->{Rows}) { - print "<th> </th>\n"; + $self->{EnclosingPage}->GenerateImportJS(GetTableJSFile()); + print "<th>"; + GenerateMasterCheckbox("block$self->{Unique}"); + print "</th>\n"; } foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) { @@ -377,7 +384,7 @@ sub GenerateDataRow($$) if (@{$Row->{ItemActions}}) { print "<td><input name='", $self->SelName($Row->{Item}->GetKey()), - "' type='checkbox' /></td>\n"; + "' type='checkbox' cbgroup='block$self->{Unique}'/></td>\n"; } foreach my $PropertyDescriptor (@{$Row->{PropertyDescriptors}}) { @@ -442,6 +449,7 @@ EOF $self->GenerateFormStart(); $self->GenerateErrorDiv(); + my $Items = $self->{Collection}->GetSortedItems(); print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; @@ -450,12 +458,12 @@ EOF DetailsPage => $self->GetDetailsPage(), ItemActions => $self->{RW} ? $self->GetItemActions() : [], Row => 0, # 0 for the header ---> 1 for the first line + Rows => scalar(@$Items), }; $self->GenerateHeaderRow($Row); print "</thead>\n"; print "<tbody>\n"; - my $Items = $self->{Collection}->GetSortedItems(); foreach my $Item (@$Items) { $Row->{Row}++; @@ -473,25 +481,7 @@ EOF if (@{$Row->{ItemActions}} and @$Items) { - print <<EOF; -<div class='CollectionBlockActions'> -<script type='text/javascript'> - -</script> -EOF - print "For selected ", $self->{Collection}->GetCollectionName() . ":"; + print "<div class='CollectionBlockActions'>For selected ", $self->{Collection}->GetCollectionName() . ":"; foreach my $Action (@{$Row->{ItemActions}}) { print " <input type='submit' name='Action' value='" .

1 0

Jacek Caban : win32u: Use RtlInitUnicodeString from ntdll.so.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: acfec2f94ce4e9bb778cc4830f164ac200894ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acfec2f94ce4e9bb778cc483… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:06:12 2022 +0200 win32u: Use RtlInitUnicodeString from ntdll.so. 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/win32u/driver.c | 4 ++-- dlls/win32u/win32u_private.h | 7 ------- dlls/win32u/winstation.c | 10 +++++----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 6b6f1a64ce8..83814ba14f5 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -215,7 +215,7 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) dc = get_nulldrv_dc( dev ); memset( &devmode, 0, sizeof(devmode) ); devmode.dmSize = sizeof(devmode); - init_unicode_string( &display, dc->display ); + RtlInitUnicodeString( &display, dc->display ); if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) && (devmode.dmFields & DM_BITSPERPEL) && devmode.dmBitsPerPel) return devmode.dmBitsPerPel; @@ -267,7 +267,7 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) memset( &devmode, 0, sizeof(devmode) ); devmode.dmSize = sizeof(devmode); - init_unicode_string( &display, dc->display ); + RtlInitUnicodeString( &display, dc->display ); if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) && devmode.dmDisplayFrequency) return devmode.dmDisplayFrequency; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 651003d4e84..d85cb9d683d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -626,13 +626,6 @@ static inline BOOL is_win9x(void) return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } -static inline void init_unicode_string( UNICODE_STRING *str, const WCHAR *data ) -{ - str->Length = lstrlenW(data) * sizeof(WCHAR); - str->MaximumLength = str->Length + sizeof(WCHAR); - str->Buffer = (WCHAR *)data; -} - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index a25edfc9771..8e47c97510e 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -450,11 +450,11 @@ HWND get_desktop_window(void) params.Environment = peb->ProcessParameters->Environment; params.EnvironmentSize = peb->ProcessParameters->EnvironmentSize; params.hStdError = peb->ProcessParameters->hStdError; - init_unicode_string( &params.CurrentDirectory.DosPath, system_dir ); - init_unicode_string( &params.ImagePathName, appnameW + 4 ); - init_unicode_string( &params.CommandLine, cmdlineW ); - init_unicode_string( &params.WindowTitle, appnameW + 4 ); - init_unicode_string( &params.Desktop, desktop ); + RtlInitUnicodeString( &params.CurrentDirectory.DosPath, system_dir ); + RtlInitUnicodeString( &params.ImagePathName, appnameW + 4 ); + RtlInitUnicodeString( &params.CommandLine, cmdlineW ); + RtlInitUnicodeString( &params.WindowTitle, appnameW + 4 ); + RtlInitUnicodeString( &params.Desktop, desktop ); ps_attr.TotalLength = sizeof(ps_attr); ps_attr.Attributes[0].Attribute = PS_ATTRIBUTE_IMAGE_NAME;

1 0

Jacek Caban : winex11: Use pthread for surface locking.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: e395c161edf239bbe8055c2237857a44d2fe9b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e395c161edf239bbe8055c22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:26 2022 +0200 winex11: Use pthread for surface locking. 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/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/bitblt.c | 11 ++++------- dlls/winex11.drv/init.c | 12 ++++++++++++ dlls/winex11.drv/x11drv.h | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index b6b1062c425..ff2e38d64a7 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -3,7 +3,7 @@ MODULE = winex11.drv IMPORTS = uuid user32 gdi32 win32u DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) -EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) +EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) $(PTHREAD_LIBS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index bae0784be78..963fde035da 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1583,7 +1583,7 @@ struct x11drv_window_surface #ifdef HAVE_LIBXXSHM XShmSegmentInfo shminfo; #endif - CRITICAL_SECTION crit; + pthread_mutex_t mutex; BITMAPINFO info; /* variable size, must be last */ }; @@ -1831,7 +1831,7 @@ static void x11drv_surface_lock( struct window_surface *window_surface ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); - EnterCriticalSection( &surface->crit ); + pthread_mutex_lock( &surface->mutex ); } /*********************************************************************** @@ -1841,7 +1841,7 @@ static void x11drv_surface_unlock( struct window_surface *window_surface ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); - LeaveCriticalSection( &surface->crit ); + pthread_mutex_unlock( &surface->mutex ); } /*********************************************************************** @@ -1987,8 +1987,6 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) surface->image->data = NULL; XDestroyImage( surface->image ); } - surface->crit.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &surface->crit ); if (surface->region) NtGdiDeleteObjectApp( surface->region ); HeapFree( GetProcessHeap(), 0, surface ); } @@ -2026,8 +2024,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface->info.bmiHeader.biSizeImage = get_dib_image_size( &surface->info ); if (format->bits_per_pixel > 8) set_color_info( vis, &surface->info, use_alpha ); - InitializeCriticalSection( &surface->crit ); - surface->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": surface"); + init_recursive_mutex( &surface->mutex ); surface->header.funcs = &x11drv_surface_funcs; surface->header.rect = *rect; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8f4bb9fd7e9..3447e7bc69f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -42,6 +42,18 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static const struct user_driver_funcs x11drv_funcs; static const struct gdi_dc_funcs *xrender_funcs; + +void init_recursive_mutex( pthread_mutex_t *mutex ) +{ + pthread_mutexattr_t attr; + + pthread_mutexattr_init( &attr ); + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( mutex, &attr ); + pthread_mutexattr_destroy( &attr ); +} + + /********************************************************************** * device_init * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 07c36899eb3..ed7a75a8d17 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -28,6 +28,7 @@ #include <limits.h> #include <stdarg.h> +#include <pthread.h> #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> @@ -702,6 +703,7 @@ extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; +extern void init_recursive_mutex( pthread_mutex_t *mutex ) DECLSPEC_HIDDEN; #define DEPTH_COUNT 3 extern const unsigned int *depths DECLSPEC_HIDDEN;

1 0

Jacek Caban : winex11: Use pthread for keyboard lock.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: b2bc410b7cc2966c24de69dfa16eb6830f8056b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2bc410b7cc2966c24de69df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:30 2022 +0200 winex11: Use pthread for keyboard lock. 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/winex11.drv/keyboard.c | 47 +++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index a55eaf071fe..786b6f4e084 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -67,14 +67,7 @@ static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ -static CRITICAL_SECTION kbd_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &kbd_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": kbd_section") } -}; -static CRITICAL_SECTION kbd_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t kbd_mutex = PTHREAD_MUTEX_INITIALIZER; static char KEYBOARD_MapDeadKeysym(KeySym keysym); @@ -1218,7 +1211,7 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) memset(keys, 0, sizeof(keys)); - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); /* the minimum keycode is always greater or equal to 8, so we can * skip the first 8 values, hence start at 1 @@ -1248,7 +1241,7 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) } } - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); if (!changed) return FALSE; update_key_state( keystate, VK_CONTROL, (keystate[VK_LCONTROL] | keystate[VK_RCONTROL]) & 0x80 ); @@ -1367,7 +1360,7 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) return TRUE; } - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); /* If XKB extensions are used, the state mask for AltGr will use the group index instead of the modifier mask. The group index is set in bits @@ -1402,7 +1395,7 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) TRACE_(key)("keycode %u converted to vkey 0x%X scan %02x\n", event->keycode, vkey, bScan); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); if (!vkey) return FALSE; @@ -1597,7 +1590,7 @@ void X11DRV_InitKeyboard( Display *display ) }; int vkey_range; - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); XDisplayKeycodes(display, &min_keycode, &max_keycode); if (key_mapping) XFree( key_mapping ); key_mapping = XGetKeyboardMapping(display, min_keycode, @@ -1834,7 +1827,7 @@ void X11DRV_InitKeyboard( Display *display ) keyc2scan[keyc]=scan++; } - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); } static BOOL match_x11_keyboard_layout(HKL hkl) @@ -1939,13 +1932,13 @@ SHORT X11DRV_VkKeyScanEx( WCHAR wChar, HKL hkl ) TRACE("'%c'(%lx): got keycode %u\n", cChar, keysym, keycode); if (!keycode) return -1; - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); /* keycode -> (keyc2vkey) vkey */ ret = keyc2vkey[keycode]; if (!ret) { - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE("keycode for '%c' not found, returning -1\n", cChar); return -1; } @@ -1953,7 +1946,7 @@ SHORT X11DRV_VkKeyScanEx( WCHAR wChar, HKL hkl ) for (index = 0; index < 4; index++) /* find shift state */ if (keycode_to_keysym(display, keycode, index) == keysym) break; - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); switch (index) { @@ -1990,7 +1983,7 @@ UINT X11DRV_MapVirtualKeyEx( UINT wCode, UINT wMapType, HKL hkl ) if (!match_x11_keyboard_layout(hkl)) FIXME("keyboard layout %p is not supported\n", hkl); - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); switch(wMapType) { @@ -2116,7 +2109,7 @@ UINT X11DRV_MapVirtualKeyEx( UINT wCode, UINT wMapType, HKL hkl ) break; } - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE( "returning 0x%x.\n", ret ); return ret; } @@ -2193,7 +2186,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) /* let's do scancode -> keycode -> keysym -> String */ - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); for (keyi=min_keycode; keyi<=max_keycode; keyi++) if ((keyc2scan[keyi]) == scanCode) @@ -2211,7 +2204,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) char* idx = strrchr(name, '_'); if (idx && (_strnicmp(idx, "_r", -1) == 0 || _strnicmp(idx, "_l", -1) == 0)) { - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", scanCode, keyc, keys, debugstr_an(name,idx-name)); rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); @@ -2223,7 +2216,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) if (name) { - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); TRACE("found scan=%04x keyc=%u keysym=%04x vkey=%04x string=%s\n", scanCode, keyc, (int)keys, vkey, debugstr_a(name)); rc = MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); @@ -2235,7 +2228,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) /* Finally issue WARN for unknown keys */ - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); WARN("(%08x,%p,%d): unsupported key, vkey=%04X, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi); *lpBuffer = 0; return 0; @@ -2381,7 +2374,7 @@ INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, e.window = X11DRV_get_whole_window( focus ); xic = X11DRV_get_ic( focus ); - EnterCriticalSection( &kbd_section ); + pthread_mutex_lock( &kbd_mutex ); if (lpKeyState[VK_SHIFT] & 0x80) { @@ -2452,7 +2445,7 @@ INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, if (!e.keycode && virtKey != VK_NONAME) { WARN_(key)("Unknown virtual key %X !!!\n", virtKey); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); return 0; } else TRACE_(key)("Found keycode %u\n",e.keycode); @@ -2473,7 +2466,7 @@ INT X11DRV_ToUnicodeEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, if (lpChar == NULL) { ERR_(key)("Failed to allocate memory!\n"); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); return 0; } ret = XmbLookupString(xic, &e, lpChar, ret, &keysym, &status); @@ -2625,7 +2618,7 @@ found: if (buf != lpChar) HeapFree(GetProcessHeap(), 0, lpChar); - LeaveCriticalSection( &kbd_section ); + pthread_mutex_unlock( &kbd_mutex ); /* Null-terminate the buffer, if there's room. MSDN clearly states that the caller must not assume this is done, but some programs (e.g. Audiosurf) do. */

1 0

Jacek Caban : winex11: Use pthread for synchronization in opengl.c.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 80a4919b8a9749f07fdd9d27afde620383c4c36f URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a4919b8a9749f07fdd9d27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:38 2022 +0200 winex11: Use pthread for synchronization in opengl.c. 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/winex11.drv/opengl.c | 90 +++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80a4919b8a9749f07fdd…

1 0

Jacek Caban : winex11: Use pthread for palette locking.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 6db4613be926171b747562b41f98527bdc414f91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db4613be926171b747562b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:40:45 2022 +0200 winex11: Use pthread for palette locking. 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/winex11.drv/palette.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index ffed08d1f35..ae4bf38d934 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -69,14 +69,7 @@ static unsigned char X11DRV_PALETTE_freeList[256]; static XContext palette_context; /* X context to associate a color mapping to a palette */ -static CRITICAL_SECTION palette_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &palette_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": palette_cs") } -}; -static CRITICAL_SECTION palette_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t palette_mutex = PTHREAD_MUTEX_INITIALIZER; /**********************************************************************/ @@ -781,7 +774,7 @@ BOOL X11DRV_IsSolidColor( COLORREF color ) if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL) return TRUE; /* no palette */ - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); for (i = 0; i < palette_size ; i++, pEntry++) { if( i < COLOR_gapStart || i > COLOR_gapEnd ) @@ -789,11 +782,11 @@ BOOL X11DRV_IsSolidColor( COLORREF color ) (GetGValue(color) == pEntry->peGreen) && (GetBValue(color) == pEntry->peBlue)) { - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return TRUE; } } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return FALSE; } @@ -836,9 +829,9 @@ COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) if ((default_visual.depth <= 8) && (pixel < 256) && !(X11DRV_PALETTE_PaletteFlags & (X11DRV_PALETTE_VIRTUAL | X11DRV_PALETTE_FIXED)) ) { COLORREF ret; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); ret = *(COLORREF *)(COLOR_sysPal + (X11DRV_PALETTE_XPixelToPalette ? X11DRV_PALETTE_XPixelToPalette[pixel]: pixel)) & 0x00ffffff; - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return ret; } @@ -1009,10 +1002,10 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) return (((color >> 16) & 0xff) + ((color >> 8) & 0xff) + (color & 0xff) > 255*3/2) ? 1 : 0; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); index = X11DRV_SysPaletteLookupPixel( color & 0xffffff, FALSE); if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); } } return index; @@ -1075,11 +1068,11 @@ static int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color ) if (!mapping) WARN("Palette %p is not realized\n", hPal); - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); index = X11DRV_SysPaletteLookupPixel( color, FALSE); if (X11DRV_PALETTE_PaletteToXPixel) index = X11DRV_PALETTE_PaletteToXPixel[index]; - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return index; } } @@ -1221,7 +1214,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) /* reset dynamic system palette entries */ - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); if( primary && X11DRV_PALETTE_firstFree != -1) X11DRV_PALETTE_FormatSystemPalette(); @@ -1294,7 +1287,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) TRACE("entry %i (%x) -> pixel %i\n", i, *(COLORREF*)&entries[i], index); } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return iRemapped; } @@ -1331,7 +1324,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, if (start >= palette_size) return 0; if (start + count >= palette_size) count = palette_size - start; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); for (i = 0; i < count; i++) { entries[i].peRed = COLOR_sysPal[start + i].peRed; @@ -1340,7 +1333,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, entries[i].peFlags = 0; TRACE("\tidx(%02x) -> RGB(%08x)\n", start + i, *(COLORREF*)(entries + i) ); } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); return count; } @@ -1378,9 +1371,9 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); } color &= 0x00ffffff; - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); nearest = (0x00ffffff & *(COLORREF*)(COLOR_sysPal + X11DRV_SysPaletteLookupPixel(color, FALSE))); - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); TRACE("(%06x): returning %06x\n", color, nearest ); return nearest; @@ -1402,7 +1395,7 @@ UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) PALETTEENTRY entries[NB_RESERVED_COLORS]; get_palette_entries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, entries ); - EnterCriticalSection( &palette_cs ); + pthread_mutex_lock( &palette_mutex ); for( i = 0; i < NB_RESERVED_COLORS; i++ ) { index = X11DRV_PALETTE_LookupSystemXPixel( RGB(entries[i].peRed, @@ -1415,7 +1408,7 @@ UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) ret++; } } - LeaveCriticalSection( &palette_cs ); + pthread_mutex_unlock( &palette_mutex ); } return ret; }

1 0