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

Francois Gouget : testbot/web: Better initialize and check the Hours Log page parameter.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: tools Branch: master Commit: 96b5a4449a453e83a2f372b5bd03fcdd30511462 URL: https://source.winehq.org/git/tools.git/?a=commit;h=96b5a4449a453e83a2f372b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 10 12:00:39 2022 +0100 testbot/web: Better initialize and check the Hours Log page parameter. Call Validate() to make sure the Hours parameter is usable. Note that due to an implementation detail marking the Hours property as required is not strictly necessary. But it does reflect that we need a value for the Download action. Use SetParam() to provide a default value which removes the need for redefining GetPropertyValue(). Treat "00" the same as "0". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/Log.pl | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 456e73f..f8e4943 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -34,9 +34,16 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; my @PropertyDescriptors = ( - CreateBasicPropertyDescriptor("Hours", "Hours", !1, !1, "N", 2), + CreateBasicPropertyDescriptor("Hours", "Hours", !1, 1, "N", 2), ); $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); + + if (!$self->GetParam("Hours") or !$self->Validate() or + !int($self->GetParam("Hours"))) # 00 case! + { + $self->SetParam("Hours", 1) if (!defined $self->{ErrMessage}); + $self->SetParam("Action", undef); + } } sub GetPageTitle($$) @@ -46,16 +53,6 @@ sub GetPageTitle($$) return "Engine Log - ${ProjectName} Test Bot"; } -sub GetPropertyValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - return 1 if ($PropertyName eq "Hours"); # Provides a default value - - return $self->SUPER::GetPropertyValue($PropertyDescriptor); -} - sub GetHeaderText($) { #my ($self) = @_;

1 0

Francois Gouget : testbot/web: Simplify the Log page Download action handling.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: tools Branch: master Commit: 68f44aa47e9de1a37fd387e37584932346ba1e47 URL: https://source.winehq.org/git/tools.git/?a=commit;h=68f44aa47e9de1a37fd387e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 10 12:00:42 2022 +0100 testbot/web: Simplify the Log page Download action handling. The action is pretty simple so there is no need for a separate function. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/Log.pl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index f8e4943..ddc655f 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -65,18 +65,14 @@ sub GetActions($) return ["Download"]; } -sub OnDownload($) -{ - my ($self) = @_; - - exit($self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours"))); -} - sub OnAction($$) { my ($self, $Action) = @_; - return $self->OnDownload() if ($Action eq "Download"); + if ($Action eq "Download") + { + exit($self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours"))); + } return $self->SUPER::OnAction($Action); }

1 0

Francois Gouget : testbot/web: Better initialize and check the Days Stats page parameter.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: tools Branch: master Commit: e0308935cae533eba5797fa12f944cf2ac3ffaab URL: https://source.winehq.org/git/tools.git/?a=commit;h=e0308935cae533eba5797fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 10 12:00:49 2022 +0100 testbot/web: Better initialize and check the Days Stats page parameter. Use SetParam() to provide the default value. This allows removing the Days field and GetDisplayValue() method. FormPage::Validate() must be called after the property descriptors have been set otherwise it has no property to check. This removes the need for redefining Validate(). Treat "00" the same as "0". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index c96e6fd..42408a3 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -37,34 +37,18 @@ sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; - $self->{Days} = $self->GetParam("Days"); - $self->Validate(); - $self->{start} = Time(); my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, 1, "N", 2), ); $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); -} - -sub Validate($) -{ - my ($self) = @_; - if (!defined $self->{Days}) - { - $self->{Days} = 7; - $self->{NoStats} = 1; - } - elsif ($self->{Days} !~ /^[0-9]{1,2}$/) + if (!$self->GetParam("Days") or !$self->Validate() or + !int($self->GetParam("Days"))) # 00 case! { - $self->{ErrField} = "Days"; - $self->{ErrMessage} = "The number of days must be between 1 and 99"; + $self->SetParam("Days", 7) if (!defined $self->{ErrMessage}); $self->{NoStats} = 1; - $self->{Days} = 7; - return undef; } - return $self->SUPER::Validate(); } sub GetPageTitle($$) @@ -211,7 +195,7 @@ sub GenerateBody($) my $VMs = CreateVMs(); $VMs->FilterEnabledRole(); my @SortedVMs = sort _CompareVMs @{$VMs->GetItems()}; - my $Stats = GetStatistics($VMs, $self->{Days} * 24 * 60 * 60); + my $Stats = GetStatistics($VMs, $self->GetParam("Days") * 24 * 60 * 60); ### Show global statistics @@ -377,13 +361,6 @@ sub GenerateBody($) print "</tbody></table></div>\n"; } -sub GetDisplayValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->{$PropertyDescriptor->GetName()}; -} - sub GetActions($) { #my ($self) = @_;

