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

Jacek Caban : winex11: Use NtUserGetThreadInfo to access thread data.
by Alexandre Julliard April 19, 2022

April 19, 2022

Module: wine Branch: master Commit: 3e94864540fd1cd7dbd71f48a4c5e81a915357c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e94864540fd1cd7dbd71f48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 15:31:17 2022 +0200 winex11: Use NtUserGetThreadInfo to access thread data. 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/sysparams.c | 3 --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- include/ntuser.h | 6 ------ 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 535f3bdb95b..32da544c157 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4638,9 +4638,6 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetInputState: return get_input_state(); - case NtUserCallNoParam_GetMessagePos: - return NtUserGetThreadInfo()->message_pos; - case NtUserCallNoParam_ReleaseCapture: return release_capture(); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 147865e7af6..7ac31e326c6 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -572,7 +572,7 @@ static void set_input_focus( struct x11drv_win_data *data ) if (EVENT_x11_time_to_win32_time(0)) /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ /* FIXME: this is not entirely correct */ - timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time(0); + timestamp = NtUserGetThreadInfo()->message_time - EVENT_x11_time_to_win32_time(0); else timestamp = CurrentTime; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3a6b9855ab0..82d3e17a0d1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1617,7 +1617,7 @@ void move_resize_window( HWND hwnd, int dir ) if (!(win = X11DRV_get_whole_window( hwnd ))) return; - pt = NtUserGetMessagePos(); + pt = NtUserGetThreadInfo()->message_pos; pos = virtual_screen_to_root( (short)LOWORD( pt ), (short)HIWORD( pt ) ); if (NtUserGetKeyState( VK_LBUTTON ) & 0x8000) button = 1; diff --git a/include/ntuser.h b/include/ntuser.h index 2f1f9893ea9..e391940d63e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -596,7 +596,6 @@ enum { NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetInputState, - NtUserCallNoParam_GetMessagePos, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ NtUserExitingThread, @@ -614,11 +613,6 @@ static inline BOOL NtUserGetInputState(void) return NtUserCallNoParam( NtUserCallNoParam_GetInputState ); } -static inline DWORD NtUserGetMessagePos(void) -{ - return NtUserCallNoParam( NtUserCallNoParam_GetMessagePos ); -} - static inline BOOL NtUserReleaseCapture(void) { return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );

1 0

Francois Gouget : testbot/cgi: Replace 'toggle all' with a master checkbox.
by Alexandre Julliard April 19, 2022

April 19, 2022

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

Francois Gouget : testbot/cgi: Add support for importing JavaScript files.
by Alexandre Julliard April 19, 2022

April 19, 2022

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 April 19, 2022

April 19, 2022

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 April 19, 2022

April 19, 2022

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

