June 2023 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Remove now unnecessary ClipCursor forwarding to foreground thread.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 397cd1c0c00ce3dc62b0c32b234ede5a0f48aea0 URL: https://gitlab.winehq.org/wine/wine/-/commit/397cd1c0c00ce3dc62b0c32b234ede… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 23:02:17 2023 +0200 winex11: Remove now unnecessary ClipCursor forwarding to foreground thread. --- dlls/winex11.drv/mouse.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8d23facea99..4d94a97f3c8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1564,20 +1564,9 @@ BOOL X11DRV_ClipCursor( const RECT *clip, BOOL reset ) if (!reset && grab_pointer) { RECT virtual_rect = NtUserGetVirtualScreenRect(); - HWND foreground = NtUserGetForegroundWindow(); - DWORD tid, pid; if (!clip) clip = &virtual_rect; - /* forward request to the foreground window if it's in a different thread */ - tid = NtUserGetWindowThread( foreground, &pid ); - if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) - { - TRACE( "forwarding clip request to %p\n", foreground ); - send_notify_message( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, FALSE, FALSE ); - return TRUE; - } - /* we are clipping if the clip rectangle is smaller than the screen */ if (clip->left > virtual_rect.left || clip->right < virtual_rect.right || clip->top > virtual_rect.top || clip->bottom < virtual_rect.bottom) @@ -1589,8 +1578,8 @@ BOOL X11DRV_ClipCursor( const RECT *clip, BOOL reset ) struct x11drv_thread_data *data = x11drv_thread_data(); if (data && data->clip_hwnd) { - if (EqualRect( clip, &clip_rect ) || clip_fullscreen_window( foreground, TRUE )) - return TRUE; + if (EqualRect( clip, &clip_rect )) return TRUE; + if (clip_fullscreen_window( NtUserGetForegroundWindow(), TRUE )) return TRUE; } } } @@ -1605,20 +1594,12 @@ BOOL X11DRV_ClipCursor( const RECT *clip, BOOL reset ) */ LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) { - RECT clip; - if (hwnd == NtUserGetDesktopWindow()) WARN( "ignoring clip cursor request on desktop window.\n" ); else if (hwnd != NtUserGetForegroundWindow()) WARN( "ignoring clip cursor request on non-foreground window.\n" ); else if (fullscreen) clip_fullscreen_window( hwnd, reset ); - else - { - NtUserGetClipCursor( &clip ); - X11DRV_ClipCursor( &clip, FALSE ); - } - return 0; }

1 0