1 0

Francois Gouget : testbot/web: Simplify action handling in the Stats page.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: tools Branch: master Commit: 36c9bda83b4ed62e2476cfca54ffac41a1783702 URL: https://source.winehq.org/git/tools.git/?a=commit;h=36c9bda83b4ed62e2476cfc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 10 12:00:52 2022 +0100 testbot/web: Simplify action handling in the Stats page. The action is a no-op so unset it to not need to redefine OnAction(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 42408a3..5ec6979 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -49,6 +49,8 @@ sub _initialize($$$) $self->SetParam("Days", 7) if (!defined $self->{ErrMessage}); $self->{NoStats} = 1; } + # The action is a no-op so unset it to not need to redefine OnAction() + $self->SetParam("Action", undef); } sub GetPageTitle($$) @@ -367,18 +369,6 @@ sub GetActions($) return ["Update"]; } -sub OnAction($$) -{ - my ($self, $Action) = @_; - - if ($Action eq "Update") - { - return $self->Validate() ? 1 : undef; - } - - return $self->SUPER::OnAction($Action); -} - sub GenerateFooter($) { my ($self) = @_;

1 0

Francois Gouget : testbot/web: Explicitly call exit on return from Redirect().
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: tools Branch: master Commit: d1f74feaa53d4d724b4a3e470eea45d478e7987b URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1f74feaa53d4d724b4a3e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 10 11:20:21 2022 +0100 testbot/web: Explicitly call exit on return from Redirect(). Having Redirect() call exit() itself is confusing and requires documenting that it does not return in each call point and/or adding a defensive exit() call anyway. Using the exit(Redirect(...)) construct is more explicit, concise and robust. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 18 +++++++----------- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++------ testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 +++--- testbot/web/JobDetails.pl | 8 +++----- testbot/web/Login.pl | 3 +-- testbot/web/Submit.pl | 13 +++---------- testbot/web/admin/Log.pl | 4 ++-- testbot/web/admin/SpecialJobs.pl | 3 +-- testbot/web/admin/UserDetails.pl | 9 +++------ 10 files changed, 28 insertions(+), 48 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index a5e8187..9027b87 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -539,20 +539,16 @@ sub OnAction($$) "=" . uri_escape($MasterColValues->[$ColIndex]); } } - $self->{EnclosingPage}->Redirect($Target); - return 1; + exit($self->{EnclosingPage}->Redirect($Target)); } - else + + my $Ok = 1; + foreach my $Key (@{$self->{Collection}->GetKeys()}) { - my $Ok = 1; - foreach my $Key (@{$self->{Collection}->GetKeys()}) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) { - if (defined($self->{EnclosingPage}->GetParam($self->SelName($Key))) && - $Ok) - { - my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); - } + my $Item = $self->{Collection}->GetItem($Key); + $Ok = $self->CallOnItemAction($Item, $Action); } } } diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 6d94491..9401154 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -151,13 +151,11 @@ sub OnAction($$) if ($Action eq "OK") { return !1 if (!$self->Save()); - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } - elsif ($Action eq "Cancel") + if ($Action eq "Cancel") { - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } return $self->SUPER::OnAction($Action); @@ -177,7 +175,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); # does not return + return $self->Redirect($Target); } 1; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8abaaaa..b0450d0 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -246,7 +246,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($self, $Location); } sub GetCurrentSession($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 2681ece..322552d 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -56,7 +56,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - $self->Redirect($Page, MakeSecureURL($LoginURL)); + exit($self->Redirect($Page, MakeSecureURL($LoginURL))); } } @@ -75,7 +75,7 @@ sub CheckSecurePage($$) if ($UseSSL && ! SecureConnection()) { - $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); + exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); } } @@ -413,7 +413,7 @@ sub Redirect($$$) } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT); - exit; + return 0; # a suitable exit code } sub GetCurrentSession($) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 919c7a5..8d93957 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -52,7 +52,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/"); # does not return + exit($self->Redirect("/")); } $self->{JobId} = $JobId; @@ -193,8 +193,7 @@ sub OnCancel($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnRestart($) @@ -215,8 +214,7 @@ sub OnRestart($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnAction($$$) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index d9757ed..ac64fc2 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -135,8 +135,7 @@ sub OnLogIn($) { $Target = "/"; } - $self->Redirect(MakeSecureURL($Target)); # does not return - exit; + exit($self->Redirect(MakeSecureURL($Target))); } sub OnAction($$) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 98d1338..79d1c87 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1265,8 +1265,7 @@ sub _SubmitJob($$) return undef; } - $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey())); } sub OnSubmit($) @@ -1323,14 +1322,8 @@ sub OnOK($) { my ($self) = @_; - if (defined $self->{JobKey}) - { - $self->Redirect("/JobDetails.pl?Key=$self->{JobKey}"); # does not return - } - else - { - $self->Redirect("/"); # does not return - } + my $Target = defined $self->{JobKey} ? "/JobDetails.pl?Key=$self->{JobKey}" : "/"; + exit($self->Redirect($Target)); } sub OnAction($$) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index cb253bd..456e73f 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -71,8 +71,8 @@ sub GetActions($) sub OnDownload($) { my ($self) = @_; - $self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours")); # does not return - exit; + + exit($self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours"))); } sub OnAction($$) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 534336c..02d9f8e 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -237,8 +237,7 @@ sub OnSubmit($) return undef; } - $self->Redirect("/"); # does not return - exit; + exit($self->Redirect("/")); } sub OnAction($$) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 2cf0f59..8c26930 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -74,8 +74,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnReject($) @@ -87,8 +86,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnOK($) @@ -101,8 +99,7 @@ sub OnOK($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnAction($$)

