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

Jeremy Newman : fix typos in news
by Jeremy Newman 04 Mar '22

04 Mar '22

Module: website Branch: master Commit: dc7081c8037c5f8f48b53726997e3cfd94ed9748 URL: https://source.winehq.org/git/website.git/?a=commit;h=dc7081c8037c5f8f48b53… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Mar 4 15:18:52 2022 -0600 fix typos in news --- news/en/2022030402.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/news/en/2022030402.xml b/news/en/2022030402.xml index 8252a84f..c8735698 100644 --- a/news/en/2022030402.xml +++ b/news/en/2022030402.xml @@ -1,11 +1,11 @@ <news> - <date>Month DD, YYYY</date> + <date>March 4, 2022</date> <title>World Wine News Issue 413</title> <body> <a href="{$root}/wwn/413">WWN Issue 413</a> was released today. <ul> - <li><a href="{$root}/wwn/413#A WineD3D">???</a>WineD3D</li> - <li><a href="{$root}/wwn/413#A Vkd3D">???</a>Vkd3D</li> + <li><a href="{$root}/wwn/413#WineD3D">WineD3D</a></li> + <li><a href="{$root}/wwn/413#Vkd3D">Vkd3D</a></li> </ul> </body> </news>

1 0

Cressida Silver : wwn 413
by Jeremy Newman 04 Mar '22

04 Mar '22

Module: website Branch: master Commit: ed369faf46e4147529277b1e2f600cb7991671bb URL: https://source.winehq.org/git/website.git/?a=commit;h=ed369faf46e4147529277… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Mar 4 12:42:36 2022 -0600 wwn 413 --- news/en/2022030402.xml | 11 +++ wwn/en/wn20220304_413.xml | 219 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+) diff --git a/news/en/2022030402.xml b/news/en/2022030402.xml new file mode 100644 index 00000000..8252a84f --- /dev/null +++ b/news/en/2022030402.xml @@ -0,0 +1,11 @@ +<news> + <date>Month DD, YYYY</date> + <title>World Wine News Issue 413</title> + <body> + <a href="{$root}/wwn/413">WWN Issue 413</a> was released today. + <ul> + <li><a href="{$root}/wwn/413#A WineD3D">???</a>WineD3D</li> + <li><a href="{$root}/wwn/413#A Vkd3D">???</a>Vkd3D</li> + </ul> + </body> +</news> diff --git a/wwn/en/wn20220304_413.xml b/wwn/en/wn20220304_413.xml new file mode 100644 index 00000000..cbd4052c --- /dev/null +++ b/wwn/en/wn20220304_413.xml @@ -0,0 +1,219 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="413" date="03/04/2022"/> + <intro> + <p> + This is the 413th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code. + </p> + </intro> + + <section title="WineD3D" subject="" archive="" posts=""> + <p> + A while back (circa 2013), a Direct3D command stream was implemented in Wine. Many applications benefited from the command stream, but not all. In the early implementation, applications + trying to replace part or all of a resource with new data had to wait until existing rendering commands using that resource were finished. + </p> + + <p> + This is a problem that's been known for years, and there have been attempts to fix it. One such attempt was part of the initial command stream patches in 2013 and lived in wine-staging for a time. Another fix was distributed under the name <i>wine-pba.</i> There were a few other attempts to fix limited subsets of the problem, many of fixes were never submitted upstream. + </p> + + <p> + Over the last year Zeb, Matteo, and Henri have been chipping away at the problem, and the release of Wine 7.3 resolves almost all issues around asynchronous resource updates. That's not to say the work is completely done. There are still performance gains to be had, but a big bottleneck is removed. As a result, the application of all D3D versions should perform better though most notably for D3D9 and later). + </p> + + </section> + + <section title="Vkd3D" subject="" archive="" posts=""> + + <p> + Vkd3D 1.3 was released 3/2/22, bringing improved support for Direct3D 12 applications in Wine, and the foundations for various features implemented by the d3dcompiler DLLs. + </p> + + <p> + Games are major users of the Direct3D APIs — perhaps the most prominent — they are not the only users of these APIs. + </p> + </section> + + <section title="Bugs: In Memoriam"> + <p> + <center> + <table cellspacing="0" cellpadding="3" bordercolor="#222222" border="1"> + <tr> + <td width="100" align="center"> + <b>Bug ID</b> + </td> + <td width="100" align="center"> + <b>Open Date</b> + </td> + <td width="100" align="center"> + <b>Days Open</b> + </td> + <td width="100" align="center"> + <b>Weeks Open</b> + </td> + <td width="100" align="center"> + <b>Months Open</b> + </td> + <td width="100" align="center"> + <b>Years Open</b> + </td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=38210">38210</a> + </td> + <td align="center">3/10/15</td> + <td align="center">2544</td> + <td align="center">363</td> + <td align="center">83</td> + <td align="center">7</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=41386">41386</a> + </td> + <td align="center">6/24/16</td> + <td align="center">2072</td> + <td align="center">296</td> + <td align="center">68</td> + <td align="center">6</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=44635">44635</a> + </td> + <td align="center">2/28/18</td> + <td align="center">1458</td> + <td align="center">208</td> + <td align="center">47</td> + <td align="center">4</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=44658">44658</a> + </td> + <td align="center">3/4/18</td> + <td align="center">1454</td> + <td align="center">208</td> + <td align="center">47</td> + <td align="center">4</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=48096">48096</a> + </td> + <td align="center">11/13/19</td> + <td align="center">835</td> + <td align="center">119</td> + <td align="center">27</td> + <td align="center">2</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=48201">48201</a> + </td> + <td align="center">11/30/19</td> + <td align="center">818</td> + <td align="center">117</td> + <td align="center">26</td> + <td align="center">2</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=48733">48733</a> + </td> + <td align="center">3/9/20</td> + <td align="center">718</td> + <td align="center">103</td> + <td align="center">23</td> + <td align="center">2</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=48760">48760</a> + </td> + <td align="center">3/16/20</td> + <td align="center">711</td> + <td align="center">102</td> + <td align="center">23</td> + <td align="center">2</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=51103">51103</a> + </td> + <td align="center">5/7/21</td> + <td align="center">294</td> + <td align="center">42</td> + <td align="center">9</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=52155">52155</a> + </td> + <td align="center">12/3/21</td> + <td align="center">84</td> + <td align="center">12</td> + <td align="center">2</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=48815">48815</a> + </td> + <td align="center">12/27/21</td> + <td align="center">60</td> + <td align="center">9</td> + <td align="center">1</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=52434">52434</a> + </td> + <td align="center">1/21/22</td> + <td align="center">35</td> + <td align="center">5</td> + <td align="center">1</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=52526">52526</a> + </td> + <td align="center">2/6/22</td> + <td align="center">19</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=52561">52561</a> + </td> + <td align="center">2/17/22</td> + <td align="center">8</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href="https://bugs.winehq.org/show_bug.cgi?id=52583">52583</a> + </td> + <td align="center">2/23/22</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + </table> + </center> + </p> + </section> + +</kc>

