September 2023 - Wine-commits

Rémi Bernon : dmusic: Add more parsed instruments traces.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: f71315c8494575698634062cfad4f5d84fd230a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f71315c8494575698634062cfad4f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 12 09:53:37 2023 +0200 dmusic: Add more parsed instruments traces. --- dlls/dmusic/instrument.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index dbbfd6f0c78..025bba940e5 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -328,14 +328,38 @@ HRESULT instrument_create_from_chunk(IStream *stream, struct chunk_entry *parent if (TRACE_ON(dmusic)) { - TRACE("Created DirectMusicInstrument (%p) ***\n", This); - TRACE(" - Instrument header:\n"); - TRACE(" - cRegions: %ld\n", This->header.cRegions); - TRACE(" - Locale:\n"); - TRACE(" - ulBank: %ld\n", This->header.Locale.ulBank); - TRACE(" - ulInstrument: %ld\n", This->header.Locale.ulInstrument); - TRACE(" => dwPatch: %ld\n", MIDILOCALE2Patch(&This->header.Locale)); + struct region *region; + UINT i; + + TRACE("Created DirectMusicInstrument %p\n", This); + TRACE(" - header:\n"); + TRACE(" - regions: %ld\n", This->header.cRegions); + TRACE(" - locale: {bank: %#lx, instrument: %#lx} (patch %#lx)\n", + This->header.Locale.ulBank, This->header.Locale.ulInstrument, + MIDILOCALE2Patch(&This->header.Locale)); if (desc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guid: %s\n", debugstr_dmguid(&desc->guidObject)); + if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - name: %s\n", debugstr_w(desc->wszName)); + + TRACE(" - regions:\n"); + LIST_FOR_EACH_ENTRY(region, &This->regions, struct region, entry) + { + TRACE(" - region:\n"); + TRACE(" - header: {key: %u - %u, vel: %u - %u, options: %#x, group: %#x}\n", + region->header.RangeKey.usLow, region->header.RangeKey.usHigh, + region->header.RangeVelocity.usLow, region->header.RangeVelocity.usHigh, + region->header.fusOptions, region->header.usKeyGroup); + TRACE(" - wave_link: {options: %#x, group: %u, channel: %lu, index: %lu}\n", + region->wave_link.fusOptions, region->wave_link.usPhaseGroup, + region->wave_link.ulChannel, region->wave_link.ulTableIndex); + TRACE(" - wave_sample: {size: %lu, unity_note: %u, fine_tune: %d, attenuation: %ld, options: %#lx, loops: %lu}\n", + region->wave_sample.cbSize, region->wave_sample.usUnityNote, + region->wave_sample.sFineTune, region->wave_sample.lAttenuation, + region->wave_sample.fulOptions, region->wave_sample.cSampleLoops); + for (i = 0; i < region->wave_sample.cSampleLoops; i++) + TRACE(" - wave_loop[%u]: {size: %lu, type: %lu, start: %lu, length: %lu}\n", i, + region->wave_loop.cbSize, region->wave_loop.ulType, + region->wave_loop.ulStart, region->wave_loop.ulLength); + } } *ret_iface = iface;

1 0

Rémi Bernon : dmime: Rewrite IDirectMusicPerformance8_GetTime.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: d407b3ca52cc5afdb6beee13672a06ca2e57d042 URL: https://gitlab.winehq.org/wine/wine/-/commit/d407b3ca52cc5afdb6beee13672a06… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 14 12:24:35 2023 +0200 dmime: Rewrite IDirectMusicPerformance8_GetTime. --- dlls/dmime/performance.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d277c5de043..5ae8941cd76 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -60,11 +60,12 @@ struct performance /** Message Processing */ HANDLE procThread; DWORD procThreadId; - REFERENCE_TIME procThreadStartTime; BOOL procThreadTicStarted; CRITICAL_SECTION safe; struct DMUS_PMSGItem *head; struct DMUS_PMSGItem *imm_head; + + IReferenceClock *master_clock; }; typedef struct DMUS_PMSGItem DMUS_PMSGItem; @@ -476,25 +477,21 @@ static HRESULT WINAPI performance_IsPlaying(IDirectMusicPerformance8 *iface, return S_FALSE; } -static HRESULT WINAPI performance_GetTime(IDirectMusicPerformance8 *iface, REFERENCE_TIME *prtNow, MUSIC_TIME *pmtNow) +static HRESULT WINAPI performance_GetTime(IDirectMusicPerformance8 *iface, REFERENCE_TIME *time, MUSIC_TIME *music_time) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); - HRESULT hr = S_OK; - REFERENCE_TIME rtCur = 0; + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + REFERENCE_TIME now; + HRESULT hr; - /*TRACE("(%p, %p, %p)\n", This, prtNow, pmtNow); */ - if (This->procThreadTicStarted) { - rtCur = ((REFERENCE_TIME) GetTickCount() * 10000) - This->procThreadStartTime; - } else { - /*return DMUS_E_NO_MASTER_CLOCK;*/ - } - if (NULL != prtNow) { - *prtNow = rtCur; - } - if (NULL != pmtNow) { - hr = IDirectMusicPerformance8_ReferenceToMusicTime(iface, rtCur, pmtNow); - } - return hr; + TRACE("(%p, %p, %p)\n", iface, time, music_time); + + if (!This->master_clock) return DMUS_E_NO_MASTER_CLOCK; + if (FAILED(hr = IReferenceClock_GetTime(This->master_clock, &now))) return hr; + + if (time) *time = now; + if (music_time) hr = IDirectMusicPerformance8_ReferenceToMusicTime(iface, now, music_time); + + return hr; } static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULONG cb, DMUS_PMSG **ppPMSG) @@ -873,6 +870,11 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) This->procThreadTicStarted = FALSE; CloseHandle(This->procThread); } + if (This->master_clock) + { + IReferenceClock_Release(This->master_clock); + This->master_clock = NULL; + } if (This->dsound) { IDirectSound_Release(This->dsound); This->dsound = NULL; @@ -955,6 +957,9 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi IDirectMusic8_AddRef(This->dmusic); } + if (FAILED(hr = IDirectMusic_GetMasterClock(This->dmusic, NULL, &This->master_clock))) + goto error; + if (!dsound || !*dsound) { hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); if (FAILED(hr)) @@ -1006,6 +1011,11 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi return S_OK; error: + if (This->master_clock) + { + IReferenceClock_Release(This->master_clock); + This->master_clock = NULL; + } if (This->dsound) { IDirectSound_Release(This->dsound); This->dsound = NULL;

1 0

Rémi Bernon : dmime: Implement MusicToReferenceTime and ReferenceToMusicTime.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 52ae3fada0baa400936997ce3dfb997ddbe03dab URL: https://gitlab.winehq.org/wine/wine/-/commit/52ae3fada0baa400936997ce3dfb99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 14 12:28:17 2023 +0200 dmime: Implement MusicToReferenceTime and ReferenceToMusicTime. --- dlls/dmime/performance.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/dmime/tests/dmime.c | 28 ++++++++++++++-------------- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 5ae8941cd76..7ce8ccb0d84 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -66,6 +66,7 @@ struct performance struct DMUS_PMSGItem *imm_head; IReferenceClock *master_clock; + REFERENCE_TIME init_time; }; typedef struct DMUS_PMSGItem DMUS_PMSGItem; @@ -451,21 +452,41 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS } static HRESULT WINAPI performance_MusicToReferenceTime(IDirectMusicPerformance8 *iface, - MUSIC_TIME mtTime, REFERENCE_TIME *prtTime) + MUSIC_TIME music_time, REFERENCE_TIME *time) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %ld, %p): stub\n", This, mtTime, prtTime); - return S_OK; + FIXME("(%p, %ld, %p): semi-stub\n", This, music_time, time); + + if (!time) return E_POINTER; + *time = 0; + + if (!This->master_clock) return DMUS_E_NO_MASTER_CLOCK; + + /* FIXME: This should be (music_time * 60) / (DMUS_PPQ * tempo) + * but it gives innacurate results */ + *time = This->init_time + (music_time * 6510); + + return S_OK; } static HRESULT WINAPI performance_ReferenceToMusicTime(IDirectMusicPerformance8 *iface, - REFERENCE_TIME rtTime, MUSIC_TIME *pmtTime) + REFERENCE_TIME time, MUSIC_TIME *music_time) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(rtTime), pmtTime); - return S_OK; + FIXME("(%p, %I64d, %p): semi-stub\n", This, time, music_time); + + if (!music_time) return E_POINTER; + *music_time = 0; + + if (!This->master_clock) return DMUS_E_NO_MASTER_CLOCK; + + /* FIXME: This should be (time * DMUS_PPQ * tempo) / 60 + * but it gives innacurate results */ + *music_time = (time - This->init_time) / 6510; + + return S_OK; } static HRESULT WINAPI performance_IsPlaying(IDirectMusicPerformance8 *iface, @@ -1006,6 +1027,9 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi *dmusic = (IDirectMusic *)This->dmusic; IDirectMusic_AddRef(*dmusic); } + + if (FAILED(hr = IDirectMusicPerformance8_GetTime(iface, &This->init_time, NULL))) return hr; + PostMessageToProcessMsgThread(This, PROCESSMSG_START); return S_OK; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e178960b18f..8999d5564db 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1650,18 +1650,18 @@ static void test_performance_time(void) hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 0, NULL); - todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 0, &time); - todo_wine ok(hr == DMUS_E_NO_MASTER_CLOCK, "got %#lx\n", hr); - todo_wine ok(time == 0, "got %I64d\n", time); + ok(hr == DMUS_E_NO_MASTER_CLOCK, "got %#lx\n", hr); + ok(time == 0, "got %I64d\n", time); hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, 0, NULL); - todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, 0, &music_time); - todo_wine ok(hr == DMUS_E_NO_MASTER_CLOCK, "got %#lx\n", hr); - todo_wine ok(music_time == 0, "got %ld\n", music_time); + ok(hr == DMUS_E_NO_MASTER_CLOCK, "got %#lx\n", hr); + ok(music_time == 0, "got %ld\n", music_time); dmusic = NULL; @@ -1684,38 +1684,38 @@ static void test_performance_time(void) time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time - init_time >= 6505, "got %I64d\n", time - init_time); + ok(time - init_time >= 6505, "got %I64d\n", time - init_time); ok(time - init_time <= 6515, "got %I64d\n", time - init_time); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1000, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time - init_time >= 1000 * 6505, "got %I64d\n", time - init_time); + ok(time - init_time >= 1000 * 6505, "got %I64d\n", time - init_time); ok(time - init_time <= 1000 * 6515, "got %I64d\n", time - init_time); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 2000, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time - init_time >= 2000 * 6505, "got %I64d\n", time - init_time); + ok(time - init_time >= 2000 * 6505, "got %I64d\n", time - init_time); ok(time - init_time <= 2000 * 6515, "got %I64d\n", time - init_time); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time, &music_time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(music_time == 0, "got %ld\n", music_time); + ok(music_time == 0, "got %ld\n", music_time); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + 1000 * 6510, &music_time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(music_time == 1000, "got %ld\n", music_time); + ok(music_time == 1000, "got %ld\n", music_time); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + 2000 * 6510, &music_time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(music_time == 2000, "got %ld\n", music_time); + ok(music_time == 2000, "got %ld\n", music_time); time = 0xdeadbeef; music_time = 0xdeadbeef; hr = IDirectMusicPerformance_GetTime(performance, &time, &music_time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time - init_time <= 200 * 10000, "got %I64d\n", time - init_time); - todo_wine ok(music_time == (time - init_time) / 6510, "got %ld\n", music_time); + ok(time - init_time <= 200 * 10000, "got %I64d\n", time - init_time); + ok(music_time == (time - init_time) / 6510, "got %ld\n", music_time); hr = IDirectMusicPerformance_CloseDown(performance);

1 0

Rémi Bernon : dmime: Cleanup IDirectMusicPerformance_AllocPMsg.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 9d600ce191ffcf3af374142a7b3a8654b67aa8d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d600ce191ffcf3af374142a7b3a86… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 5 10:44:16 2023 +0200 dmime: Cleanup IDirectMusicPerformance_AllocPMsg. --- dlls/dmime/performance.c | 27 ++++++++++++--------------- dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 7ce8ccb0d84..7cf446d9816 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -81,7 +81,6 @@ struct DMUS_PMSGItem { }; #define DMUS_PMSGToItem(pMSG) ((DMUS_PMSGItem*) (((unsigned char*) pPMSG) - offsetof(DMUS_PMSGItem, pMsg))) -#define DMUS_ItemToPMSG(pItem) (&(pItem->pMsg)) #define DMUS_ItemRemoveFromQueue(This,pItem) \ {\ if (pItem->prev) pItem->prev->next = pItem->next;\ @@ -515,23 +514,21 @@ static HRESULT WINAPI performance_GetTime(IDirectMusicPerformance8 *iface, REFER return hr; } -static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULONG cb, DMUS_PMSG **ppPMSG) +static HRESULT WINAPI performance_AllocPMsg(IDirectMusicPerformance8 *iface, ULONG size, DMUS_PMSG **msg) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PMSGItem* pItem = NULL; + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + DMUS_PMSGItem *message; - FIXME("(%p, %ld, %p): stub\n", This, cb, ppPMSG); + TRACE("(%p, %ld, %p)\n", This, size, msg); - if (sizeof(DMUS_PMSG) > cb) { - return E_INVALIDARG; - } - if (NULL == ppPMSG) { - return E_POINTER; - } - if (!(pItem = calloc(1, cb - sizeof(DMUS_PMSG) + sizeof(DMUS_PMSGItem)))) return E_OUTOFMEMORY; - pItem->pMsg.dwSize = cb; - *ppPMSG = DMUS_ItemToPMSG(pItem); - return S_OK; + if (!msg) return E_POINTER; + if (size < sizeof(DMUS_PMSG)) return E_INVALIDARG; + + if (!(message = calloc(1, size - sizeof(DMUS_PMSG) + sizeof(DMUS_PMSGItem)))) return E_OUTOFMEMORY; + message->pMsg.dwSize = size; + *msg = &message->pMsg; + + return S_OK; } static HRESULT WINAPI performance_FreePMsg(IDirectMusicPerformance8 *iface, DMUS_PMSG *pPMSG) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 8999d5564db..5a1d5c9733e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1747,7 +1747,7 @@ static void test_performance_pmsg(void) hr = IDirectMusicPerformance_AllocPMsg(performance, 0, NULL); - todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(DMUS_PMSG) - 1, &msg); ok(hr == E_INVALIDARG, "got %#lx\n", hr);

1 0

Francois Gouget : kernel32/tests: Allow a 0 removed entry count in the completion test.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: c63b323e220f9e5d4fbf1829a2b2f03e24d4b6e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c63b323e220f9e5d4fbf1829a2b2f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 14 12:11:28 2023 +0200 kernel32/tests: Allow a 0 removed entry count in the completion test. This matches the ntdll:file fix. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54554 --- dlls/kernel32/tests/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 65164d7f2a4..7044a992bb6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5559,7 +5559,7 @@ static void test_post_completion(void) ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, FALSE ); ok(!ret, "GetQueuedCompletionStatusEx succeeded\n"); ok(GetLastError() == WAIT_TIMEOUT, "wrong error %lu\n", GetLastError()); - ok(count == 1, "wrong count %lu\n", count); + ok(count <= 1, "wrong count %lu\n", count); ret = PostQueuedCompletionStatus( port, 123, 456, &ovl ); ok(ret, "PostQueuedCompletionStatus failed: %lu\n", GetLastError()); @@ -5600,14 +5600,14 @@ static void test_post_completion(void) ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, FALSE ); ok(!ret, "GetQueuedCompletionStatusEx succeeded\n"); ok(GetLastError() == WAIT_TIMEOUT, "wrong error %lu\n", GetLastError()); - ok(count == 1, "wrong count %lu\n", count); + ok(count <= 1, "wrong count %lu\n", count); ok(!user_apc_ran, "user APC should not have run\n"); ret = pGetQueuedCompletionStatusEx( port, entries, 2, &count, 0, TRUE ); ok(!ret || broken(ret) /* Vista */, "GetQueuedCompletionStatusEx succeeded\n"); if (!ret) ok(GetLastError() == WAIT_IO_COMPLETION, "wrong error %lu\n", GetLastError()); - ok(count == 1, "wrong count %lu\n", count); + ok(count <= 1, "wrong count %lu\n", count); ok(user_apc_ran, "user APC should have run\n"); user_apc_ran = FALSE;

