January 2022 - Wine-Devel - list.winehq.org

[PATCH v2 5/6] msvcp140_atomic_wait: Implement __std_close_threadpool_work.

by Daniel Lehman

Jan. 27, 2022

[PATCH v2 4/6] msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.

by Daniel Lehman

Jan. 27, 2022

[PATCH v2 3/6] msvcp140_atomic_wait: Implement __std_submit_threadpool_work.

by Daniel Lehman

Jan. 27, 2022

[PATCH v2 2/6] msvcp140_atomic_wait: Implement __std_create_threadpool_work.

by Daniel Lehman

Jan. 27, 2022

[PATCH v2 1/6] msvcp140_atomic_wait/tests: Add test for threadpool_work functions.

by Daniel Lehman

v2 - use interlockedincrement

Jan. 27, 2022

[PATCH 2/2] winmm: Don't process audio data during waveOutWrite while playing

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/tests/wave.c | 1 - dlls/winmm/waveform.c | 16 +++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 56501367190..5e46a2f46e5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1640,7 +1640,6 @@ static void CALLBACK test_reentrant_callback_func(HWAVEOUT hwo, UINT uMsg, case WOM_DONE: /* verify that WOM_DONE is not sent during the following waveOutWrite */ - todo_wine_if(wom_done_count == 1) ok(g_tid == 0, "callback called reentrantly\n"); g_tid = GetCurrentThreadId(); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1159b48b483..ecffa700662 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -191,6 +191,7 @@ static LRESULT WOD_Close(HWAVEOUT hwave); static LRESULT WID_Open(WINMM_OpenInfo *info); static LRESULT WID_Close(HWAVEIN hwave); static MMRESULT WINMM_BeginPlaying(WINMM_Device *device); +static void WOD_PushData(WINMM_Device *device); void WINMM_DeleteWaveform(void) { @@ -775,8 +776,11 @@ static HRESULT reroute_mapper_device(WINMM_Device *device, BOOL is_out) HeapFree(GetProcessHeap(), 0, info.format); - if(!stopped) + if(!stopped){ + if(is_out) + WOD_PushData(device); WINMM_BeginPlaying(device); + } LeaveCriticalSection(&device->lock); @@ -1948,10 +1952,6 @@ static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) TRACE("(%p)\n", device->handle); - if(device->render) - /* prebuffer data before starting */ - WOD_PushData(device); - if(device->stopped){ device->stopped = FALSE; @@ -2893,6 +2893,9 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) header->dwFlags &= ~WHDR_DONE; header->dwFlags |= WHDR_INQUEUE; + if(device->stopped) + WOD_PushData(device); + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); @@ -2970,6 +2973,9 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) device->stopped = TRUE; + if(device->render) + WOD_PushData(device); + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); -- 2.35.0

Jan. 27, 2022

[PATCH 1/2] winmm/tests: Demonstrate that WOM_DONE is not invoked reentrantly

by Andrew Eikum