Zebediah Figura : xaudio2/tests: Add a couple of helpers to abstract the difference between versions.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 10700c044b31ea2207c5569f5205c9161e8e5479 URL: https://gitlab.winehq.org/wine/wine/-/commit/10700c044b31ea2207c5569f5205c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 24 15:34:57 2023 -0500 xaudio2/tests: Add a couple of helpers to abstract the difference between versions. --- dlls/xaudio2_7/tests/xaudio2.c | 83 +++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 53 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index c6768cb4143..8bf79eb2a34 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -40,6 +40,22 @@ static HRESULT (WINAPI *pCreateAudioVolumeMeter)(IUnknown**) = NULL; #define XA2CALL_V(method, ...) if(xaudio27) IXAudio27_##method((IXAudio27*)xa, __VA_ARGS__); else IXAudio2_##method(xa, __VA_ARGS__); #define XA2CALL(method, ...) if(xaudio27) hr = IXAudio27_##method((IXAudio27*)xa, __VA_ARGS__); else hr = IXAudio2_##method(xa, __VA_ARGS__); +static HRESULT create_mastering_voice(IXAudio2 *audio, unsigned int channel_count, IXAudio2MasteringVoice **voice) +{ + if (xaudio27) + return IXAudio27_CreateMasteringVoice((IXAudio27*)audio, voice, channel_count, 44100, 0, 0, NULL); + else + return IXAudio2_CreateMasteringVoice(audio, voice, channel_count, 44100, 0, NULL, NULL, AudioCategory_GameEffects); +} + +static void get_voice_state(IXAudio2SourceVoice *voice, XAUDIO2_VOICE_STATE *state) +{ + if (xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)voice, state); + else + IXAudio2SourceVoice_GetState(voice, state, 0); +} + static void fill_buf(float *buf, WAVEFORMATEX *fmt, DWORD hz, DWORD len_frames) { if(winetest_interactive){ @@ -195,10 +211,7 @@ static void test_simple_streaming(IXAudio2 *xa) XA2CALL(RegisterForCallbacks, &ecb); ok(hr == S_OK, "RegisterForCallbacks failed: %08lx\n", hr); - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + hr = create_mastering_voice(xa, 2, &master); ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); if(!xaudio27){ @@ -315,10 +328,7 @@ static void test_simple_streaming(IXAudio2 *xa) IUnknown_Release(vumeter); while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); + get_voice_state(src, &state); if(state.SamplesPlayed >= 22050) break; Sleep(100); @@ -371,10 +381,7 @@ static void WINAPI vcb_buf_OnBufferStart(IXAudio2VoiceCallback *This, ok(data->idx == obs_calls, "Buffer callback out of order: %u\n", data->idx); - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)data->src, &state); - else - IXAudio2SourceVoice_GetState(data->src, &state, 0); + get_voice_state(data->src, &state); ok(state.BuffersQueued == 5 - obs_calls, "Got wrong number of buffers remaining: %u\n", state.BuffersQueued); ok(state.pCurrentBufferContext == pBufferContext, "Got wrong buffer from GetState\n"); @@ -390,10 +397,7 @@ static void WINAPI vcb_buf_OnBufferEnd(IXAudio2VoiceCallback *This, ok(data->idx == obe_calls, "Buffer callback out of order: %u\n", data->idx); - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)data->src, &state); - else - IXAudio2SourceVoice_GetState(data->src, &state, 0); + get_voice_state(data->src, &state); ok(state.BuffersQueued == 5 - obe_calls - 1, "Got wrong number of buffers remaining: %u\n", state.BuffersQueued); if(state.BuffersQueued == 0) @@ -485,10 +489,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) XA2CALL_0V(StopEngine); - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + hr = create_mastering_voice(xa, 2, &master); ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); /* test OnBufferStart/End callbacks */ @@ -534,10 +535,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) } while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); + get_voice_state(src, &state); if(state.SamplesPlayed >= 4410 * 5) break; Sleep(100); @@ -572,10 +570,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) ok(nstreamends == 1, "Got wrong number of OnStreamEnd calls: %u\n", nstreamends); /* xaudio resets SamplesPlayed after processing an end-of-stream buffer */ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); + get_voice_state(src, &state); ok(state.SamplesPlayed == 0, "Got wrong samples played\n"); if(xaudio27) @@ -600,10 +595,7 @@ static UINT32 play_to_completion(IXAudio2SourceVoice *src, UINT32 max_samples) ok(hr == S_OK, "Start failed: %08lx\n", hr); while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); + get_voice_state(src, &state); if(state.BuffersQueued == 0) break; if(state.SamplesPlayed >= max_samples){ @@ -632,10 +624,7 @@ static void test_looping(IXAudio2 *xa) XA2CALL_0V(StopEngine); - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + hr = create_mastering_voice(xa, 2, &master); ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); @@ -816,10 +805,7 @@ static void test_submix(IXAudio2 *xa) XA2CALL_0V(StopEngine); - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + hr = create_mastering_voice(xa, 2, &master); ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); XA2CALL(CreateSubmixVoice, &sub, 2, 44100, 0, 0, NULL, NULL); @@ -855,10 +841,7 @@ static void test_flush(IXAudio2 *xa) XA2CALL_0V(StopEngine); - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + hr = create_mastering_voice(xa, 2, &master); ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; @@ -887,10 +870,7 @@ static void test_flush(IXAudio2 *xa) ok(hr == S_OK, "StartEngine failed: %08lx\n", hr); while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); + get_voice_state(src, &state); if(state.SamplesPlayed >= 2205) break; Sleep(10); @@ -1160,10 +1140,7 @@ static void test_setchannelvolumes(IXAudio2 *xa) WAVEFORMATEX fmt_2ch, fmt_8ch; float volumes[] = {0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f}; - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 8, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 8, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + hr = create_mastering_voice(xa, 8, &master); ok(hr == S_OK, "CreateMasteringVoice failed: %08lx\n", hr); fmt_2ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; @@ -1227,7 +1204,7 @@ static UINT32 check_has_devices(IXAudio2 *xa) HRESULT hr; IXAudio2MasteringVoice *master; - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + hr = create_mastering_voice(xa, 2, &master); if(hr != S_OK) return 0;