1 0

Alexandre Julliard : localspl: Fix an uninitialized variable warning with clang.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 949681d8c31d5fe25bb497bd7c24a637aa8e249c URL: https://gitlab.winehq.org/wine/wine/-/commit/949681d8c31d5fe25bb497bd7c24a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 12:32:33 2023 +0200 localspl: Fix an uninitialized variable warning with clang. --- dlls/localspl/provider.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f35931b9bef..762f61dbf57 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1646,7 +1646,7 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL * { static const WCHAR xcv_monitor[] = L"XcvMonitor "; static const WCHAR xcv_port[] = L"XcvPort "; - BOOL mon, port; + BOOL mon; xcv_t *xcv; *stop_search = FALSE; @@ -1664,11 +1664,9 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL * } else { - port = !wcsncmp(name, xcv_port, ARRAY_SIZE(xcv_port) - 1); + if (wcsncmp(name, xcv_port, ARRAY_SIZE(xcv_port) - 1)) return NULL; name += ARRAY_SIZE(xcv_port) - 1; } - if (!port && !mon) - return NULL; *stop_search = TRUE; xcv = calloc(1, sizeof(*xcv));

1 0

Jacek Caban : server: Store both contexts in pending context object.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: a25ac1edb945ebd23a2378cbfa2b618984903c66 URL: https://gitlab.winehq.org/wine/wine/-/commit/a25ac1edb945ebd23a2378cbfa2b61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 14 19:27:45 2023 +0200 server: Store both contexts in pending context object. And discard irrelevant parts in select request. --- server/thread.c | 67 +++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/server/thread.c b/server/thread.c index 3e35b27f694..83ae381d5c5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -119,11 +119,10 @@ struct context { struct object obj; /* object header */ unsigned int status; /* status of the context */ - context_t regs[3]; /* context data */ + context_t regs[2]; /* context data */ }; #define CTX_NATIVE 0 /* context for native machine */ #define CTX_WOW 1 /* context if thread is inside WoW */ -#define CTX_PENDING 2 /* pending native context when we don't know whether thread is inside WoW */ /* flags for registers that always need to be set from the server side */ static const unsigned int system_flags = SERVER_CTX_DEBUG_REGISTERS; @@ -292,7 +291,6 @@ static struct context *create_thread_context( struct thread *thread ) context->status = STATUS_PENDING; memset( &context->regs, 0, sizeof(context->regs) ); context->regs[CTX_NATIVE].machine = native_machine; - context->regs[CTX_PENDING].machine = native_machine; return context; } @@ -1591,8 +1589,6 @@ DECL_HANDLER(select) const context_t *native_context = (const context_t *)((const char *)(result + 1) + req->size); const context_t *wow_context = (ctx_count > 1) ? native_context + 1 : NULL; - if (current->context && current->context->status != STATUS_PENDING) goto invalid_param; - if (native_context->machine == native_machine) { if (wow_context && wow_context->machine != current->process->machine) goto invalid_param; @@ -1605,7 +1601,14 @@ DECL_HANDLER(select) } else goto invalid_param; - if (!current->context && !(current->context = create_thread_context( current ))) return; + if ((ctx = current->context)) + { + if (ctx->status != STATUS_PENDING) goto invalid_param; + /* if context was modified in pending state, discard irrelevant changes */ + if (wow_context) ctx->regs[CTX_NATIVE].flags &= ~ctx->regs[CTX_WOW].flags; + else ctx->regs[CTX_WOW].flags = ctx->regs[CTX_WOW].machine = 0; + } + else if (!(current->context = create_thread_context( current ))) return; ctx = current->context; if (native_context) @@ -1618,13 +1621,6 @@ DECL_HANDLER(select) ctx->regs[CTX_WOW].machine = current->process->machine; copy_context( &ctx->regs[CTX_WOW], wow_context, wow_context->flags & ~ctx->regs[CTX_WOW].flags ); } - else if (ctx->regs[CTX_PENDING].flags) - { - unsigned int flags = ctx->regs[CTX_PENDING].flags & ~ctx->regs[CTX_NATIVE].flags; - copy_context( &ctx->regs[CTX_NATIVE], &ctx->regs[CTX_PENDING], flags ); - ctx->regs[CTX_NATIVE].flags |= flags; - } - ctx->regs[CTX_PENDING].flags = 0; ctx->status = STATUS_SUCCESS; current->suspend_cookie = req->cookie; wake_up( &ctx->obj, 0 ); @@ -1931,36 +1927,37 @@ DECL_HANDLER(set_thread_context) set_error( STATUS_INVALID_PARAMETER ); else if (thread->state != TERMINATED) { - unsigned int ctx = CTX_NATIVE; - const context_t *context = &contexts[CTX_NATIVE]; - unsigned int flags = system_flags & context->flags; - unsigned int native_flags = context->flags & req->native_flags; + unsigned int flags = system_flags & contexts[CTX_NATIVE].flags; if (thread != current) stop_thread( thread ); - else if (flags) set_thread_context( thread, context, flags ); + else if (flags) set_thread_context( thread, &contexts[CTX_NATIVE], flags ); + if (thread->context && !get_error()) { - if (ctx_count == 2) + /* If context is in a pending state, we don't know if we will use WoW or native + * context, so store both and discard irrevelant one in select request. */ + const int is_pending = thread->context->status == STATUS_PENDING; + unsigned int native_flags = contexts[CTX_NATIVE].flags; + + if (ctx_count == 2 && (is_pending || thread->context->regs[CTX_WOW].machine)) { - /* If the target thread doesn't have a WoW context, set native instead. - * If we don't know yet whether we have a WoW context, store native context - * in CTX_PENDING and update when the target thread sends its context(s). */ - if (thread->context->status != STATUS_PENDING) - { - ctx = thread->context->regs[CTX_WOW].machine ? CTX_WOW : CTX_NATIVE; - context = &contexts[ctx]; - } - else ctx = CTX_PENDING; + context_t *ctx = &thread->context->regs[CTX_WOW]; + + /* some regs are always set from the native context */ + flags = contexts[CTX_WOW].flags & ~req->native_flags; + if (is_pending) ctx->machine = contexts[CTX_WOW].machine; + else native_flags &= req->native_flags; + + copy_context( ctx, &contexts[CTX_WOW], flags ); + ctx->flags |= flags; } - flags = context->flags; - if (native_flags && ctx != CTX_NATIVE) /* some regs are always set from the native context */ + + if (native_flags) { - copy_context( &thread->context->regs[CTX_NATIVE], &contexts[CTX_NATIVE], native_flags ); - thread->context->regs[CTX_NATIVE].flags |= native_flags; - flags &= ~native_flags; + context_t *ctx = &thread->context->regs[CTX_NATIVE]; + copy_context( ctx, &contexts[CTX_NATIVE], native_flags ); + ctx->flags |= native_flags; } - copy_context( &thread->context->regs[ctx], context, flags ); - thread->context->regs[ctx].flags |= flags; } } else set_error( STATUS_UNSUCCESSFUL );

