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

Zebediah Figura : vkd3d-shader/hlsl: Use the writemask to map the coords swizzle for load instructions.
by Alexandre Julliard June 8, 2023

June 8, 2023

Module: vkd3d Branch: master Commit: 7b476573ffe0e674ef7a2390fb9d6da9c4d6fd3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b476573ffe0e674ef7a2390fb9d6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 5 12:30:42 2023 -0500 vkd3d-shader/hlsl: Use the writemask to map the coords swizzle for load instructions. Instead of modifying the swizzle after calling sm4_src_from_node(). This fixes the case where sm4_src_from_node() returns an immediate constant. Fixes: a471c5567acaf467292cdfb9c061e2213b348805 --- libs/vkd3d-shader/tpf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 60948d64..b252270c 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4012,8 +4012,8 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf bool multisampled = resource_type->base_type == HLSL_TYPE_TEXTURE && (resource_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS || resource_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY); bool uav = (hlsl_type_get_regset(resource_type) == HLSL_REGSET_UAVS); + unsigned int coords_writemask = VKD3DSP_WRITEMASK_ALL; struct sm4_instruction instr; - unsigned int dim_count; memset(&instr, 0, sizeof(instr)); if (uav) @@ -4034,19 +4034,20 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf sm4_dst_from_node(&instr.dsts[0], dst); instr.dst_count = 1; - sm4_src_from_node(&instr.srcs[0], coords, VKD3DSP_WRITEMASK_ALL); - if (!uav) { /* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */ - dim_count = hlsl_sampler_dim_count(dim); + unsigned int dim_count = hlsl_sampler_dim_count(dim); + if (dim_count == 1) - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); + coords_writemask = VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_3; if (dim_count == 2) - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); + coords_writemask = VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_1 | VKD3DSP_WRITEMASK_3; } + sm4_src_from_node(&instr.srcs[0], coords, coords_writemask); + sm4_src_from_deref(ctx, &instr.srcs[1], resource, resource_type, instr.dsts[0].writemask); instr.src_count = 2;

1 0

Bernhard Kölbl : mf/tests: Remove duplicate call to MFStartup().
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 07d0f1f0c0bbd744f5f107f82b702a891e41c2eb URL: https://gitlab.winehq.org/wine/wine/-/commit/07d0f1f0c0bbd744f5f107f82b702a… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Jun 7 14:42:00 2023 +0200 mf/tests: Remove duplicate call to MFStartup(). Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/mf/tests/mf.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 18488649523..fa538e8ad9f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4962,9 +4962,6 @@ static void test_sample_grabber_orientation(GUID subtype) grabber_callback->done_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(!!grabber_callback->done_event, "CreateEventW failed, error %lu\n", GetLastError()); - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "Startup failure, hr %#lx.\n", hr); - hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Piotr Caban : localspl: Don't pass original document name to cupsStartDocument.
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 8171cfb79b4dbd57184ade9b7a66aed47aba8427 URL: https://gitlab.winehq.org/wine/wine/-/commit/8171cfb79b4dbd57184ade9b7a66ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 7 20:22:21 2023 +0200 localspl: Don't pass original document name to cupsStartDocument. It's used by the function to find document content type. Fixes regression introduced by e164b8cefb9dfbf0af5b83e176a386eb2c490d6b. --- dlls/localspl/cups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/cups.c b/dlls/localspl/cups.c index a7f2273aba1..cf96f1739fe 100644 --- a/dlls/localspl/cups.c +++ b/dlls/localspl/cups.c @@ -365,7 +365,7 @@ static BOOL cups_write_doc(doc_t *doc, const BYTE *buf, unsigned int size) } if (pcupsStartDocument(CUPS_HTTP_DEFAULT, doc->cups.queue, job_id, - doc->cups.doc_title, format, TRUE) != HTTP_STATUS_CONTINUE) + NULL, format, TRUE) != HTTP_STATUS_CONTINUE) { if (pcupsLastErrorString) WARN("cupsStartDocument failed: %s\n", debugstr_a(pcupsLastErrorString()));

1 0

Zebediah Figura : xaudio2: Use the preprocessor to modify definitions in xaudio2.idl and xaudio2fx.idl.
by Alexandre Julliard June 7, 2023

June 7, 2023

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

Zebediah Figura : xaudio2: Move CreateAudioVolumeMeter() and CreateAudioReverb() to xapo.c.
by Alexandre Julliard June 7, 2023

June 7, 2023

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 June 7, 2023

June 7, 2023

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/tests: Add a couple of helpers to abstract the difference between versions.
by Alexandre Julliard June 7, 2023

June 7, 2023

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

Rémi Bernon : winex11: Remove now unnecessary ClipCursor forwarding to foreground thread.
by Alexandre Julliard June 7, 2023

June 7, 2023

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