1 0

Zebediah Figura : xaudio2: Move CreateAudioVolumeMeter() and CreateAudioReverb() to xapo.c.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 77a83bc4bb57a4a1b216eb0480b9593412b58a34 URL: https://gitlab.winehq.org/wine/wine/-/commit/77a83bc4bb57a4a1b216eb0480b959… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 1 16:25:08 2023 -0500 xaudio2: Move CreateAudioVolumeMeter() and CreateAudioReverb() to xapo.c. --- dlls/xaudio2_7/xapo.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 36 ------------------------------------ 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 1451816df9c..75153ce8cd4 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -409,3 +409,41 @@ HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) HeapFree(GetProcessHeap(), 0, ret); return hr; } + +#if XAUDIO2_VER >= 8 +HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) +{ + IClassFactory *cf; + HRESULT hr; + + TRACE("%p\n", out); + + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; + + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); + + IClassFactory_Release(cf); + + return hr; +} + +HRESULT WINAPI CreateAudioReverb(IUnknown **out) +{ + IClassFactory *cf; + HRESULT hr; + + TRACE("%p\n", out); + + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; + + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); + + IClassFactory_Release(cf); + + return hr; +} +#endif diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 5730e0b8811..ab759b678a9 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1979,40 +1979,4 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p return S_OK; } - -HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) -{ - IClassFactory *cf; - HRESULT hr; - - TRACE("%p\n", out); - - hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - - return hr; -} - -HRESULT WINAPI CreateAudioReverb(IUnknown **out) -{ - IClassFactory *cf; - HRESULT hr; - - TRACE("%p\n", out); - - hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - - return hr; -} #endif /* XAUDIO2_VER >= 8 */

1 0