From: Liam Murphy <liampm32(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/tests/wave.c | 103 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2f0c8443363..56501367190 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1626,6 +1626,108 @@ static void test_fragmentsize(void) CloseHandle(hevent); } +static void CALLBACK test_reentrant_callback_func(HWAVEOUT hwo, UINT uMsg, + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + static int wom_done_count = 0; + + switch(uMsg){ + case WOM_OPEN: + case WOM_CLOSE: + ok(GetCurrentThreadId() == g_tid, "Got different thread ID\n"); + break; + + case WOM_DONE: + /* verify that WOM_DONE is not sent during the following waveOutWrite */ + todo_wine_if(wom_done_count == 1) + ok(g_tid == 0, "callback called reentrantly\n"); + + g_tid = GetCurrentThreadId(); + + if(wom_done_count++ == 0){ + Sleep(125); /* ensure 2nd header is done playing before waveOutWrite */ + waveOutWrite(hwo, (WAVEHDR *)dwParam1, sizeof(WAVEHDR)); + } + + break; + } + + g_tid = 0; + SetEvent((HANDLE)dwInstance); +} + +static void test_reentrant_callback(void) +{ + MMRESULT rc; + WAVEHDR hdr[2]; + HWAVEOUT wout; + WAVEFORMATEX fmt; + DWORD wait; + HANDLE hevent; + + if(waveOutGetNumDevs() == 0) + return; + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = sizeof(WAVEFORMATEX); + + hevent = CreateEventW(NULL, FALSE, FALSE, NULL); + g_tid = GetCurrentThreadId(); + + rc = waveOutOpen(&wout, WAVE_MAPPER, &fmt, (DWORD_PTR)test_reentrant_callback_func, + (DWORD_PTR)hevent, CALLBACK_FUNCTION); + ok(rc == MMSYSERR_NOERROR || rc == WAVERR_BADFORMAT || + rc == MMSYSERR_INVALFLAG || rc == MMSYSERR_INVALPARAM, + "waveOutOpen(%s) failed: %s\n", dev_name(WAVE_MAPPER), wave_out_error(rc)); + if(rc != MMSYSERR_NOERROR){ + CloseHandle(hevent); + return; + } + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "wave open callback missed\n"); + + memset(hdr, 0, sizeof(hdr)); + hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 10); + hdr[1].dwBufferLength = hdr[0].dwBufferLength; + hdr[1].lpData = hdr[0].lpData = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + + rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + rc = waveOutPrepareHeader(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + rc = waveOutWrite(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + rc = waveOutWrite(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 1 callback missed\n"); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 2 callback missed\n"); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 3 callback missed\n"); + + g_tid = GetCurrentThreadId(); + rc = waveOutClose(wout); + ok(rc == MMSYSERR_NOERROR, "waveOutClose failed: %s\n", wave_out_error(rc)); + + HeapFree(GetProcessHeap(), 0, hdr[0].lpData); + CloseHandle(hevent); +} + static void create_wav_file(char *temp_file) { WAVEFORMATEX format; @@ -1727,5 +1829,6 @@ START_TEST(wave) wave_out_tests(); test_sndPlaySound(); test_fragmentsize(); + test_reentrant_callback(); test_PlaySound(); } -- 2.35.0

Jan. 27, 2022

[PATCH] include: Add some ListView flags.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 164de374604..944a9158371 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3158,11 +3158,18 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVNI_SELECTED 0x0002 #define LVNI_CUT 0x0004 #define LVNI_DROPHILITED 0x0008 +#define LVNI_STATEMASK (LVNI_FOCUSED | LVNI_SELECTED | LVNI_CUT | LVNI_DROPHILITED) + +#define LVNI_VISIBLEORDER 0x0010 +#define LVNI_PREVIOUS 0x0020 +#define LVNI_VISIBLEONLY 0x0040 +#define LVNI_SAMEGROUPONLY 0x0080 #define LVNI_ABOVE 0x0100 #define LVNI_BELOW 0x0200 #define LVNI_TOLEFT 0x0400 #define LVNI_TORIGHT 0x0800 +#define LVNI_DIRECTIONMASK (LVNI_ABOVE | LVNI_BELOW | LVNI_TOLEFT | LVNI_TORIGHT) #define LVHT_NOWHERE 0x0001 #define LVHT_ONITEMICON 0x0002 @@ -3201,6 +3208,12 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVGS_NORMAL 0x00000000 #define LVGS_COLLAPSED 0x00000001 #define LVGS_HIDDEN 0x00000002 +#define LVGS_NOHEADER 0x00000004 +#define LVGS_COLLAPSIBLE 0x00000008 +#define LVGS_FOCUSED 0x00000010 +#define LVGS_SELECTED 0x00000020 +#define LVGS_SUBSETED 0x00000040 +#define LVGS_SUBSETLINKFOCUSED 0x00000080 #define LVGA_HEADER_LEFT 0x00000001 #define LVGA_HEADER_CENTER 0x00000002 -- 2.34.1

Jan. 27, 2022

Re: [PATCH 6/6] msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work.

by Piotr Caban

On 1/27/22 16:04, Daniel Lehman wrote: >> The workcalled < 1234 occasionally fails on my machine (and if it doesn't we end with workcalled around 1230). Please remove the test or find a way to avoid the race. > I wanted a way to show the 2nd argument was really a cancel, but wasn't sure about the best way. the 1234 seemed to work consistently for my box - would a higher number be ok? if not, would removing the test for now be ok, to avoid random failures? I don't really like increasing the number - it seems fragile and the number is already quite big. I think it's better to remove the test. You can also add Sleep in callback but it's not the nicest solution either.

Jan. 27, 2022

Re: [PATCH vkd3d] vkd3d-shader: Handle VKD3DSUF_GLOBALLY_COHERENT in vkd3d_dxbc_compiler_emit_dcl_resource_raw().

by Henri Verbeet

On Tue, 25 Jan 2022 at 13:47, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c > index 1ffce6a..a361cc7 100644 > --- a/libs/vkd3d-shader/spirv.c > +++ b/libs/vkd3d-shader/spirv.c > @@ -6091,8 +6091,16 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler > const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; > uint32_t flags = instruction->flags; > > + if (flags & VKD3DSUF_GLOBALLY_COHERENT) > + { > + flags &= ~VKD3DSUF_GLOBALLY_COHERENT; > + } > /* We don't distinguish between APPEND and COUNTER UAVs. */ > - flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; > + if (flags & VKD3DSUF_ORDER_PRESERVING_COUNTER) > + { > + flags &= ~VKD3DSUF_ORDER_PRESERVING_COUNTER; > + } > + I don't think we can just ignore VKD3DSUF_GLOBALLY_COHERENT. This is probably supposed to map the the "scope" parameter in vkd3d_dxbc_compiler_emit_atomic_instruction(), and possibly others.

Jan. 27, 2022