1 0

Jacek Caban : ntdll/tests: Add tests for setting context on unsuspended thread.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 918eeb0d7346581efa337c9f92e4154636b15121 URL: https://gitlab.winehq.org/wine/wine/-/commit/918eeb0d7346581efa337c9f92e415… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 14 19:29:50 2023 +0200 ntdll/tests: Add tests for setting context on unsuspended thread. Based on patch by Evan Tang. --- dlls/ntdll/tests/exception.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 945a5a8bb99..6164c799ba1 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -11262,6 +11262,86 @@ static void test_copy_context(void) dst_xs->Mask == 4, sizeof(dst_xs->YmmContext)); } } + +#if defined(__i386__) +# define IP_REG(ctx) ctx.Eip +#else +# define IP_REG(ctx) ctx.Rip +#endif + +static volatile int exit_ip_test; +static WINAPI DWORD ip_test_thread_proc( void *param ) +{ + SetEvent( param ); + while (!exit_ip_test); + return ERROR_SUCCESS; +} + +static void test_set_live_context(void) +{ + UINT_PTR old_ip, target; + HANDLE thread, event; + char *target_ptr; + CONTEXT ctx; + DWORD res; + int i; + + /* jmp to self at offset 0 and 4 */ + static const char target_code[] = {0xeb, 0xfe, 0x90, 0x90, 0xeb, 0xfe}; + + target_ptr = VirtualAlloc( NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + memcpy( target_ptr, target_code, sizeof(target_code) ); + target = (UINT_PTR)target_ptr; + + event = CreateEventW( NULL, TRUE, FALSE, NULL ); + thread = CreateThread( NULL, 65536, ip_test_thread_proc, event, 0, NULL ); + ok( thread != NULL, "Failed to create thread: %lx\n", GetLastError() ); + res = WaitForSingleObject( event, 1000 ); + ok( !res, "wait returned: %ld\n", res ); + CloseHandle( event ); + + memset( &ctx, 0, sizeof(ctx) ); + ctx.ContextFlags = CONTEXT_ALL; + res = GetThreadContext( thread, &ctx ); + ok( res, "Failed to get thread context: %lx\n", GetLastError() ); + old_ip = IP_REG(ctx); + + IP_REG(ctx) = target; + res = SetThreadContext( thread, &ctx ); + ok( res, "Failed to set thread context: %lx\n", GetLastError() ); + + for (i = 0; i < 10; i++) + { + IP_REG(ctx) = target; + res = SetThreadContext( thread, &ctx ); + ok( res, "Failed to set thread context: %lx\n", GetLastError() ); + + ctx.ContextFlags = CONTEXT_ALL; + res = GetThreadContext( thread, &ctx ); + ok( res, "Failed to get thread context: %lx\n", GetLastError() ); + ok( IP_REG(ctx) == target, "IP = %p, expected %p\n", (void *)IP_REG(ctx), target_ptr ); + + IP_REG(ctx) = target + 4; + res = SetThreadContext( thread, &ctx ); + ok( res, "Failed to set thread context: %lx\n", GetLastError()) ; + + ctx.ContextFlags = CONTEXT_ALL; + res = GetThreadContext( thread, &ctx ); + ok( res, "Failed to get thread context: %lx\n", GetLastError() ); + ok( IP_REG(ctx) == target + 4, "IP = %p, expected %p\n", (void *)IP_REG(ctx), target_ptr + 4 ); + } + + exit_ip_test = 1; + ctx.ContextFlags = CONTEXT_ALL; + IP_REG(ctx) = old_ip; + res = SetThreadContext( thread, &ctx ); + ok( res, "Failed to restore thread context: %lx\n", GetLastError() ); + + res = WaitForSingleObject( thread, 1000 ); + ok( !res, "wait returned: %ld\n", res ); + + VirtualFree( target_ptr, 0, MEM_RELEASE ); +} #endif START_TEST(exception) @@ -11445,6 +11525,7 @@ START_TEST(exception) test_kiuserexceptiondispatcher(); test_extended_context(); test_copy_context(); + test_set_live_context(); #elif defined(__x86_64__) @@ -11487,6 +11568,7 @@ START_TEST(exception) win_skip( "Dynamic unwind functions not found\n" ); test_extended_context(); test_copy_context(); + test_set_live_context(); test_unwind_from_apc(); test_syscall_clobbered_regs(); test_raiseexception_regs();