Zebediah Figura : xaudio2: Create XAPO objects directly from CreateAudioVolumeMeter() and CreateAudioReverb().
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: c80285ffb125071d599eec05751bec917672a8d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c80285ffb125071d599eec05751bec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 1 17:17:39 2023 -0500 xaudio2: Create XAPO objects directly from CreateAudioVolumeMeter() and CreateAudioReverb(). Instead of going through the class factory. --- dlls/xaudio2_7/xapo.c | 165 +++++++++++++++++++++++++++----------------------- 1 file changed, 90 insertions(+), 75 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 75153ce8cd4..c8c323ff78a 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -256,6 +256,57 @@ static const IXAPOParametersVtbl XAPOFXParameters_Vtbl = { XAPOFXParams_GetParameters }; +static HRESULT xapo_create(FAPO *fapo, XA2XAPOFXImpl **out) +{ + XA2XAPOFXImpl *object; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IXAPO_iface.lpVtbl = &XAPOFX_Vtbl; + object->IXAPOParameters_iface.lpVtbl = &XAPOFXParameters_Vtbl; + object->fapo = fapo; + + *out = object; + return S_OK; +} + +#ifndef XAPOFX1_VER +static HRESULT reverb_create(XA2XAPOFXImpl **out) +{ + FAPO *fapo; + HRESULT hr; + +#if XAUDIO2_VER >= 9 + hr = FAudioCreateReverb9WithCustomAllocatorEXT(&fapo, 0, + XAudio_Internal_Malloc, XAudio_Internal_Free, XAudio_Internal_Realloc); +#else + hr = FAudioCreateReverbWithCustomAllocatorEXT(&fapo, 0, + XAudio_Internal_Malloc, XAudio_Internal_Free, XAudio_Internal_Realloc); +#endif + if (FAILED(hr)) + return hr; + + if (FAILED(hr = xapo_create(fapo, out))) + fapo->Release(fapo); + return hr; +} + +static HRESULT volume_meter_create(XA2XAPOFXImpl **out) +{ + FAPO *fapo; + HRESULT hr; + + if (FAILED(hr = FAudioCreateVolumeMeterWithCustomAllocatorEXT(&fapo, 0, + XAudio_Internal_Malloc, XAudio_Internal_Free, XAudio_Internal_Realloc))) + return hr; + + if (FAILED(hr = xapo_create(fapo, out))) + fapo->Release(fapo); + return hr; +} +#endif /* XAPOFX1_VER */ + struct xapo_cf { IClassFactory IClassFactory_iface; LONG ref; @@ -300,56 +351,6 @@ static ULONG WINAPI xapocf_Release(IClassFactory *iface) return ref; } -static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) -{ -#ifndef XAPOFX1_VER - if(IsEqualGUID(clsid, &CLSID_AudioVolumeMeter27)) - return FAudioCreateVolumeMeterWithCustomAllocatorEXT( - fapo, - 0, - XAudio_Internal_Malloc, - XAudio_Internal_Free, - XAudio_Internal_Realloc - ); -#if XAUDIO2_VER >= 9 - if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) - return FAudioCreateReverb9WithCustomAllocatorEXT( - fapo, - 0, - XAudio_Internal_Malloc, - XAudio_Internal_Free, - XAudio_Internal_Realloc - ); -#else - if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) - return FAudioCreateReverbWithCustomAllocatorEXT( - fapo, - 0, - XAudio_Internal_Malloc, - XAudio_Internal_Free, - XAudio_Internal_Realloc - ); -#endif -#endif -#if XAUDIO2_VER >= 8 || defined XAPOFX1_VER - if(IsEqualGUID(clsid, &CLSID_FXReverb) || - IsEqualGUID(clsid, &CLSID_FXEQ) || - IsEqualGUID(clsid, &CLSID_FXEcho) || - IsEqualGUID(clsid, &CLSID_FXMasteringLimiter)) - return FAPOFX_CreateFXWithCustomAllocatorEXT( - (const FAudioGUID*) clsid, - fapo, - NULL, - 0, - XAudio_Internal_Malloc, - XAudio_Internal_Free, - XAudio_Internal_Realloc - ); -#endif - ERR("Invalid XAPO CLSID!\n"); - return E_INVALIDARG; -} - static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppobj) { @@ -364,16 +365,42 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut if(pOuter) return CLASS_E_NOAGGREGATION; - object = heap_alloc(sizeof(*object)); - object->IXAPO_iface.lpVtbl = &XAPOFX_Vtbl; - object->IXAPOParameters_iface.lpVtbl = &XAPOFXParameters_Vtbl; +#if XAUDIO2_VER < 8 && !defined(XAPOFX1_VER) + if (IsEqualGUID(This->class, &CLSID_AudioVolumeMeter27)) + { + hr = volume_meter_create(&object); + } + else if (IsEqualGUID(This->class, &CLSID_AudioReverb27)) + { + hr = reverb_create(&object); + } +#else + if (IsEqualGUID(This->class, &CLSID_FXReverb) + || IsEqualGUID(This->class, &CLSID_FXEQ) + || IsEqualGUID(This->class, &CLSID_FXEcho) + || IsEqualGUID(This->class, &CLSID_FXMasteringLimiter)) + { + FAPO *fapo; - hr = get_fapo_from_clsid(This->class, &object->fapo); + if (FAILED(hr = FAPOFX_CreateFXWithCustomAllocatorEXT((const FAudioGUID *)This->class, &fapo, NULL, + 0, XAudio_Internal_Malloc, XAudio_Internal_Free, XAudio_Internal_Realloc))) + return hr; - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; + if (FAILED(hr = xapo_create(fapo, &object))) + { + fapo->Release(fapo); + return hr; + } } +#endif + else + { + FIXME("Unknown CLSID %s.\n", debugstr_guid(This->class)); + return E_INVALIDARG; + } + + if (FAILED(hr)) + return hr; hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); IXAPO_Release(&object->IXAPO_iface); @@ -413,37 +440,25 @@ HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) #if XAUDIO2_VER >= 8 HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) { - IClassFactory *cf; + XA2XAPOFXImpl *object; HRESULT hr; TRACE("%p\n", out); - hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - + if (SUCCEEDED(hr = volume_meter_create(&object))) + *out = (IUnknown *)&object->IXAPO_iface; return hr; } HRESULT WINAPI CreateAudioReverb(IUnknown **out) { - IClassFactory *cf; + XA2XAPOFXImpl *object; HRESULT hr; TRACE("%p\n", out); - hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - + if (SUCCEEDED(hr = reverb_create(&object))) + *out = (IUnknown *)&object->IXAPO_iface; return hr; } #endif