1 0

Huw Davies : winealsa: Move release_render_buffer to the unixlib.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 08648f02135666d78b9f424e751b77721bc1826d URL: https://source.winehq.org/git/wine.git/?a=commit;h=08648f02135666d78b9f424e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 4 09:54:20 2022 +0000 winealsa: Move release_render_buffer 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/winealsa.drv/alsa.c | 58 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 73 ++++---------------------------------------- dlls/winealsa.drv/unixlib.h | 9 ++++++ 3 files changed, 73 insertions(+), 67 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 57a605b6bdf..302a525e52d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1634,6 +1634,63 @@ static NTSTATUS get_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) +{ + snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; + + if(written_bytes <= chunk_bytes){ + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); + }else{ + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, + written_bytes - chunk_bytes); + } +} + +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 written_frames = params->written_frames; + BYTE *buffer; + + alsa_lock(stream); + + if(!written_frames){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + else + buffer = stream->tmp_buffer; + + if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, written_frames); + + if(stream->getbuf_last < 0) + alsa_wrap_buffer(stream, buffer, written_frames); + + stream->wri_offs_frames += written_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1966,6 +2023,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, timer_loop, get_render_buffer, + release_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5d99ede8a4f..e5512880442 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -689,18 +689,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1314,70 +1302,21 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return params.result; } -static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) -{ - snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; - UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; - snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; - - if(written_bytes <= chunk_bytes){ - memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); - }else{ - memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(stream->local_buffer, buffer + chunk_bytes, - written_bytes - chunk_bytes); - } -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct alsa_stream *stream = This->stream; - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - alsa_lock(stream); - - if(!written_frames){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } - - if(stream->getbuf_last >= 0) - buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; - else - buffer = stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, written_frames); - - if(stream->getbuf_last < 0) - alsa_wrap_buffer(stream, buffer, written_frames); - - stream->wri_offs_frames += written_frames; - stream->wri_offs_frames %= stream->bufsize_frames; - stream->held_frames += written_frames; - stream->written_frames += written_frames; - stream->getbuf_last = 0; + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; - alsa_unlock(stream); + ALSA_CALL(release_render_buffer, &params); - return S_OK; + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index fb137d6b9ff..bef38c2a1a9 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -122,6 +122,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct alsa_stream *stream; + UINT32 written_frames; + UINT flags; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -178,6 +186,7 @@ enum alsa_funcs alsa_reset, alsa_timer_loop, alsa_get_render_buffer, + alsa_release_render_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size,