Rémi Bernon : server: Queue a hardware WM_WINE_CLIPCURSOR message to the foreground thread.
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 5ebb1ed132d5261f410d7ff4f99c803f50752ed9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ebb1ed132d5261f410d7ff4f99c80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 2 12:11:21 2023 +0200 server: Queue a hardware WM_WINE_CLIPCURSOR message to the foreground thread. When applying a new cursor clipping rect, or to the previous foreground thread when foreground changes, to notify it of the cursor clipping rect being reset. --- server/queue.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- server/user.h | 2 +- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index c869daadb0c..1e2647aac27 100644 --- a/server/queue.c +++ b/server/queue.c @@ -449,8 +449,25 @@ static void get_message_defaults( struct msg_queue *queue, int *x, int *y, unsig *time = get_tick_count(); } +static void queue_clip_cursor_msg( struct desktop *desktop, lparam_t wparam, lparam_t lparam ) +{ + static const struct hw_msg_source source = { IMDT_UNAVAILABLE, IMO_SYSTEM }; + struct thread_input *input; + struct message *msg; + + if (!(msg = alloc_hardware_message( 0, source, get_tick_count(), 0 ))) return; + + msg->msg = WM_WINE_CLIPCURSOR; + msg->wparam = wparam; + msg->lparam = lparam; + msg->x = desktop->cursor.x; + msg->y = desktop->cursor.y; + if ((input = desktop->foreground_input)) msg->win = input->active; + queue_hardware_message( desktop, msg, 1 ); +} + /* set the cursor clip rectangle */ -void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int send_clip_msg ) +void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int reset ) { rectangle_t top_rect; int x, y; @@ -468,12 +485,16 @@ void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int s } else desktop->cursor.clip = top_rect; - if (send_clip_msg) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, rect == NULL, 0 ); - /* warp the mouse to be inside the clip rect */ x = max( min( desktop->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); y = max( min( desktop->cursor.y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); + + /* request clip cursor rectangle reset to the desktop thread */ + if (reset) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, TRUE, FALSE ); + + /* notify foreground thread, of reset, or to apply new cursor clipping rect */ + queue_clip_cursor_msg( desktop, rect == NULL, reset ); } /* change the foreground input and reset the cursor clip rect */ @@ -558,6 +579,7 @@ static inline int get_hardware_msg_bit( struct message *msg ) if (msg->msg == WM_INPUT_DEVICE_CHANGE || msg->msg == WM_INPUT) return QS_RAWINPUT; if (msg->msg == WM_MOUSEMOVE || msg->msg == WM_NCMOUSEMOVE) return QS_MOUSEMOVE; if (msg->msg >= WM_KEYFIRST && msg->msg <= WM_KEYLAST) return QS_KEY; + if (msg->msg == WM_WINE_CLIPCURSOR) return QS_RAWINPUT; return QS_MOUSEBUTTON; } @@ -610,10 +632,36 @@ static int merge_mousemove( struct thread_input *input, const struct message *ms return 1; } +/* try to merge a WM_WINE_CLIPCURSOR message with the last in the list; return 1 if successful */ +static int merge_wine_clipcursor( struct thread_input *input, const struct message *msg ) +{ + struct message *prev; + + LIST_FOR_EACH_ENTRY_REV( prev, &input->msg_list, struct message, entry ) + if (prev->msg == WM_WINE_CLIPCURSOR) break; + if (&prev->entry == &input->msg_list) return 0; + + if (prev->result) return 0; + if (prev->win != msg->win) return 0; + if (prev->type != msg->type) return 0; + + /* now we can merge it */ + prev->wparam = msg->wparam; + prev->lparam = msg->lparam; + prev->x = msg->x; + prev->y = msg->y; + prev->time = msg->time; + list_remove( &prev->entry ); + list_add_tail( &input->msg_list, &prev->entry ); + + return 1; +} + /* try to merge a message with the messages in the list; return 1 if successful */ static int merge_message( struct thread_input *input, const struct message *msg ) { if (msg->msg == WM_MOUSEMOVE) return merge_mousemove( input, msg ); + if (msg->msg == WM_WINE_CLIPCURSOR) return merge_wine_clipcursor( input, msg ); return 0; } diff --git a/server/user.h b/server/user.h index dde7a3308d7..a18c94ec89d 100644 --- a/server/user.h +++ b/server/user.h @@ -109,7 +109,7 @@ extern void queue_cleanup_window( struct thread *thread, user_handle_t win ); extern int init_thread_queue( struct thread *thread ); extern int attach_thread_input( struct thread *thread_from, struct thread *thread_to ); extern void detach_thread_input( struct thread *thread_from ); -extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int send_clip_msg ); +extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int reset ); extern void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lparam_t lparam ); extern void send_notify_message( user_handle_t win, unsigned int message,

1 0

Rémi Bernon : win32u: Asynchronously apply or reset ClipCursor from the hardware message.
by Alexandre Julliard June 7, 2023

June 7, 2023

Module: wine Branch: master Commit: 47e208e9ec91b3ac0aca7042778ff7d56c14ab4d URL: https://gitlab.winehq.org/wine/wine/-/commit/47e208e9ec91b3ac0aca7042778ff7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 11:23:54 2023 +0200 win32u: Asynchronously apply or reset ClipCursor from the hardware message. --- dlls/win32u/input.c | 2 +- dlls/win32u/message.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 2df1266041d..c26660319df 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2552,6 +2552,6 @@ BOOL WINAPI NtUserClipCursor( const RECT *rect ) } } SERVER_END_REQ; - if (ret) user_driver->pClipCursor( &new_rect, FALSE ); + return ret; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index cc6a36449d9..7238dd1bd46 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1766,6 +1766,8 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar ret = process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); else if (is_mouse_message( msg->message )) ret = process_mouse_message( msg, hw_id, msg_data->info, hwnd_filter, first, last, remove ); + else if (msg->message == WM_WINE_CLIPCURSOR) + process_wine_clipcursor( msg->wParam, msg->lParam ); else ERR( "unknown message type %x\n", msg->message ); SetThreadDpiAwarenessContext( context );

1 0