1 0

Eric Pouech : mmdevapi/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 8e1b054be44515d24a351db7cb69900657f2d0fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1b054be44515d24a351db7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:07 2022 +0100 mmdevapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/Makefile.in | 1 - dlls/mmdevapi/tests/capture.c | 398 +++++++++--------- dlls/mmdevapi/tests/dependency.c | 12 +- dlls/mmdevapi/tests/mmdevenum.c | 86 ++-- dlls/mmdevapi/tests/propstore.c | 52 +-- dlls/mmdevapi/tests/render.c | 820 ++++++++++++++++++------------------- dlls/mmdevapi/tests/spatialaudio.c | 108 ++--- 7 files changed, 738 insertions(+), 739 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e1b054be44515d24a35…

1 0

Eric Pouech : msacm32/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: f6483b211299bb55908fe54706a6b651fe7d08eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6483b211299bb55908fe547… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:25 2022 +0100 msacm32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/Makefile.in | 1 - dlls/msacm32/tests/msacm.c | 76 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6483b211299bb55908f…

1 0

Huw Davies : winealsa: Add a temporary write_best_effort syscall.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 4195b3465cae4f867df886942a1e83cd2553fe3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4195b3465cae4f867df88694… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 10:53:15 2022 +0000 winealsa: Add a temporary write_best_effort syscall. This will allow the timing loop to move over without needing to move "start" at the same time. 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 | 237 ++++++++++++++++++++++++++++++++++++++++++- dlls/winealsa.drv/mmdevdrv.c | 230 ++--------------------------------------- dlls/winealsa.drv/unixlib.h | 10 ++ 3 files changed, 252 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4195b3465cae4f867df8…

1 0

Huw Davies : winealsa: Move timer_loop to the unixlib.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: c32898c722fd707fc0fbfe45fccac62dbb003fe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32898c722fd707fc0fbfe45… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 10:53:16 2022 +0000 winealsa: Move timer_loop 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 | 240 +++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 229 ++++------------------------------------- dlls/winealsa.drv/unixlib.h | 9 +- 3 files changed, 268 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c32898c722fd707fc0fb…