1 0

Huw Davies : winealsa: Move get_capture_buffer to the unixlib.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: bb43ae25f9c17b03075a4053f465e2e1eb5f9b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb43ae25f9c17b03075a4053… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 4 09:54:21 2022 +0000 winealsa: Move get_capture_buffer 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/winealsa.drv/alsa.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 69 ++++++-------------------------------------- dlls/winealsa.drv/unixlib.h | 12 ++++++++ 3 files changed, 83 insertions(+), 60 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 302a525e52d..60ef49c4c1a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1691,6 +1691,67 @@ static NTSTATUS release_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 *frames = params->frames; + SIZE_T size; + + alsa_lock(stream); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->held_frames < stream->mmdev_period_frames){ + *frames = 0; + return alsa_unlock_result(stream, &params->result, AUDCLNT_S_BUFFER_EMPTY); + } + *frames = stream->mmdev_period_frames; + + if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ + UINT32 chunk_bytes, offs_bytes, frames_bytes; + if(stream->tmp_buffer_frames < *frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = *frames; + } + + *params->data = stream->tmp_buffer; + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * + stream->fmt->nBlockAlign; + offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + frames_bytes = *frames * stream->fmt->nBlockAlign; + memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); + memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, + frames_bytes - chunk_bytes); + }else + *params->data = stream->local_buffer + + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *frames; + *params->flags = 0; + + if(params->devpos) + *params->devpos = stream->written_frames; + if(params->qpcpos){ /* fixme: qpc of recording time */ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2024,6 +2085,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = timer_loop, get_render_buffer, release_render_buffer, + get_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e5512880442..cecb358bab7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1369,8 +1369,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; - SIZE_T size; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1383,66 +1382,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - alsa_lock(stream); - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - /* hr = GetNextPacketSize(iface, frames); */ - if(stream->held_frames < stream->mmdev_period_frames){ - *frames = 0; - alsa_unlock(stream); - return AUDCLNT_S_BUFFER_EMPTY; - } - *frames = stream->mmdev_period_frames; - - if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ - UINT32 chunk_bytes, offs_bytes, frames_bytes; - if(stream->tmp_buffer_frames < *frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - alsa_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = *frames; - } - - *data = stream->tmp_buffer; - chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * - stream->fmt->nBlockAlign; - offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; - frames_bytes = *frames * stream->fmt->nBlockAlign; - memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); - memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, - frames_bytes - chunk_bytes); - }else - *data = stream->local_buffer + - stream->lcl_offs_frames * stream->fmt->nBlockAlign; - - stream->getbuf_last = *frames; - *flags = 0; - - if(devpos) - *devpos = stream->written_frames; - if(qpcpos){ /* fixme: qpc of recording time */ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; - alsa_unlock(stream); + ALSA_CALL(get_capture_buffer, &params); - return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index bef38c2a1a9..c4efe5ad764 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -130,6 +130,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct alsa_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + UINT *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct is_format_supported_params { const char *alsa_name; @@ -187,6 +198,7 @@ enum alsa_funcs alsa_timer_loop, alsa_get_render_buffer, alsa_release_render_buffer, + alsa_get_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size,

1 0

Huw Davies : winealsa: Move release_capture_buffer to the unixlib.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: bc70c4dabfb77bc01dccc4bdc6528df95f50b93e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc70c4dabfb77bc01dccc4bd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 4 09:54:22 2022 +0000 winealsa: Move release_capture_buffer 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/winealsa.drv/alsa.c | 29 +++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 31 +++++-------------------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 60ef49c4c1a..02063fd3374 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1752,6 +1752,34 @@ static NTSTATUS get_capture_buffer(void *args) return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); } +static NTSTATUS release_capture_buffer(void *args) +{ + struct release_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 done = params->done; + + alsa_lock(stream); + + if(!done){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->getbuf_last != done) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + stream->written_frames += done; + stream->held_frames -= done; + stream->lcl_offs_frames += done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2086,6 +2114,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_render_buffer, release_render_buffer, get_capture_buffer, + release_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cecb358bab7..b50025aa77c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1398,37 +1398,16 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; + struct release_capture_buffer_params params; TRACE("(%p)->(%u)\n", This, done); - alsa_lock(stream); - - if(!done){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(stream->getbuf_last != done){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } + params.stream = This->stream; + params.done = done; - stream->written_frames += done; - stream->held_frames -= done; - stream->lcl_offs_frames += done; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->getbuf_last = 0; + ALSA_CALL(release_capture_buffer, &params); - alsa_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c4efe5ad764..ddca1a3100c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -141,6 +141,13 @@ struct get_capture_buffer_params UINT64 *qpcpos; }; +struct release_capture_buffer_params +{ + struct alsa_stream *stream; + UINT32 done; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -199,6 +206,7 @@ enum alsa_funcs alsa_get_render_buffer, alsa_release_render_buffer, alsa_get_capture_buffer, + alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size,

1 0

Jacek Caban : win32u: Move GetClientRect implementation from user32.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: fd5849382a1ddfa9798ca418397e3fcf5a094ef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5849382a1ddfa9798ca418… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:22:49 2022 +0100 win32u: Move GetClientRect 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/winpos.c | 2 +- dlls/win32u/window.c | 8 ++++++++ include/ntuser.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index ba46440bc36..1387552ca55 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -225,7 +225,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) */ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) { - return WIN_GetRectangles( hwnd, COORDS_CLIENT, NULL, rect ); + return NtUserCallHwndParam( hwnd, (UINT_PTR)rect, NtUserGetClientRect ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 19b2b4335f8..abfc19de40a 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1139,6 +1139,12 @@ BOOL get_window_rect( HWND hwnd, RECT *rect ) return get_window_rects( hwnd, COORDS_SCREEN, rect, NULL, get_thread_dpi() ); } +/* see GetClientRect */ +static BOOL get_client_rect( HWND hwnd, RECT *rect ) +{ + return get_window_rects( hwnd, COORDS_CLIENT, NULL, rect, get_thread_dpi() ); +} + /* see GetWindowInfo */ static BOOL get_window_info( HWND hwnd, WINDOWINFO *info ) { @@ -1357,6 +1363,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_class_long_ptr( hwnd, param, FALSE ); case NtUserGetClassWord: return get_class_word( hwnd, param ); + case NtUserGetClientRect: + return get_client_rect( hwnd, (RECT *)param ); case NtUserGetWindowInfo: return get_window_info( hwnd, (WINDOWINFO *)param ); case NtUserGetWindowLongA: diff --git a/include/ntuser.h b/include/ntuser.h index 5192bd63a90..547471daf69 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -160,6 +160,7 @@ enum NtUserGetClassLongPtrA, NtUserGetClassLongPtrW, NtUserGetClassWord, + NtUserGetClientRect, NtUserGetWindowInfo, NtUserGetWindowLongA, NtUserGetWindowLongW,

1 0

Stefan Dösinger : wined3d: Use extra bits in the queue head and tail counters.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: e308f53aa6eedef6f86ea39fef463f6932c293ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=e308f53aa6eedef6f86ea39f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 9 13:48:29 2022 +0300 wined3d: Use extra bits in the queue head and tail counters. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 28 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce297d724f2..c4d68fd8f4f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -624,7 +624,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset) { - struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[*offset]; + struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[WINED3D_CS_QUEUE_MASK(*offset)]; *offset += offsetof(struct wined3d_cs_packet, data[packet->size]); @@ -3263,7 +3263,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) { wined3d_from_cs(cs); - return *(volatile LONG *)&queue->head == queue->tail; + return *(volatile ULONG *)&queue->head == queue->tail; } static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined3d_cs *cs) @@ -3271,10 +3271,10 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined struct wined3d_cs_packet *packet; size_t packet_size; - packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + packet = (struct wined3d_cs_packet *)&queue->data[WINED3D_CS_QUEUE_MASK(queue->head)]; TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); - InterlockedExchange(&queue->head, (queue->head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1)); + InterlockedExchange((LONG *)&queue->head, queue->head + packet_size); if (InterlockedCompareExchange(&cs->waiting_for_event, FALSE, TRUE)) SetEvent(cs->event); @@ -3295,6 +3295,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size size_t queue_size = ARRAY_SIZE(queue->data); size_t header_size, packet_size, remaining; struct wined3d_cs_packet *packet; + ULONG head = WINED3D_CS_QUEUE_MASK(queue->head); header_size = FIELD_OFFSET(struct wined3d_cs_packet, data[0]); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[size]); @@ -3307,7 +3308,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size return NULL; } - remaining = queue_size - queue->head; + remaining = queue_size - head; if (remaining < packet_size) { size_t nop_size = remaining - header_size; @@ -3321,19 +3322,19 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size nop->opcode = WINED3D_CS_OP_NOP; wined3d_cs_queue_submit(queue, cs); - assert(!queue->head); + head = WINED3D_CS_QUEUE_MASK(queue->head); + assert(!head); } for (;;) { - LONG tail = *(volatile LONG *)&queue->tail; - LONG head = queue->head; - LONG new_pos; + ULONG tail = WINED3D_CS_QUEUE_MASK(*(volatile ULONG *)&queue->tail); + ULONG new_pos; /* Empty. */ if (head == tail) break; - new_pos = (head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1); + new_pos = WINED3D_CS_QUEUE_MASK(head + packet_size); /* Head ahead of tail. We checked the remaining size above, so we only * need to make sure we don't make head equal to tail. */ if (head > tail && (new_pos != tail)) @@ -3347,7 +3348,7 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size head, tail, (unsigned long)packet_size); } - packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + packet = (struct wined3d_cs_packet *)&queue->data[head]; packet->size = size; return packet->data; } @@ -3370,7 +3371,7 @@ static void wined3d_cs_mt_finish(struct wined3d_device_context *context, enum wi if (cs->thread_id == GetCurrentThreadId()) return wined3d_cs_st_finish(context, queue_id); - while (cs->queue[queue_id].head != *(volatile LONG *)&cs->queue[queue_id].tail) + while (cs->queue[queue_id].head != *(volatile ULONG *)&cs->queue[queue_id].tail) YieldProcessor(); } @@ -3496,8 +3497,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) TRACE("%s at %p executed.\n", debug_cs_op(opcode), packet); } - tail &= (WINED3D_CS_QUEUE_SIZE - 1); - InterlockedExchange(&queue->tail, tail); + InterlockedExchange((LONG *)&queue->tail, tail); } cs->queue[WINED3D_CS_QUEUE_MAP].tail = cs->queue[WINED3D_CS_QUEUE_MAP].head; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 58ef6764f2d..895f7a76a26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4904,10 +4904,11 @@ enum wined3d_push_constants #define WINED3D_CS_QUERY_POLL_INTERVAL 10u #define WINED3D_CS_QUEUE_SIZE 0x100000u #define WINED3D_CS_SPIN_COUNT 10000000u +#define WINED3D_CS_QUEUE_MASK(a) ((a) & (WINED3D_CS_QUEUE_SIZE - 1)) struct wined3d_cs_queue { - LONG head, tail; + ULONG head, tail; BYTE data[WINED3D_CS_QUEUE_SIZE]; };

1 0