1 0

Zebediah Figura : xaudio2: Use the preprocessor to modify definitions in xaudio2.idl and xaudio2fx.idl.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 14c44d0b0a2fc0ead5bc75615864ff850a44c4d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/14c44d0b0a2fc0ead5bc75615864ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 24 16:59:08 2023 -0500 xaudio2: Use the preprocessor to modify definitions in xaudio2.idl and xaudio2fx.idl. Instead of including the IDLs directly, define a local IDL that #includes them, with XAUDIO2_VER defined, and include that generated header. Get rid of compat.c, and use XAUDIO2_VER to modify the code in the other source files. Build the tests for both xaudio2_7 and xaudio2_8 using PARENTSRC, and use XAUDIO2_VER to select between them. This mirrors the approach taken for d3dcompiler, and makes it easier to test more xaudio2 versions in the future. --- configure | 1 + configure.ac | 1 + dlls/xapofx1_1/Makefile.in | 2 + dlls/xapofx1_2/Makefile.in | 2 + dlls/xapofx1_3/Makefile.in | 2 + dlls/xapofx1_4/Makefile.in | 2 + dlls/xapofx1_5/Makefile.in | 2 + dlls/xaudio2_0/Makefile.in | 1 - dlls/xaudio2_1/Makefile.in | 1 - dlls/xaudio2_2/Makefile.in | 1 - dlls/xaudio2_3/Makefile.in | 1 - dlls/xaudio2_4/Makefile.in | 1 - dlls/xaudio2_5/Makefile.in | 1 - dlls/xaudio2_6/Makefile.in | 1 - dlls/xaudio2_7/Makefile.in | 1 - dlls/xaudio2_7/compat.c | 2853 ------------------------------- dlls/xaudio2_7/tests/Makefile.in | 3 + dlls/xaudio2_7/tests/xaudio2.c | 391 ++--- dlls/xaudio2_7/tests/xaudio_classes.idl | 24 + dlls/xaudio2_7/xapo.c | 5 +- dlls/xaudio2_7/xaudio_classes.idl | 186 +- dlls/xaudio2_7/xaudio_dll.c | 353 ++-- dlls/xaudio2_7/xaudio_private.h | 73 +- dlls/xaudio2_8/Makefile.in | 2 +- dlls/xaudio2_8/tests/Makefile.in | 9 + dlls/xaudio2_9/Makefile.in | 1 - include/xaudio2.idl | 1065 +++--------- include/xaudio2fx.idl | 124 +- 28 files changed, 664 insertions(+), 4445 deletions(-)

1 0

Alexandre Julliard : wininet/tests: Update expected WineHQ certificate.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 1dd6ea7049f857f0d4e7a78ec8314c3bac71625b URL: https://gitlab.winehq.org/wine/wine/-/commit/1dd6ea7049f857f0d4e7a78ec8314c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 16:12:02 2023 +0200 wininet/tests: Update expected WineHQ certificate. --- dlls/wininet/tests/http.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index eeb4a28da4b..6edab2141ae 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6666,9 +6666,7 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" "Minnesota\r\n" - "Saint Paul\r\n" - "\"CodeWeavers, Inc.\"\r\n" - "IT\r\n" + "CodeWeavers\r\n" "*.winehq.org", "US\r\n"

1 0