1 0

Alfred Agrell : quartz/tests: Fix segfault in changed3ddevice test.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: f8d9bf365159d9155f7728ba9b6e5babf5d41cc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8d9bf365159d9155f7728ba9b6e5b… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Sep 14 11:01:09 2023 +0200 quartz/tests: Fix segfault in changed3ddevice test. --- dlls/quartz/tests/vmr9.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 6e566f39c58..447273a91df 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -4335,10 +4335,10 @@ static void test_changed3ddevice(void) IDirect3DDevice9 *device, *device2; RECT rect = {0, 0, 640, 480}; struct testfilter source; + IPin *pin = NULL; HWND window; HRESULT hr; ULONG ref; - IPin *pin; testfilter_init(&source); @@ -4386,7 +4386,8 @@ static void test_changed3ddevice(void) IDirect3DDevice9_Release(device2); out: - IPin_Release(pin); + if (pin) + IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %ld.\n", ref); IVMRSurfaceAllocatorNotify9_Release(notify);

1 0

Jacek Caban : wow64win: Implement wow64_NtUserImmTranslateMessage.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 02ea15b1fb447dea79b8efbbc05edd16266f7353 URL: https://gitlab.winehq.org/wine/wine/-/commit/02ea15b1fb447dea79b8efbbc05edd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 23:50:12 2023 +0200 wow64win: Implement wow64_NtUserImmTranslateMessage. --- dlls/wow64win/user.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7a6872921b2..43d83470a64 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1303,8 +1303,20 @@ static NTSTATUS WINAPI wow64_NtUserImmProcessKey( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserImmTranslateMessage( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct imm_translate_message_params *params = arg; + struct + { + LONG hwnd; + UINT msg; + LONG wparam; + LONG key_data; + } params32; + + params32.hwnd = HandleToLong( params->hwnd ); + params32.msg = params->msg; + params32.wparam = params->wparam; + params32.key_data = params->key_data; + return dispatch_callback( NtUserImmTranslateMessage, &params32, sizeof(params32) ); } static NTSTATUS WINAPI wow64_NtUserInitBuiltinClasses( void *arg, ULONG size )

1 0