Huw Davies : wineoss: Move get_position to the unixlib.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 9fa054481948a1bc1f4935d4f214b8acfe1ef408 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa054481948a1bc1f4935d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 21:40:41 2022 +0100 wineoss: Move get_position to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 45 ++++++--------------------------------------- dlls/wineoss.drv/oss.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 +++++++++ 3 files changed, 60 insertions(+), 39 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 6498a4750d4..c921b4975c9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1442,52 +1442,19 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - struct oss_stream *stream = This->stream; + struct get_position_params params; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); if(!pos) return E_POINTER; - oss_lock(stream); - - if(stream->flow == eRender){ - *pos = stream->written_frames - stream->held_frames; - if(*pos < stream->last_pos_frames) - *pos = stream->last_pos_frames; - }else if(stream->flow == eCapture){ - audio_buf_info bi; - UINT32 held; - - if(ioctl(stream->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ - TRACE("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); - held = 0; - }else{ - if(bi.bytes <= bi.fragsize) - held = 0; - else - held = bi.bytes / stream->fmt->nBlockAlign; - } - - *pos = stream->written_frames + held; - } - - stream->last_pos_frames = *pos; - - TRACE("returning: %s\n", wine_dbgstr_longlong(*pos)); - if(stream->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= stream->fmt->nBlockAlign; - - oss_unlock(stream); - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + params.stream = This->stream; + params.position = pos; + params.qpctime = qpctime; + OSS_CALL(get_position, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 3a512c7cd9e..a39b0bc4f66 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1272,6 +1272,50 @@ static NTSTATUS get_frequency(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_position(void *args) +{ + struct get_position_params *params = args; + struct oss_stream *stream = params->stream; + UINT64 *pos = params->position, *qpctime = params->qpctime; + + oss_lock(stream); + + if(stream->flow == eRender){ + *pos = stream->written_frames - stream->held_frames; + if(*pos < stream->last_pos_frames) + *pos = stream->last_pos_frames; + }else if(stream->flow == eCapture){ + audio_buf_info bi; + UINT32 held; + + if(ioctl(stream->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ + TRACE("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); + held = 0; + }else{ + if(bi.bytes <= bi.fragsize) + held = 0; + else + held = bi.bytes / stream->fmt->nBlockAlign; + } + + *pos = stream->written_frames + held; + } + + stream->last_pos_frames = *pos; + + TRACE("returning: %s\n", wine_dbgstr_longlong(*pos)); + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= stream->fmt->nBlockAlign; + + if(qpctime){ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return oss_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1313,5 +1357,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_frequency, + get_position, set_event_handle, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 9a544ae7899..982b11ec44f 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -200,6 +200,14 @@ struct get_frequency_params UINT64 *frequency; }; +struct get_position_params +{ + struct oss_stream *stream; + HRESULT result; + UINT64 *position; + UINT64 *qpctime; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -228,6 +236,7 @@ enum oss_funcs oss_get_current_padding, oss_get_next_packet_size, oss_get_frequency, + oss_get_position, oss_set_event_handle, };

1 0

Huw Davies : wineoss: Move is_started to the unixlib.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 4b469fe157244821319489070d2401ffdb37eb94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b469fe15724482131948907… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 21:40:42 2022 +0100 wineoss: Move is_started to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 8 ++++---- dlls/wineoss.drv/oss.c | 11 +++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c921b4975c9..cdd9b09bff7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1596,6 +1596,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); + struct is_started_params params; ACImpl *client; TRACE("(%p)->(%p)\n", This, state); @@ -1612,14 +1613,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - oss_lock(client->stream); - if(client->stream->playing){ + params.stream = client->stream; + OSS_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - oss_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - oss_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a39b0bc4f66..79f2e994d89 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1336,6 +1336,16 @@ static NTSTATUS set_event_handle(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1359,4 +1369,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_frequency, get_position, set_event_handle, + is_started, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 982b11ec44f..ed93f0836b1 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -215,6 +215,12 @@ struct set_event_handle_params HRESULT result; }; +struct is_started_params +{ + struct oss_stream *stream; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, @@ -238,6 +244,7 @@ enum oss_funcs oss_get_frequency, oss_get_position, oss_set_event_handle, + oss_is_started, }; extern unixlib_handle_t oss_handle;

1 0

Jacek Caban : winex11: Use pthread for error handler locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 9a320b39387d33e5a180b5db65cea05ce8ba4fe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a320b39387d33e5a180b5db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:41:18 2022 +0200 winex11: Use pthread for error handler 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/x11drv_main.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index c286d2fd1f2..203237f24aa 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -96,15 +96,7 @@ static BOOL use_xim = TRUE; static WCHAR input_style[20]; static pthread_mutex_t d3dkmt_mutex = PTHREAD_MUTEX_INITIALIZER; - -static CRITICAL_SECTION x11drv_error_section; -static CRITICAL_SECTION_DEBUG x11drv_error_section_debug = -{ - 0, 0, &x11drv_error_section, - { &x11drv_error_section_debug.ProcessLocksList, &x11drv_error_section_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": x11drv_error_section") } -}; -static CRITICAL_SECTION x11drv_error_section = { &x11drv_error_section_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t error_mutex = PTHREAD_MUTEX_INITIALIZER; struct d3dkmt_vidpn_source { @@ -255,7 +247,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) */ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) { - EnterCriticalSection( &x11drv_error_section ); + pthread_mutex_lock( &error_mutex ); err_callback = callback; err_callback_display = display; err_callback_arg = arg; @@ -274,7 +266,7 @@ int X11DRV_check_error(void) { int res = err_callback_result; err_callback = NULL; - LeaveCriticalSection( &x11drv_error_section ); + pthread_mutex_unlock( &error_mutex ); return res; }

1 0

Jacek Caban : winex11: Use pthread for D3DKMT locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 53978351a07cd81b38ed37e08f7c213d95cb79f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53978351a07cd81b38ed37e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:41:05 2022 +0200 winex11: Use pthread for D3DKMT 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/x11drv_main.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 49aff9571bc..c286d2fd1f2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -95,14 +95,7 @@ static int (*old_error_handler)( Display *, XErrorEvent * ); static BOOL use_xim = TRUE; static WCHAR input_style[20]; -static CRITICAL_SECTION x11drv_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &x11drv_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": x11drv_section") } -}; -static CRITICAL_SECTION x11drv_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t d3dkmt_mutex = PTHREAD_MUTEX_INITIALIZER; static CRITICAL_SECTION x11drv_error_section; static CRITICAL_SECTION_DEBUG x11drv_error_section_debug = @@ -863,7 +856,7 @@ NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNE TRACE("(%p)\n", desc); - EnterCriticalSection( &x11drv_section ); + pthread_mutex_lock( &d3dkmt_mutex ); /* Check parameters */ for (i = 0; i < desc->VidPnSourceCount; ++i) @@ -962,7 +955,7 @@ NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNE } done: - LeaveCriticalSection( &x11drv_section ); + pthread_mutex_unlock( &d3dkmt_mutex ); return status; } @@ -978,15 +971,15 @@ NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDP if (!desc || !desc->hAdapter) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &x11drv_section ); + pthread_mutex_lock( &d3dkmt_mutex ); LIST_FOR_EACH_ENTRY( source, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) { if (source->id == desc->VidPnSourceId && source->type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE) { - LeaveCriticalSection( &x11drv_section ); + pthread_mutex_unlock( &d3dkmt_mutex ); return STATUS_GRAPHICS_PRESENT_OCCLUDED; } } - LeaveCriticalSection( &x11drv_section ); + pthread_mutex_unlock( &d3dkmt_mutex ); return STATUS_SUCCESS; }