1 0

Huw Davies : winealsa: Move start to the unixlib.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 1420d247a29da5e84b4dbe56cccc24ba18625f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1420d247a29da5e84b4dbe56… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 10:53:17 2022 +0000 winealsa: Move start 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 | 56 +++++++++++++++++++++---- dlls/winealsa.drv/mmdevdrv.c | 97 +++----------------------------------------- dlls/winealsa.drv/unixlib.h | 17 ++++---- 3 files changed, 59 insertions(+), 111 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index d455a3787e8..a5558718f47 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1214,13 +1214,6 @@ static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE return written; } -static NTSTATUS write_best_effort(void *args) -{ - struct write_best_effort_tmp_params *params = args; - *params->written = alsa_write_best_effort(params->stream, params->buf, params->frames); - return STATUS_SUCCESS; -} - static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, snd_pcm_uframes_t to_write) @@ -1416,6 +1409,52 @@ exit: NtSetEvent(stream->event, NULL); } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_SET); + + if(stream->started) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + if(stream->flow == eCapture){ + /* dump any data that might be leftover in the ALSA capture buffer */ + snd_pcm_readi(stream->pcm_handle, stream->local_buffer, + stream->bufsize_frames); + }else{ + snd_pcm_sframes_t avail, written; + snd_pcm_uframes_t offs; + + avail = snd_pcm_avail_update(stream->pcm_handle); + avail = min(avail, stream->held_frames); + + if(stream->wri_offs_frames < stream->held_frames) + offs = stream->bufsize_frames - stream->held_frames + stream->wri_offs_frames; + else + offs = stream->wri_offs_frames - stream->held_frames; + + /* fill it with data */ + written = alsa_write_buffer_wrap(stream, stream->local_buffer, + stream->bufsize_frames, offs, avail); + + if(written > 0){ + stream->lcl_offs_frames = (offs + written) % stream->bufsize_frames; + stream->data_in_alsa_frames = written; + }else{ + stream->lcl_offs_frames = offs; + stream->data_in_alsa_frames = 0; + } + } + stream->started = TRUE; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; @@ -1761,12 +1800,11 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + start, timer_loop, is_format_supported, get_mix_format, get_buffer_size, get_latency, get_current_padding, - - write_best_effort /* temporary */ }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2748cc552a6..5eab548e606 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -963,51 +963,6 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) -{ - struct write_best_effort_tmp_params params; - snd_pcm_sframes_t written; - - params.stream = stream; - params.buf = buf; - params.frames = frames; - params.written = &written; - - ALSA_CALL(write_best_effort_tmp, &params); - - return written; -} - -static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE *buf, - snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, - snd_pcm_uframes_t to_write) -{ - snd_pcm_sframes_t ret = 0; - - while(to_write){ - snd_pcm_uframes_t chunk; - snd_pcm_sframes_t tmp; - - if(offs + to_write > buflen) - chunk = buflen - offs; - else - chunk = to_write; - - tmp = alsa_write_best_effort(stream, buf + offs * stream->fmt->nBlockAlign, chunk); - if(tmp < 0) - return ret; - if(!tmp) - break; - - ret += tmp; - to_write -= tmp; - offs += tmp; - offs %= buflen; - } - - return ret; -} - static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) { LARGE_INTEGER time_freq, current_time, time_diff; @@ -1053,7 +1008,7 @@ static int alsa_rewind_best_effort(ACImpl *This) static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct start_params params; TRACE("(%p)\n", This); @@ -1064,60 +1019,18 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - alsa_lock(stream); - - if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ - alsa_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(stream->started){ - alsa_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if(stream->flow == eCapture){ - /* dump any data that might be leftover in the ALSA capture buffer */ - snd_pcm_readi(stream->pcm_handle, stream->local_buffer, - stream->bufsize_frames); - }else{ - snd_pcm_sframes_t avail, written; - snd_pcm_uframes_t offs; - - avail = snd_pcm_avail_update(stream->pcm_handle); - avail = min(avail, stream->held_frames); - - if(stream->wri_offs_frames < stream->held_frames) - offs = stream->bufsize_frames - stream->held_frames + stream->wri_offs_frames; - else - offs = stream->wri_offs_frames - stream->held_frames; + params.stream = This->stream; - /* fill it with data */ - written = alsa_write_buffer_wrap(stream, stream->local_buffer, - stream->bufsize_frames, offs, avail); + ALSA_CALL(start, &params); - if(written > 0){ - stream->lcl_offs_frames = (offs + written) % stream->bufsize_frames; - stream->data_in_alsa_frames = written; - }else{ - stream->lcl_offs_frames = offs; - stream->data_in_alsa_frames = 0; - } - } - - if(!This->timer_thread){ + if(SUCCEEDED(params.result) && !This->timer_thread){ This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This->stream, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - stream->started = TRUE; - - alsa_unlock(stream); LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 4acbbcbcf11..c058a920b6e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -91,6 +91,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct alsa_stream *stream; @@ -135,27 +141,18 @@ struct get_current_padding_params UINT32 *padding; }; -struct write_best_effort_tmp_params -{ - struct alsa_stream *stream; - BYTE *buf; - snd_pcm_uframes_t frames; - snd_pcm_sframes_t *written; -}; - enum alsa_funcs { alsa_get_endpoint_ids, alsa_create_stream, alsa_release_stream, + alsa_start, alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, - - alsa_write_best_effort_tmp }; extern unixlib_handle_t alsa_handle;

1 0

Huw Davies : winealsa: Move stop to the unixlib.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 667241753e0926a4e49a53717f65e2f33ab16ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=667241753e0926a4e49a5371… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 10:53:18 2022 +0000 winealsa: Move stop 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 | 60 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 51 +++---------------------------------- dlls/winealsa.drv/unixlib.h | 7 ++++++ 3 files changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index a5558718f47..e5efb6b201b 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1409,6 +1409,47 @@ exit: NtSetEvent(stream->event, NULL); } +static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) +{ + LARGE_INTEGER time_freq, current_time, time_diff; + + NtQueryPerformanceCounter(&current_time, &time_freq); + time_diff.QuadPart = current_time.QuadPart - stream->last_period_time.QuadPart; + return muldiv(time_diff.QuadPart, stream->fmt->nSamplesPerSec, time_freq.QuadPart); +} + +static int alsa_rewind_best_effort(struct alsa_stream *stream) +{ + snd_pcm_uframes_t len, leave; + + /* we can't use snd_pcm_rewindable, some PCM devices crash. so follow + * PulseAudio's example and rewind as much data as we believe is in the + * buffer, minus 1.33ms for safety. */ + + /* amount of data to leave in ALSA buffer */ + leave = interp_elapsed_frames(stream) + stream->safe_rewind_frames; + + if(stream->held_frames < leave) + stream->held_frames = 0; + else + stream->held_frames -= leave; + + if(stream->data_in_alsa_frames < leave) + len = 0; + else + len = stream->data_in_alsa_frames - leave; + + TRACE("rewinding %lu frames, now held %u\n", len, stream->held_frames); + + if(len) + /* snd_pcm_rewind return value is often broken, assume it succeeded */ + snd_pcm_rewind(stream->pcm_handle, len); + + stream->data_in_alsa_frames = 0; + + return len; +} + static NTSTATUS start(void *args) { struct start_params *params = args; @@ -1455,6 +1496,24 @@ static NTSTATUS start(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS stop(void *args) +{ + struct stop_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(!stream->started) + return alsa_unlock_result(stream, &params->result, S_FALSE); + + if(stream->flow == eRender) + alsa_rewind_best_effort(stream); + + stream->started = FALSE; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; @@ -1801,6 +1860,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = create_stream, release_stream, start, + stop, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5eab548e606..d9e96b7790c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -972,39 +972,6 @@ static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) return MulDiv(time_diff.QuadPart, stream->fmt->nSamplesPerSec, time_freq.QuadPart); } -static int alsa_rewind_best_effort(ACImpl *This) -{ - struct alsa_stream *stream = This->stream; - snd_pcm_uframes_t len, leave; - - /* we can't use snd_pcm_rewindable, some PCM devices crash. so follow - * PulseAudio's example and rewind as much data as we believe is in the - * buffer, minus 1.33ms for safety. */ - - /* amount of data to leave in ALSA buffer */ - leave = interp_elapsed_frames(stream) + stream->safe_rewind_frames; - - if(stream->held_frames < leave) - stream->held_frames = 0; - else - stream->held_frames -= leave; - - if(stream->data_in_alsa_frames < leave) - len = 0; - else - len = stream->data_in_alsa_frames - leave; - - TRACE("rewinding %lu frames, now held %u\n", len, stream->held_frames); - - if(len) - /* snd_pcm_rewind return value is often broken, assume it succeeded */ - snd_pcm_rewind(stream->pcm_handle, len); - - stream->data_in_alsa_frames = 0; - - return len; -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1036,28 +1003,18 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct stop_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(!stream->started){ - alsa_unlock(stream); - return S_FALSE; - } - - if(stream->flow == eRender) - alsa_rewind_best_effort(This); - - stream->started = FALSE; + params.stream = This->stream; - alsa_unlock(stream); + ALSA_CALL(stop, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c058a920b6e..1c3caabcc26 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -97,6 +97,12 @@ struct start_params HRESULT result; }; +struct stop_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct alsa_stream *stream; @@ -147,6 +153,7 @@ enum alsa_funcs alsa_create_stream, alsa_release_stream, alsa_start, + alsa_stop, alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format,

1 0

Huw Davies : winealsa: Move reset to the unixlib.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: f3bd61add44997517ad8fe0d91600eb02e427dd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3bd61add44997517ad8fe0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 10:53:19 2022 +0000 winealsa: Move reset 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 | 36 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 37 ++++--------------------------------- dlls/winealsa.drv/unixlib.h | 7 +++++++ 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index e5efb6b201b..8d148a9828f 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1514,6 +1514,41 @@ static NTSTATUS stop(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(stream->started) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_OPERATION_PENDING); + + if(snd_pcm_drop(stream->pcm_handle) < 0) + WARN("snd_pcm_drop failed\n"); + + if(snd_pcm_reset(stream->pcm_handle) < 0) + WARN("snd_pcm_reset failed\n"); + + if(snd_pcm_prepare(stream->pcm_handle) < 0) + WARN("snd_pcm_prepare failed\n"); + + if(stream->flow == eRender){ + stream->written_frames = 0; + stream->last_pos_frames = 0; + }else{ + stream->written_frames += stream->held_frames; + } + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->wri_offs_frames = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; @@ -1861,6 +1896,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d9e96b7790c..fa05cb00968 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1020,47 +1020,18 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(stream->started){ - alsa_unlock(stream); - return AUDCLNT_E_NOT_STOPPED; - } - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(snd_pcm_drop(stream->pcm_handle) < 0) - WARN("snd_pcm_drop failed\n"); - - if(snd_pcm_reset(stream->pcm_handle) < 0) - WARN("snd_pcm_reset failed\n"); - - if(snd_pcm_prepare(stream->pcm_handle) < 0) - WARN("snd_pcm_prepare failed\n"); - - if(stream->flow == eRender){ - stream->written_frames = 0; - stream->last_pos_frames = 0; - }else{ - stream->written_frames += stream->held_frames; - } - stream->held_frames = 0; - stream->lcl_offs_frames = 0; - stream->wri_offs_frames = 0; + params.stream = This->stream; - alsa_unlock(stream); + ALSA_CALL(reset, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 1c3caabcc26..3d88d8d7f9b 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -103,6 +103,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct alsa_stream *stream; @@ -154,6 +160,7 @@ enum alsa_funcs alsa_release_stream, alsa_start, alsa_stop, + alsa_reset, alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format,

1 0

Huw Davies : winealsa: Move set_event_handle to the unixlib.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: f8b670f118bb597418db295087b4463a93be940b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8b670f118bb597418db2950… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 10:53:20 2022 +0000 winealsa: Move set_event_handle 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 | 21 +++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 22 +++++----------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 8d148a9828f..d7c6ae7779c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1889,6 +1889,26 @@ static NTSTATUS get_current_padding(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_event_handle(void *args) +{ + struct set_event_handle_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED); + + if (stream->event){ + FIXME("called twice\n"); + return alsa_unlock_result(stream, &params->result, HRESULT_FROM_WIN32(ERROR_INVALID_NAME)); + } + + stream->event = params->event; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1903,4 +1923,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fa05cb00968..7a99a6b5d43 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1038,7 +1038,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct set_event_handle_params params; TRACE("(%p)->(%p)\n", This, event); @@ -1048,24 +1048,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - alsa_unlock(stream); - return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - } - - if (stream->event){ - alsa_unlock(stream); - FIXME("called twice\n"); - return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - } - - stream->event = event; + params.stream = This->stream; + params.event = event; - alsa_unlock(stream); + ALSA_CALL(set_event_handle, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 3d88d8d7f9b..bd3a1a4bc6a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -153,6 +153,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct set_event_handle_params +{ + struct alsa_stream *stream; + HANDLE event; + HRESULT result; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -167,6 +174,7 @@ enum alsa_funcs alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, + alsa_set_event_handle, }; extern unixlib_handle_t alsa_handle;

1 0