Alexandre Julliard : ntdll: Support adding overlapping ranges in mmap_add_reserved_area().
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: d5b22ae0853ddd3ea32b7e71f425b140d6864dd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5b22ae0853ddd3ea32b7e71f425b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:46:21 2023 +0200 ntdll: Support adding overlapping ranges in mmap_add_reserved_area(). --- dlls/ntdll/unix/virtual.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b208d7d8e9b..0ccb8cdfbfa 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -244,42 +244,43 @@ void *anon_mmap_alloc( size_t size, int prot ) static void mmap_add_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; - struct list *ptr; + struct list *ptr, *next; + void *end, *area_end; if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ + end = (char *)addr + size; LIST_FOR_EACH( ptr, &reserved_areas ) { area = LIST_ENTRY( ptr, struct reserved_area, entry ); + area_end = (char *)area->base + area->size; + + if (area->base > end) break; + if (area_end < addr) continue; if (area->base > addr) { - /* try to merge with the next one */ - if ((char *)addr + size == (char *)area->base) - { - area->base = addr; - area->size += size; - return; - } - break; + area->size += (char *)area->base - (char *)addr; + area->base = addr; } - else if ((char *)area->base + area->size == (char *)addr) + if (area_end >= end) return; + + /* try to merge with the following ones */ + while ((next = list_next( &reserved_areas, ptr ))) { - /* merge with the previous one */ - area->size += size; + struct reserved_area *area_next = LIST_ENTRY( next, struct reserved_area, entry ); + void *next_end = (char *)area_next->base + area_next->size; - /* try to merge with the next one too */ - if ((ptr = list_next( &reserved_areas, ptr ))) + if (area_next->base > end) break; + list_remove( next ); + free( area_next ); + if (next_end >= end) { - struct reserved_area *next = LIST_ENTRY( ptr, struct reserved_area, entry ); - if ((char *)addr + size == (char *)next->base) - { - area->size += next->size; - list_remove( &next->entry ); - free( next ); - } + end = next_end; + break; } - return; } + area->size = (char *)end - (char *)area->base; + return; } if ((area = malloc( sizeof(*area) )))

1 0

