September 2023 - Wine-commits

Rémi Bernon : dmime: Set the port direct sound before activating it.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: 50b09dcf11b2939a5702104b6726d10ad44df43b URL: https://gitlab.winehq.org/wine/wine/-/commit/50b09dcf11b2939a5702104b6726d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 19:10:17 2023 +0200 dmime: Set the port direct sound before activating it. --- dlls/dmime/performance.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d8624427423..e2d070b0fbe 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -651,10 +651,14 @@ static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *par if (FAILED(hr = IDirectMusic8_CreatePort(perf->dmusic, &guid, params, &port, NULL))) return hr; - if (FAILED(hr = IDirectMusicPort_Activate(port, TRUE))) { + + if (FAILED(hr = IDirectMusicPort_SetDirectSound(port, perf->dsound, NULL)) + || FAILED(hr = IDirectMusicPort_Activate(port, TRUE))) + { IDirectMusicPort_Release(port); return hr; } + for (i = 0; i < params->dwChannelGroups; i++) pchannel_block_set(&perf->pchannels, i, port, i + 1, FALSE);

1 0

Rémi Bernon : dmime: Initialize performance in Init rather than InitAudio.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: 9788fb6911ab56186c95edd6fe487f48ab98e118 URL: https://gitlab.winehq.org/wine/wine/-/commit/9788fb6911ab56186c95edd6fe487f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 18:49:40 2023 +0200 dmime: Initialize performance in Init rather than InitAudio. --- dlls/dmime/performance.c | 148 ++++++++++++++++++++++++----------------------- dlls/dmime/tests/dmime.c | 6 +- 2 files changed, 79 insertions(+), 75 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index e2d070b0fbe..a8c2016802c 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -40,10 +40,9 @@ struct performance IDirectMusicGraph IDirectMusicGraph_iface; IDirectMusicTool IDirectMusicTool_iface; LONG ref; - IDirectMusic8 *dmusic; + IDirectMusic *dmusic; IDirectSound *dsound; IDirectMusicGraph *pToolGraph; - DMUS_AUDIOPARAMS params; BOOL fAutoDownload; char cMasterGrooveLevel; float fMasterTempo; @@ -314,14 +313,74 @@ static ULONG WINAPI performance_Release(IDirectMusicPerformance8 *iface) return ref; } -/* IDirectMusicPerformanceImpl IDirectMusicPerformance Interface part: */ +static HRESULT performance_init_dsound(struct performance *This, HWND hwnd) +{ + IDirectSound *dsound; + HRESULT hr; + + if (FAILED(hr = DirectSoundCreate(NULL, &dsound, NULL))) return hr; + + if (!hwnd) hwnd = GetForegroundWindow(); + hr = IDirectSound_SetCooperativeLevel(dsound, hwnd, DSSCL_PRIORITY); + + if (SUCCEEDED(hr)) This->dsound = dsound; + else IDirectSound_Release(dsound); + + return hr; +} + +static HRESULT performance_init_dmusic(struct performance *This, IDirectSound *dsound) +{ + IDirectMusic *dmusic; + HRESULT hr; + + if (FAILED(hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusic8, (void **)&dmusic))) + return hr; + + hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + + if (SUCCEEDED(hr)) This->dmusic = dmusic; + else IDirectSound_Release(dmusic); + + return hr; +} + static HRESULT WINAPI performance_Init(IDirectMusicPerformance8 *iface, IDirectMusic **dmusic, IDirectSound *dsound, HWND hwnd) { + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + HRESULT hr; + TRACE("(%p, %p, %p, %p)\n", iface, dmusic, dsound, hwnd); - return IDirectMusicPerformance8_InitAudio(iface, dmusic, dsound ? &dsound : NULL, hwnd, 0, 0, - 0, NULL); + if (This->dmusic) return DMUS_E_ALREADY_INITED; + + if ((This->dsound = dsound)) IDirectMusic8_AddRef(This->dsound); + else if (FAILED(hr = performance_init_dsound(This, hwnd))) return hr; + + if (dmusic && (This->dmusic = *dmusic)) IDirectMusic_AddRef(This->dmusic); + else if (FAILED(hr = performance_init_dmusic(This, This->dsound))) + { + IDirectMusicPerformance_CloseDown(iface); + return hr; + } + + if (FAILED(hr = IDirectMusic_GetMasterClock(This->dmusic, NULL, &This->master_clock)) + || FAILED(hr = IDirectMusicPerformance8_GetTime(iface, &This->init_time, NULL))) + { + IDirectMusicPerformance_CloseDown(iface); + return hr; + } + + PostMessageToProcessMsgThread(This, PROCESSMSG_START); + + if (dmusic && !*dmusic) + { + *dmusic = This->dmusic; + IDirectMusic_AddRef(*dmusic); + } + return S_OK; } static HRESULT WINAPI performance_PlaySegment(IDirectMusicPerformance8 *iface, IDirectMusicSegment *pSegment, @@ -900,6 +959,7 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) IDirectMusic8_Release(This->dmusic); This->dmusic = NULL; } + return S_OK; } @@ -960,57 +1020,21 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi TRACE("(%p, %p, %p, %p, %lx, %lu, %lx, %p)\n", This, dmusic, dsound, hwnd, default_path_type, num_channels, flags, params); - if (This->dmusic) - return DMUS_E_ALREADY_INITED; - - if (!dmusic || !*dmusic) { - hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, - (void **)&This->dmusic); - if (FAILED(hr)) - return hr; - } else { - This->dmusic = (IDirectMusic8 *)*dmusic; - IDirectMusic8_AddRef(This->dmusic); - } - - if (FAILED(hr = IDirectMusic_GetMasterClock(This->dmusic, NULL, &This->master_clock))) - goto error; + if (flags) FIXME("flags parameter not used\n"); + if (params) FIXME("params parameter not used\n"); - if (!dsound || !*dsound) { - hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); - if (FAILED(hr)) - goto error; - hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), - DSSCL_PRIORITY); - if (FAILED(hr)) - goto error; - } else { - This->dsound = *dsound; - IDirectSound_AddRef(This->dsound); - } + if (FAILED(hr = IDirectMusicPerformance8_Init(iface, dmusic && *dmusic ? dmusic : NULL, + dsound ? *dsound : NULL, hwnd))) + return hr; - hr = IDirectMusic8_SetDirectSound(This->dmusic, This->dsound, NULL); - if (FAILED(hr)) - goto error; - - if (!params) { - This->params.dwSize = sizeof(DMUS_AUDIOPARAMS); - This->params.fInitNow = FALSE; - This->params.dwValidData = DMUS_AUDIOPARAMS_FEATURES | DMUS_AUDIOPARAMS_VOICES | - DMUS_AUDIOPARAMS_SAMPLERATE | DMUS_AUDIOPARAMS_DEFAULTSYNTH; - This->params.dwVoices = 64; - This->params.dwSampleRate = 22050; - This->params.dwFeatures = flags; - This->params.clsidDefaultSynth = CLSID_DirectMusicSynthSink; - } else - This->params = *params; - - if (default_path_type) { + if (default_path_type) + { hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, default_path_type, num_channels, FALSE, &This->pDefaultPath); - if (FAILED(hr)) { - IDirectMusic8_SetDirectSound(This->dmusic, NULL, NULL); - goto error; + if (FAILED(hr)) + { + IDirectMusicPerformance_CloseDown(iface); + return hr; } } @@ -1023,27 +1047,7 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi IDirectMusic_AddRef(*dmusic); } - if (FAILED(hr = IDirectMusicPerformance8_GetTime(iface, &This->init_time, NULL))) return hr; - - PostMessageToProcessMsgThread(This, PROCESSMSG_START); - 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; - } - if (This->dmusic) { - IDirectMusic8_Release(This->dmusic); - This->dmusic = NULL; - } - return hr; } static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, IUnknown *pSource, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f016af2f9e6..c1043fe90f3 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -2009,7 +2009,7 @@ static void test_performance_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); @@ -2023,7 +2023,7 @@ static void test_performance_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); @@ -2053,7 +2053,7 @@ static void test_performance_InitAudio(void) hr = IDirectMusicPort_SetNumChannelGroups(port, 1); ok(hr == S_OK, "SetNumChannelGroups failed: %#lx\n", hr); hr = IDirectMusicPerformance8_Init(performance, &dmusic, dsound, 0); - todo_wine ok(hr == S_OK, "Init failed: %#lx\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); destroy_performance(performance, dmusic, dsound); /* InitAudio with perf channel count not a multiple of 16 rounds up */

