[PATCH v2 0/2] MR6873: dsound: Fix SetNotificationPositions at end of nonlooping buffer
https://store.steampowered.com/app/345610/The_Fruit_of_Grisaia/ likes to call IDirectSoundNotify::SetNotificationPositions with position two bytes before the end of the buffer, then play it nonlooping. If Wine doesn't feel like delivering these notifications, the Quit Game button on the title screen screws up. The game also likes to lock up during scene transitions in Wine/Proton, which I strongly suspect (but haven't confirmed) has the same root cause. (I haven't found a reliable repro for the lockups.) -- v2: dsound: Fix SetNotificationPositions at end of nonlooping buffer. dsound/tests: Add nonlooping SetNotificationPositions test. https://gitlab.winehq.org/wine/wine/-/merge_requests/6873
From: Alfred Agrell <floating(a)muncher.se> --- dlls/dsound/tests/dsound.c | 98 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 7a815e0ce0b..1518ff00073 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1702,6 +1702,103 @@ static void test_notifications(LPGUID lpGuid) IDirectSound_Release(dso); } +static void test_notifications_noloop(LPGUID lpGuid) +{ + HRESULT rc; + IDirectSound *dso; + IDirectSoundBuffer *buf; + IDirectSoundNotify *buf_notif; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + DSBPOSITIONNOTIFY notifies[2]; + HANDLE handles[2]; + DWORD status, wait; + + rc = DirectSoundCreate(lpGuid, &dso, NULL); + ok(rc == DS_OK || rc == DSERR_NODRIVER || rc == DSERR_ALLOCATED, + "DirectSoundCreate() failed: %08lx\n", rc); + if(rc != DS_OK) + return; + + rc = IDirectSound_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); + if(rc != DS_OK){ + IDirectSound_Release(dso); + return; + } + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 1; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + wfx.cbSize = 0; + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2; + bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ + bufdesc.lpwfxFormat = &wfx; + rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); + ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " + "to create a buffer %08lx\n", rc); + + rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); + ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08lx\n", rc); + IDirectSoundBuffer_Release(buf); + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY; + bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ + bufdesc.lpwfxFormat = &wfx; + rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); + ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " + "to create a buffer %08lx\n", rc); + + rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); + ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08lx\n", rc); + + notifies[0].dwOffset = 0; + handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); + notifies[1].dwOffset = bufdesc.dwBufferBytes - 4; + handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); + + rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies); + ok(rc == DS_OK, "SetNotificationPositions: %08lx\n", rc); + + IDirectSoundNotify_Release(buf_notif); + + rc = IDirectSoundBuffer_Play(buf, 0, 0, 0); + ok(rc == DS_OK, "Play: %08lx\n", rc); + + wait = WaitForMultipleObjects(2, handles, FALSE, 1000); + ok(wait == WAIT_OBJECT_0, "Got unexpected notification order or timeout: %lu\n", wait); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == DSBSTATUS_PLAYING,"got %08lx\n", status); + + wait = WaitForMultipleObjects(2, handles, FALSE, 1000); + todo_wine ok(wait == WAIT_OBJECT_0+1, "Got unexpected notification order or timeout: %lu\n", wait); + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == 0,"got %08lx\n", status); + + rc = IDirectSoundBuffer_Stop(buf); + ok(rc == DS_OK, "Stop: %08lx\n", rc); + + rc = IDirectSoundBuffer_GetStatus(buf, &status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == 0,"got %08lx\n", status); + + CloseHandle(notifies[0].hEventNotify); + CloseHandle(notifies[1].hEventNotify); + + IDirectSoundBuffer_Release(buf); + IDirectSound_Release(dso); +} + static unsigned int number; static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -1733,6 +1830,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, test_duplicate(lpGuid); test_invalid_fmts(lpGuid); test_notifications(lpGuid); + test_notifications_noloop(lpGuid); } return TRUE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6873
From: Alfred Agrell <floating(a)muncher.se> --- dlls/dsound/mixer.c | 1 - dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index bf05805221b..bf88e94eafd 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -226,7 +226,6 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len TRACE("Signalling %p\n", dsb->notifies[left].hEventNotify); SetEvent(dsb->notifies[left].hEventNotify); } - return; } for(first = 0; first < dsb->nrofnotifies && dsb->notifies[first].dwOffset == DSBPN_OFFSETSTOP; ++first) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 1518ff00073..81c5752c166 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1780,7 +1780,7 @@ static void test_notifications_noloop(LPGUID lpGuid) ok(status == DSBSTATUS_PLAYING,"got %08lx\n", status); wait = WaitForMultipleObjects(2, handles, FALSE, 1000); - todo_wine ok(wait == WAIT_OBJECT_0+1, "Got unexpected notification order or timeout: %lu\n", wait); + ok(wait == WAIT_OBJECT_0+1, "Got unexpected notification order or timeout: %lu\n", wait); rc = IDirectSoundBuffer_GetStatus(buf, &status); ok(rc == DS_OK,"Failed %08lx\n",rc); ok(status == 0,"got %08lx\n", status); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6873
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=149940 Your paranoid android. === debian11b (64 bit WoW report) === user32: win.c:4070: Test failed: Expected active window 00000000028D0140, got 0000000000000000. win.c:4071: Test failed: Expected focus window 00000000028D0140, got 0000000000000000.
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6873
participants (4)
-
Alfred Agrell -
Alfred Agrell (＠Alcaro)
-
Huw Davies (＠huw)
-
Marvin