Alexandre Julliard : ntdll: Add a helper function to unmap memory above the user space limit.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 4c827cefbc83990f368b62c75993c89b4e8242d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c827cefbc83990f368b62c75993c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:47:25 2023 +0200 ntdll: Add a helper function to unmap memory above the user space limit. --- dlls/ntdll/unix/virtual.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0ccb8cdfbfa..fb5a9a0291a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -393,6 +393,30 @@ static int mmap_enum_reserved_areas( int (*enum_func)(void *base, SIZE_T size, v return ret; } + +/*********************************************************************** + * unmap_area_above_user_limit + * + * Unmap memory that's above the user space limit, by replacing it with an empty mapping, + * and return the remaining size below the limit. virtual_mutex must be held by caller. + */ +static size_t unmap_area_above_user_limit( void *addr, size_t size ) +{ + size_t ret = 0; + + if (addr < user_space_limit) + { + ret = (char *)user_space_limit - (char *)addr; + if (ret >= size) return size; /* nothing is above limit */ + size -= ret; + addr = user_space_limit; + } + anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); + mmap_add_reserved_area( addr, size ); + return ret; +} + + static void *anon_mmap_tryfixed( void *start, size_t size, int prot, int flags ) { void *ptr; @@ -424,12 +448,8 @@ static void *anon_mmap_tryfixed( void *start, size_t size, int prot, int flags ) #endif if (ptr != MAP_FAILED && ptr != start) { - if (is_beyond_limit( ptr, size, user_space_limit )) - { - anon_mmap_fixed( ptr, size, PROT_NONE, MAP_NORESERVE ); - mmap_add_reserved_area( ptr, size ); - } - else munmap( ptr, size ); + size = unmap_area_above_user_limit( ptr, size ); + if (size) munmap( ptr, size ); ptr = MAP_FAILED; errno = EEXIST; } @@ -2011,7 +2031,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, else { struct alloc_area alloc; - size_t view_size; + size_t view_size, unmap_size; if (!align_mask) align_mask = granularity_mask; view_size = size + align_mask + 1; @@ -2048,8 +2068,9 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, } TRACE( "got mem with anon mmap %p-%p\n", ptr, (char *)ptr + size ); /* if we got something beyond the user limit, unmap it and retry */ - if (is_beyond_limit( ptr, view_size, user_space_limit )) add_reserved_area( ptr, view_size ); - else break; + if (!is_beyond_limit( ptr, view_size, user_space_limit )) break; + unmap_size = unmap_area_above_user_limit( ptr, view_size ); + if (unmap_size) munmap( ptr, unmap_size ); } ptr = unmap_extra_space( ptr, view_size, size, align_mask ); }

1 0

Alexandre Julliard : ntdll: Reimplement unmap_area() to avoid recursion and callbacks.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 4cdc2f75f71eb6d09aaa13e206c3ed405a12ea4e URL: https://gitlab.winehq.org/wine/wine/-/commit/4cdc2f75f71eb6d09aaa13e206c3ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:50:05 2023 +0200 ntdll: Reimplement unmap_area() to avoid recursion and callbacks. --- dlls/ntdll/unix/virtual.c | 76 +++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fb5a9a0291a..074fe7a4559 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1436,30 +1436,6 @@ static void *find_reserved_free_area( void *base, void *end, size_t size, int to } -/*********************************************************************** - * add_reserved_area - * - * Add a reserved area to the list maintained by libwine. - * virtual_mutex must be held by caller. - */ -static void add_reserved_area( void *addr, size_t size ) -{ - TRACE( "adding %p-%p\n", addr, (char *)addr + size ); - - if (addr < user_space_limit) - { - /* unmap the part of the area that is below the limit */ - assert( (char *)addr + size > (char *)user_space_limit ); - munmap( addr, (char *)user_space_limit - (char *)addr ); - size -= (char *)user_space_limit - (char *)addr; - addr = user_space_limit; - } - /* blow away existing mappings */ - anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); - mmap_add_reserved_area( addr, size ); -} - - /*********************************************************************** * remove_reserved_area * @@ -1529,34 +1505,36 @@ static int get_area_boundary_callback( void *start, SIZE_T size, void *arg ) * Unmap an area, or simply replace it by an empty mapping if it is * in a reserved area. virtual_mutex must be held by caller. */ -static inline void unmap_area( void *addr, size_t size ) +static void unmap_area( void *start, size_t size ) { - switch (mmap_is_in_reserved_area( addr, size )) - { - case -1: /* partially in a reserved area */ + struct reserved_area *area; + void *end; + + if (!(size = unmap_area_above_user_limit( start, size ))) return; + + end = (char *)start + size; + + LIST_FOR_EACH_ENTRY( area, &reserved_areas, struct reserved_area, entry ) { - struct area_boundary area; - size_t lower_size; - area.base = addr; - area.size = size; - mmap_enum_reserved_areas( get_area_boundary_callback, &area, 0 ); - assert( area.boundary ); - lower_size = (char *)area.boundary - (char *)addr; - unmap_area( addr, lower_size ); - unmap_area( area.boundary, size - lower_size ); - break; - } - case 1: /* in a reserved area */ - anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); - break; - default: - case 0: /* not in a reserved area */ - if (is_beyond_limit( addr, size, user_space_limit )) - add_reserved_area( addr, size ); - else - munmap( addr, size ); - break; + void *area_start = area->base; + void *area_end = (char *)area_start + area->size; + + if (area_start >= end) break; + if (area_end <= start) continue; + if (area_start > start) + { + munmap( start, (char *)area_start - (char *)start ); + start = area_start; + } + if (area_end >= end) + { + anon_mmap_fixed( start, (char *)end - (char *)start, PROT_NONE, MAP_NORESERVE ); + return; + } + anon_mmap_fixed( start, (char *)area_end - (char *)start, PROT_NONE, MAP_NORESERVE ); + start = area_end; } + munmap( start, (char *)end - (char *)start ); }

1 0

Alexandre Julliard : ntdll: Reimplement map_fixed_area() to avoid recursion and callbacks.
by Alexandre Julliard 07 Jun '23

07 Jun '23

Module: wine Branch: master Commit: 33240c54651ca849e91e8de649c0c779db01d064 URL: https://gitlab.winehq.org/wine/wine/-/commit/33240c54651ca849e91e8de649c0c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 12:00:14 2023 +0200 ntdll: Reimplement map_fixed_area() to avoid recursion and callbacks. --- dlls/ntdll/unix/virtual.c | 110 ++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 074fe7a4559..f3362a8b6ef 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1463,42 +1463,6 @@ static void remove_reserved_area( void *addr, size_t size ) } -struct area_boundary -{ - void *base; - size_t size; - void *boundary; -}; - -/*********************************************************************** - * get_area_boundary_callback - * - * Get lowest boundary address between reserved area and non-reserved area - * in the specified region. If no boundaries are found, result is NULL. - * virtual_mutex must be held by caller. - */ -static int get_area_boundary_callback( void *start, SIZE_T size, void *arg ) -{ - struct area_boundary *area = arg; - void *end = (char *)start + size; - - area->boundary = NULL; - if (area->base >= end) return 0; - if ((char *)start >= (char *)area->base + area->size) return 1; - if (area->base >= start) - { - if ((char *)area->base + area->size > (char *)end) - { - area->boundary = end; - return 1; - } - return 0; - } - area->boundary = start; - return 1; -} - - /*********************************************************************** * unmap_area * @@ -1918,52 +1882,48 @@ static int alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) /*********************************************************************** * map_fixed_area * - * mmap the fixed memory area. + * Map a memory area at a fixed address. * virtual_mutex must be held by caller. */ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) { - void *ptr; + int unix_prot = get_unix_prot(vprot); + struct reserved_area *area; + NTSTATUS status; + char *start = base, *end = (char *)base + size; - switch (mmap_is_in_reserved_area( base, size )) - { - case -1: /* partially in a reserved area */ + if (find_view_range( base, size )) return STATUS_CONFLICTING_ADDRESSES; + + LIST_FOR_EACH_ENTRY( area, &reserved_areas, struct reserved_area, entry ) { - NTSTATUS status; - struct area_boundary area; - size_t lower_size; - area.base = base; - area.size = size; - mmap_enum_reserved_areas( get_area_boundary_callback, &area, 0 ); - assert( area.boundary ); - lower_size = (char *)area.boundary - (char *)base; - status = map_fixed_area( base, lower_size, vprot ); - if (status == STATUS_SUCCESS) + char *area_start = area->base; + char *area_end = area_start + area->size; + + if (area_start >= end) break; + if (area_end <= start) continue; + if (area_start > start) { - status = map_fixed_area( area.boundary, size - lower_size, vprot); - if (status != STATUS_SUCCESS) unmap_area( base, lower_size ); + if (anon_mmap_tryfixed( start, area_start - start, unix_prot, 0 ) == MAP_FAILED) goto failed; + start = area_start; } - return status; - } - case 0: /* not in a reserved area, do a normal allocation */ - if ((ptr = anon_mmap_tryfixed( base, size, get_unix_prot(vprot), 0 )) == MAP_FAILED) + if (area_end >= end) { - if (errno == ENOMEM) return STATUS_NO_MEMORY; - if (errno == EEXIST) return STATUS_CONFLICTING_ADDRESSES; - return STATUS_INVALID_PARAMETER; + if (anon_mmap_fixed( start, end - start, unix_prot, 0 ) == MAP_FAILED) goto failed; + return STATUS_SUCCESS; } - break; - - default: - case 1: /* in a reserved area, make sure the address is available */ - if (find_view_range( base, size )) return STATUS_CONFLICTING_ADDRESSES; - /* replace the reserved area by our mapping */ - if ((ptr = anon_mmap_fixed( base, size, get_unix_prot(vprot), 0 )) != base) - return STATUS_INVALID_PARAMETER; - break; + if (anon_mmap_fixed( start, area_end - start, unix_prot, 0 ) == MAP_FAILED) goto failed; + start = area_end; } - if (is_beyond_limit( ptr, size, working_set_limit )) working_set_limit = address_space_limit; + + if (anon_mmap_tryfixed( start, end - start, unix_prot, 0 ) == MAP_FAILED) goto failed; return STATUS_SUCCESS; + +failed: + if (errno == ENOMEM) status = STATUS_NO_MEMORY; + else if (errno == EEXIST) status = STATUS_CONFLICTING_ADDRESSES; + else status = STATUS_INVALID_PARAMETER; + unmap_area( base, start - (char *)base ); + return status; } /*********************************************************************** @@ -1998,12 +1958,10 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, if (base) { - if (is_beyond_limit( base, size, address_space_limit )) - return STATUS_WORKING_SET_LIMIT_RANGE; - if (limit && is_beyond_limit( base, size, (void *)limit )) - return STATUS_CONFLICTING_ADDRESSES; - status = map_fixed_area( base, size, vprot ); - if (status != STATUS_SUCCESS) return status; + if (is_beyond_limit( base, size, address_space_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (limit && is_beyond_limit( base, size, (void *)limit )) return STATUS_CONFLICTING_ADDRESSES; + if ((status = map_fixed_area( base, size, vprot ))) return status; + if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; ptr = base; } else

1 0