1 0

Rémi Bernon : dmime: Return DMUS_E_AUDIOPATHS_IN_USE when audio paths are in use.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: 0fb4e5ec479bc7424c3818d51884387b15e90e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb4e5ec479bc7424c3818d5188438… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 18:49:40 2023 +0200 dmime: Return DMUS_E_AUDIOPATHS_IN_USE when audio paths are in use. --- dlls/dmime/performance.c | 28 ++++++++++++++++------------ dlls/dmime/tests/dmime.c | 4 ++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a8c2016802c..7b606998616 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -50,6 +50,7 @@ struct performance /* performance channels */ struct wine_rb_tree pchannels; + BOOL audio_paths_enabled; IDirectMusicAudioPath *pDefaultPath; HANDLE hNotification; REFERENCE_TIME rtMinimum; @@ -730,8 +731,8 @@ static HRESULT WINAPI performance_AddPort(IDirectMusicPerformance8 *iface, IDire FIXME("(%p, %p): semi-stub\n", This, port); - if (!This->dmusic) - return DMUS_E_NOT_INIT; + if (!This->dmusic) return DMUS_E_NOT_INIT; + if (This->audio_paths_enabled) return DMUS_E_AUDIOPATHS_IN_USE; if (!port) { DMUS_PORTPARAMS params = { @@ -753,11 +754,13 @@ static HRESULT WINAPI performance_AddPort(IDirectMusicPerformance8 *iface, IDire static HRESULT WINAPI performance_RemovePort(IDirectMusicPerformance8 *iface, IDirectMusicPort *pPort) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p): stub\n", This, pPort); - IDirectMusicPort_Release (pPort); - return S_OK; + if (This->audio_paths_enabled) return DMUS_E_AUDIOPATHS_IN_USE; + + FIXME("(%p, %p): stub\n", This, pPort); + IDirectMusicPort_Release(pPort); + return S_OK; } static HRESULT WINAPI performance_AssignPChannelBlock(IDirectMusicPerformance8 *iface, @@ -767,10 +770,9 @@ static HRESULT WINAPI performance_AssignPChannelBlock(IDirectMusicPerformance8 * FIXME("(%p, %ld, %p, %ld): semi-stub\n", This, block_num, port, group); - if (!port) - return E_POINTER; - if (block_num > MAXDWORD / 16) - return E_INVALIDARG; + if (!port) return E_POINTER; + if (block_num > MAXDWORD / 16) return E_INVALIDARG; + if (This->audio_paths_enabled) return DMUS_E_AUDIOPATHS_IN_USE; pchannel_block_set(&This->pchannels, block_num, port, group, FALSE); @@ -785,8 +787,8 @@ static HRESULT WINAPI performance_AssignPChannel(IDirectMusicPerformance8 *iface FIXME("(%p)->(%ld, %p, %ld, %ld) semi-stub\n", This, pchannel, port, group, channel); - if (!port) - return E_POINTER; + if (!port) return E_POINTER; + if (This->audio_paths_enabled) return DMUS_E_AUDIOPATHS_IN_USE; block = pchannel_block_set(&This->pchannels, pchannel / 16, port, 0, TRUE); if (block) { @@ -959,6 +961,7 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) IDirectMusic8_Release(This->dmusic); This->dmusic = NULL; } + This->audio_paths_enabled = FALSE; return S_OK; } @@ -1027,6 +1030,7 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi dsound ? *dsound : NULL, hwnd))) return hr; + This->audio_paths_enabled = TRUE; if (default_path_type) { hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, default_path_type, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index c1043fe90f3..119bfc74fc5 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1937,9 +1937,9 @@ static void test_performance_InitAudio(void) ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%#lx)\n", hr); + ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%#lx)\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%#lx)\n", hr); + ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%#lx)\n", hr); IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path);

1 0

Rémi Bernon : dmime: Return DMUS_E_AUDIOPATH_INACTIVE when audio paths are not enabled.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: 9e0487c4cc36cdbf915d35222c875d23f54958ae URL: https://gitlab.winehq.org/wine/wine/-/commit/9e0487c4cc36cdbf915d35222c875d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 19:08:34 2023 +0200 dmime: Return DMUS_E_AUDIOPATH_INACTIVE when audio paths are not enabled. --- dlls/dmime/performance.c | 102 ++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 55 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 7b606998616..bdb7475370a 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1096,45 +1096,41 @@ static HRESULT WINAPI performance_ClonePMsg(IDirectMusicPerformance8 *iface, DMU } static HRESULT WINAPI performance_CreateAudioPath(IDirectMusicPerformance8 *iface, - IUnknown *pSourceConfig, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) + IUnknown *pSourceConfig, BOOL fActivate, IDirectMusicAudioPath **ret_iface) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); - IDirectMusicAudioPath *pPath; + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicAudioPath *pPath; - FIXME("(%p, %p, %d, %p): stub\n", This, pSourceConfig, fActivate, ppNewPath); + FIXME("(%p, %p, %d, %p): stub\n", This, pSourceConfig, fActivate, ret_iface); - if (NULL == ppNewPath) { - return E_POINTER; - } + if (!ret_iface) return E_POINTER; + if (!This->audio_paths_enabled) return DMUS_E_AUDIOPATH_INACTIVE; - create_dmaudiopath(&IID_IDirectMusicAudioPath, (void**)&pPath); - set_audiopath_perf_pointer(pPath, iface); + create_dmaudiopath(&IID_IDirectMusicAudioPath, (void **)&pPath); + set_audiopath_perf_pointer(pPath, iface); - /** TODO */ - - *ppNewPath = pPath; - - return IDirectMusicAudioPath_Activate(*ppNewPath, fActivate); + /** TODO */ + *ret_iface = pPath; + return IDirectMusicAudioPath_Activate(*ret_iface, fActivate); } static HRESULT WINAPI performance_CreateStandardAudioPath(IDirectMusicPerformance8 *iface, - DWORD dwType, DWORD pchannel_count, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) + DWORD dwType, DWORD pchannel_count, BOOL fActivate, IDirectMusicAudioPath **ret_iface) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); - IDirectMusicAudioPath *pPath; - DSBUFFERDESC desc; - WAVEFORMATEX format; - DMUS_PORTPARAMS params = {0}; - IDirectSoundBuffer *buffer, *primary_buffer; - HRESULT hr = S_OK; + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicAudioPath *pPath; + DSBUFFERDESC desc; + WAVEFORMATEX format; + DMUS_PORTPARAMS params = {0}; + IDirectSoundBuffer *buffer, *primary_buffer; + HRESULT hr = S_OK; - FIXME("(%p)->(%ld, %ld, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); + FIXME("(%p)->(%ld, %ld, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ret_iface); - if (NULL == ppNewPath) { - return E_POINTER; - } + if (!ret_iface) return E_POINTER; + if (!This->audio_paths_enabled) return DMUS_E_AUDIOPATH_INACTIVE; - *ppNewPath = NULL; + *ret_iface = NULL; /* Secondary buffer description */ memset(&format, 0, sizeof(format)); @@ -1204,46 +1200,42 @@ static HRESULT WINAPI performance_CreateStandardAudioPath(IDirectMusicPerformanc set_audiopath_dsound_buffer(pPath, buffer); set_audiopath_primary_dsound_buffer(pPath, primary_buffer); - *ppNewPath = pPath; - - TRACE(" returning IDirectMusicAudioPath interface at %p.\n", *ppNewPath); - - return IDirectMusicAudioPath_Activate(*ppNewPath, fActivate); + *ret_iface = pPath; + TRACE(" returning IDirectMusicAudioPath interface at %p.\n", *ret_iface); + return IDirectMusicAudioPath_Activate(*ret_iface, fActivate); } -static HRESULT WINAPI performance_SetDefaultAudioPath(IDirectMusicPerformance8 *iface, IDirectMusicAudioPath *pAudioPath) +static HRESULT WINAPI performance_SetDefaultAudioPath(IDirectMusicPerformance8 *iface, IDirectMusicAudioPath *audio_path) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p): semi-stub\n", This, pAudioPath); + FIXME("(%p, %p): semi-stub\n", This, audio_path); - if (This->pDefaultPath) { - IDirectMusicAudioPath_Release(This->pDefaultPath); - This->pDefaultPath = NULL; - } - This->pDefaultPath = pAudioPath; - if (This->pDefaultPath) { - IDirectMusicAudioPath_AddRef(This->pDefaultPath); - set_audiopath_perf_pointer(This->pDefaultPath, iface); - } + if (!This->audio_paths_enabled) return DMUS_E_AUDIOPATH_INACTIVE; - return S_OK; + if (This->pDefaultPath) IDirectMusicAudioPath_Release(This->pDefaultPath); + if ((This->pDefaultPath = audio_path)) + { + IDirectMusicAudioPath_AddRef(This->pDefaultPath); + set_audiopath_perf_pointer(This->pDefaultPath, iface); + } + + return S_OK; } static HRESULT WINAPI performance_GetDefaultAudioPath(IDirectMusicPerformance8 *iface, - IDirectMusicAudioPath **ppAudioPath) + IDirectMusicAudioPath **ret_iface) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p): semi-stub (%p)\n", This, ppAudioPath, This->pDefaultPath); + FIXME("(%p, %p): semi-stub (%p)\n", This, ret_iface, This->pDefaultPath); - if (NULL != This->pDefaultPath) { - *ppAudioPath = This->pDefaultPath; - IDirectMusicAudioPath_AddRef(*ppAudioPath); - } else { - *ppAudioPath = NULL; - } - return S_OK; + if (!ret_iface) return E_POINTER; + if (!This->audio_paths_enabled) return DMUS_E_AUDIOPATH_INACTIVE; + + if ((*ret_iface = This->pDefaultPath)) IDirectMusicAudioPath_AddRef(*ret_iface); + + return S_OK; } static HRESULT WINAPI performance_GetParamEx(IDirectMusicPerformance8 *iface, REFGUID rguidType, DWORD dwTrackID,

1 0

Martin Storsjö : include: Update the d3d12 header from vkd3d.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: 65a6019df99952a2f4dad622c9989a23188f49f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/65a6019df99952a2f4dad622c9989a… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Sep 28 12:15:06 2023 +0300 include: Update the d3d12 header from vkd3d. This corresponds to vkd3d as of commit acd3ed97dc8e1ac192b2ec6fc19596831a6b61c6. The cpp_quoted #include directive is fixed up to match the file naming outside of vkd3d, renaming the reference to vkd3d_d3d12sdklayers.h back to d3d12sdklayers.h. This matches other renamings that are done at the start of the file for vkd3d renamed idl files as well. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/d3d12.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 9744b9c9cb5..593a40a02a7 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -5082,6 +5082,10 @@ interface ID3D12GraphicsCommandList7 : ID3D12GraphicsCommandList6 const D3D12_BARRIER_GROUP *barrier_groups); }; +cpp_quote("#ifndef D3D12_IGNORE_SDK_LAYERS") +cpp_quote("#include \"d3d12sdklayers.h\"") +cpp_quote("#endif") + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Hans Leidekker : secur32: Only return success from initialize_package() when initialization fully succeeds.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: ed71abd1ccfdec44aa487ec6a14fdf4c54f52ad2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed71abd1ccfdec44aa487ec6a14fdf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 28 12:07:09 2023 +0200 secur32: Only return success from initialize_package() when initialization fully succeeds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55522 --- dlls/secur32/lsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 3b124c4da1f..7af9c285d86 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -907,10 +907,12 @@ static BOOL initialize_package(struct lsa_package *package, { status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &package->user_api_version, &package->user_api, &package->user_table_count); if (status == STATUS_SUCCESS) + { package->user_api->InstanceInit(SECPKG_INTERFACE_VERSION, &lsa_dll_dispatch, NULL); + return TRUE; + } } } - return TRUE; } return FALSE;

1 0

Francois Gouget : tests: Update the documentation.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: 65261f3c80e6cfe96081d3903c7483f99648f9b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/65261f3c80e6cfe96081d3903c7483… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 28 14:40:02 2023 +0200 tests: Update the documentation. --- include/wine/test.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 889923afacc..8f3f3bb0d50 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -148,6 +148,13 @@ extern void winetest_wait_child_process( HANDLE process ); # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif +/* Records the location of the next check. + * See the xxx_(file, line) macros. + * + * Parameters: + * - file - source file name of the check + * - line - source line number of the check + */ static inline void winetest_set_location( const char *file, int line ) { struct winetest_thread_data *data = winetest_get_thread_data(); @@ -260,12 +267,13 @@ static LONG winetest_add_line( void ) } /* - * Checks condition. + * Checks that a condition has the expected value, that is true except if + * preceded by a todo indicating the check is expected to fail. + * * Parameters: - * - condition - condition to check; - * - msg test description; - * - file - test application source code file name of the check - * - line - test application source code file line number of the check + * - condition - true if the check succeeded, false otherwise; + * - msg - failure message format; + * - args - arguments for the failure message * Return: * 0 if condition does not have the expected value, 1 otherwise */ @@ -400,6 +408,14 @@ static void winetest_vskip( const char *msg, va_list args ) else InterlockedIncrement( &winetest_muted_skipped ); } +/* + * Prints a message to indicate that a group of tests is being skipped + * because the requirements for running them are not met. + * + * Parameters: + * - msg - failure message format; + * - args - arguments for the failure message + */ static void winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static inline void winetest_skip( const char *msg, ... ) { @@ -421,6 +437,18 @@ static inline void winetest_win_skip( const char *msg, ... ) va_end(valist); } +/* If is_flaky is true, indicates that the next test may occasionally fail due + * to unavoidable outside race conditions. Such failures will be flagged as + * flaky so they can be ignored by automated testing tools. + * + * Remarks: + * - This is not meant to paper over race conditions within the test itself. + * Those are bugs and should be fixed. + * - This is not meant to be used for tests that normally succeed but + * systematically fail on a specific platform or locale. + * - The failures should be rare to start with. If a test fails 25% of the time + * it is probably wrong. + */ static inline void winetest_start_flaky( int is_flaky ) { struct winetest_thread_data *data = winetest_get_thread_data(); @@ -442,6 +470,13 @@ static inline void winetest_end_flaky(void) data->flaky_level >>= 1; } +/* If is_todo is true, indicates that the next test is expected to fail on this + * platform. This is used to identify tests that are known to fail in Wine. + * + * Remarks: + * - is_todo should never be true on Windows. To ensure this, always use + * todo_wine_if(). + */ static inline void winetest_start_todo( int is_todo ) { struct winetest_thread_data *data = winetest_get_thread_data(); @@ -463,6 +498,31 @@ static inline void winetest_end_todo(void) data->todo_level >>= 1; } +/* Adds a string to be prepended to the test traces and failure messages. + * This must be paired with a winetest_pop_context() call. + * + * Parameters: + * - msg - failure message format; + * - args - arguments for the failure message + * + * Remarks: + * - Failure messages must always make it possible to figure out what was being + * tested. While not ideal the line number can usually be used for that + * purpose except when the test loops on a list of test parameters. In such + * cases either the test parameters or the loop index should be added to the + * context. + * + * Example: + * + * for (i = 0; i < ARRAY_SIZE(test_parameters); i++) + * { + * winetest_push_context("%d", i); + * ... + * ok(WinAPI(test_parameters[i]), ...); + * ... + * winetest_pop_context(); + * } + */ static void winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR(1, 2); static inline void winetest_push_context( const char *fmt, ... ) {

1 0

Alexandre Julliard : ntdll: Release the low address space reservation for 64-bit apps.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: a81c53504ae32715e6e91bd020fdebd5bef20d48 URL: https://gitlab.winehq.org/wine/wine/-/commit/a81c53504ae32715e6e91bd020fdeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 16:30:32 2023 +0200 ntdll: Release the low address space reservation for 64-bit apps. --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/server.c | 2 -- dlls/ntdll/unix/virtual.c | 11 ++++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f42c6a8f59f..feae7d4b954 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1865,7 +1865,6 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) NtCurrentTeb()->WowTebOffset = teb_offset; NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); wow_peb = (PEB32 *)((char *)peb + page_size); - user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); ERR( "starting %s in experimental wow64 mode\n", debugstr_us(&params->ImagePathName) ); break; @@ -1876,6 +1875,7 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) } #endif + virtual_set_large_address_space(); load_global_options( &params->ImagePathName ); if (wow_peb) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index e5e234d05ae..24653904308 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1687,8 +1687,6 @@ void server_init_process_done(void) #ifdef __APPLE__ send_server_task_port(); #endif - if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) - virtual_set_large_address_space(); /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94e68edab77..67778453666 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4184,9 +4184,14 @@ static void virtual_release_address_space(void) */ void virtual_set_large_address_space(void) { - /* no large address space on win9x */ - if (peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; - +#ifdef _WIN64 + if (is_wow64()) + user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; + else + free_reserved_memory( 0, (char *)0x7ffe0000 ); +#else + if (!(main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; +#endif user_space_limit = working_set_limit = address_space_limit; }

1 0

Alexandre Julliard : ntdll: Don't release the low address space reservation on wow64.
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: wine Branch: master Commit: 9b60b671da82123590253472318d95547d8d138d URL: https://gitlab.winehq.org/wine/wine/-/commit/9b60b671da82123590253472318d95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 28 16:59:36 2023 +0200 ntdll: Don't release the low address space reservation on wow64. --- dlls/ntdll/unix/virtual.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 67778453666..3784cb6c16a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4110,12 +4110,6 @@ void virtual_set_force_exec( BOOL enable ) server_leave_uninterrupted_section( &virtual_mutex, &sigset ); } -struct free_range -{ - char *base; - char *limit; -}; - /* free reserved areas within a given range */ static void free_reserved_memory( char *base, char *limit ) { @@ -4142,6 +4136,8 @@ static void free_reserved_memory( char *base, char *limit ) } } +#ifndef _WIN64 + /*********************************************************************** * virtual_release_address_space * @@ -4149,33 +4145,14 @@ static void free_reserved_memory( char *base, char *limit ) */ static void virtual_release_address_space(void) { - char *base = (char *)0x82000000; - char *limit = get_wow_user_space_limit(); - -#if defined(__APPLE__) && !defined(__i386__) - /* On 64-bit macOS, don't release any address space. - * It needs to be reserved for use by Wow64 - */ - return; -#endif - - if (limit > (char *)0xfffff000) return; /* 64-bit limit, nothing to do */ - - if (limit > base) - { - free_reserved_memory( base, limit ); -#ifdef __APPLE__ - /* On macOS, we still want to free some of low memory, for OpenGL resources */ - base = (char *)0x40000000; -#else - return; +#ifndef __APPLE__ /* On macOS, we still want to free some of low memory, for OpenGL resources */ + if (user_space_limit > (void *)limit_2g) return; #endif - } - else base = (char *)0x20000000; - - free_reserved_memory( base, (char *)0x7f000000 ); + free_reserved_memory( (char *)0x20000000, (char *)0x7f000000 ); } +#endif /* _WIN64 */ + /*********************************************************************** * virtual_set_large_address_space @@ -4191,6 +4168,7 @@ void virtual_set_large_address_space(void) free_reserved_memory( 0, (char *)0x7ffe0000 ); #else if (!(main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; + free_reserved_memory( (char *)0x80000000, address_space_limit ); #endif user_space_limit = working_set_limit = address_space_limit; } @@ -4564,9 +4542,12 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si /* avoid freeing the DOS area when a broken app passes a NULL pointer */ if (!base) { +#ifndef _WIN64 /* address 1 is magic to mean release reserved space */ if (addr == (void *)1 && !size && type == MEM_RELEASE) virtual_release_address_space(); - else status = STATUS_INVALID_PARAMETER; + else +#endif + status = STATUS_INVALID_PARAMETER; } else if (!(view = find_view( base, 0 ))) status = STATUS_MEMORY_NOT_ALLOCATED; else if (!is_view_valloc( view )) status = STATUS_INVALID_PARAMETER;

1 0

Henri Verbeet : tests: Add some missing vkd3d_test_pop_context() calls to test_shader_instructions().
by Alexandre Julliard 28 Sep '23

28 Sep '23

Module: vkd3d Branch: master Commit: 5503a025d94d728e5d01db5516a678e51f4c27fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5503a025d94d728e5d01db5516a67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 27 21:36:24 2023 +0200 tests: Add some missing vkd3d_test_pop_context() calls to test_shader_instructions(). --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6ffcd92e..86e8a8b1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10483,12 +10483,14 @@ static void test_shader_instructions(void) if (uint_tests[i].skip_on_warp && test_options.use_warp_device) { skip("Skipping shader '%s' test on WARP.\n", uint_tests[i].ps->name); + vkd3d_test_pop_context(); continue; } if (uint_tests[i].is_float64 && !test_shader_float64) { skip("Skipping shader '%s' float64 test.\n", uint_tests[i].ps->name); + vkd3d_test_pop_context(); continue; }

1 0