1 0

Jacek Caban : winex11: Use pthread for xrandr locking.
by Alexandre Julliard April 18, 2022

April 18, 2022

Module: wine Branch: master Commit: 95825139b8f65cb8dae843c2e6ed407024358729 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95825139b8f65cb8dae843c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:41:30 2022 +0200 winex11: Use pthread for xrandr 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/xrandr.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9f58246979a..e97034fcb2c 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -334,22 +334,15 @@ static struct current_mode } *current_modes; static int current_mode_count; -static CRITICAL_SECTION current_modes_section; -static CRITICAL_SECTION_DEBUG current_modes_critsect_debug = -{ - 0, 0, &current_modes_section, - {&current_modes_critsect_debug.ProcessLocksList, &current_modes_critsect_debug.ProcessLocksList}, - 0, 0, {(DWORD_PTR)(__FILE__ ": current_modes_section")} -}; -static CRITICAL_SECTION current_modes_section = {&current_modes_critsect_debug, -1, 0, 0, 0, 0}; +static pthread_mutex_t xrandr_mutex = PTHREAD_MUTEX_INITIALIZER; static void xrandr14_invalidate_current_mode_cache(void) { - EnterCriticalSection( &current_modes_section ); + pthread_mutex_lock( &xrandr_mutex ); heap_free( current_modes); current_modes = NULL; current_mode_count = 0; - LeaveCriticalSection( &current_modes_section ); + pthread_mutex_unlock( &xrandr_mutex ); } static XRRScreenResources *xrandr_get_screen_resources(void) @@ -1228,12 +1221,12 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) return FALSE; /* Update cache */ - EnterCriticalSection( &current_modes_section ); + pthread_mutex_lock( &xrandr_mutex ); if (!current_modes) { if (!xrandr14_get_gpus2( &gpus, &gpu_count, FALSE )) { - LeaveCriticalSection( &current_modes_section ); + pthread_mutex_unlock( &xrandr_mutex ); return FALSE; } @@ -1274,12 +1267,12 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) if (display_idx >= current_mode_count) { - LeaveCriticalSection( &current_modes_section ); + pthread_mutex_unlock( &xrandr_mutex ); return FALSE; } *id = current_modes[display_idx].id; - LeaveCriticalSection( &current_modes_section ); + pthread_mutex_unlock( &xrandr_mutex ); return TRUE; } @@ -1440,7 +1433,7 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) RECT primary; INT mode_idx; - EnterCriticalSection( &current_modes_section ); + pthread_mutex_lock( &xrandr_mutex ); for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) { if (current_modes[mode_idx].id != id) @@ -1453,7 +1446,7 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) } memcpy( mode, &current_modes[mode_idx].mode, sizeof(*mode) ); - LeaveCriticalSection( &current_modes_section ); + pthread_mutex_unlock( &xrandr_mutex ); return TRUE; } @@ -1524,7 +1517,7 @@ done: mode_ptr->mode.dmDriverExtra = 0; mode_ptr->loaded = TRUE; } - LeaveCriticalSection( &current_modes_section ); + pthread_mutex_unlock( &xrandr_mutex ); if (crtc_info) pXRRFreeCrtcInfo( crtc_info ); if (output_info)

1 0