- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the tan() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: 05e4a39f0d45d71343babb6dbea231fad7d284c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/05e4a39f0d45d71343babb6dbea231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:38:19 2023 +0200 ntdll: Use the tan() implementation from the bundled musl library. --- dlls/ntdll/math.c | 500 ------------------------------------------------------ 1 file changed, 500 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the cos() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: b655da15560b2d927748096e8a9931ded1af4845 URL: https://gitlab.winehq.org/wine/wine/-/commit/b655da15560b2d927748096e8a9931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:37:10 2023 +0200 ntdll: Use the cos() implementation from the bundled musl library. --- dlls/ntdll/math.c | 81 ------------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index c700b293a76..cb20552e88e 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -492,47 +492,6 @@ medium: return n; } -/* Copied from musl: src/math/__sin.c */ -static double __sin(double x, double y, int iy) -{ - static const double S1 = -1.66666666666666324348e-01, - S2 = 8.33333333332248946124e-03, - S3 = -1.98412698298579493134e-04, - S4 = 2.75573137070700676789e-06, - S5 = -2.50507602534068634195e-08, - S6 = 1.58969099521155010221e-10; - - double z, r, v, w; - - z = x * x; - w = z * z; - r = S2 + z * (S3 + z * S4) + z * w * (S5 + z * S6); - v = z * x; - if (iy == 0) - return x + v * (S1 + z * r); - else - return x - ((z * (0.5 * y - v * r) - y) - v * S1); -} - -/* Copied from musl: src/math/__cos.c */ -static double __cos(double x, double y) -{ - static const double C1 = 4.16666666666666019037e-02, - C2 = -1.38888888888741095749e-03, - C3 = 2.48015872894767294178e-05, - C4 = -2.75573143513906633035e-07, - C5 = 2.08757232129817482790e-09, - C6 = -1.13596475577881948265e-11; - double hz, z, r, w; - - z = x * x; - w = z * z; - r = z * (C1 + z * (C2 + z * C3)) + w * w * (C4 + z * (C5 + z * C6)); - hz = 0.5 * z; - w = 1.0 - hz; - return w + (((1.0 - w) - hz) + (z * r - x * y)); -} - /* Copied from musl: src/math/__tan.c */ static double __tan(double x, double y, int odd) { @@ -1280,46 +1239,6 @@ double CDECL ceil( double x ) return u.f; } -/********************************************************************* - * cos (NTDLL.@) - * - * Copied from musl: src/math/cos.c - */ -double CDECL cos( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - /* |x| ~< pi/4 */ - if (ix <= 0x3fe921fb) { - if (ix < 0x3e46a09e) { /* |x| < 2**-27 * sqrt(2) */ - /* raise inexact if x!=0 */ - fp_barrier(x + 0x1p120f); - return 1.0; - } - return __cos(x, 0); - } - - /* cos(Inf or NaN) is NaN */ - if (isinf(x)) - return x - x; - if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction */ - n = __rem_pio2(x, y); - switch (n & 3) { - case 0: return __cos(y[0], y[1]); - case 1: return -__sin(y[0], y[1], 1); - case 2: return -__cos(y[0], y[1]); - default: return __sin(y[0], y[1], 1); - } -} - /********************************************************************* * fabs (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Use the sin() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: aa4d70b5dc460a910ccab32472e46dedb09c336e URL: https://gitlab.winehq.org/wine/wine/-/commit/aa4d70b5dc460a910ccab32472e46d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:35:38 2023 +0200 ntdll: Use the sin() implementation from the bundled musl library. --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/math.c | 45 +++++---------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 7aeee3a7316..2e862c68b7e 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI= MODULE = ntdll.dll UNIXLIB = ntdll.so IMPORTLIB = ntdll -IMPORTS = winecrt0 +IMPORTS = $(MUSL_PE_LIBS) winecrt0 UNIX_CFLAGS = $(UNWIND_CFLAGS) UNIX_LIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index aeed5d31696..c700b293a76 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -42,6 +42,11 @@ #define WIN32_NO_STATUS #include "ntdll_misc.h" +double math_error( int type, const char *name, double arg1, double arg2, double retval ) +{ + return retval; +} + /* Copied from musl: src/internal/libm.h */ static inline float fp_barrierf(float x) { @@ -1818,46 +1823,6 @@ double CDECL pow( double x, double y ) return pow_exp(x, y, ehi, elo, sign_bias); } -/********************************************************************* - * sin (NTDLL.@) - * - * Copied from musl: src/math/sin.c - */ -double CDECL sin( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - /* |x| ~< pi/4 */ - if (ix <= 0x3fe921fb) { - if (ix < 0x3e500000) { /* |x| < 2**-26 */ - /* raise inexact if x != 0 and underflow if subnormal*/ - fp_barrier(ix < 0x00100000 ? x/0x1p120f : x+0x1p120f); - return x; - } - return __sin(x, 0.0, 0); - } - - /* sin(Inf or NaN) is NaN */ - if (isinf(x)) - return x - x; - if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction needed */ - n = __rem_pio2(x, y); - switch (n&3) { - case 0: return __sin(y[0], y[1], 1); - case 1: return __cos(y[0], y[1]); - case 2: return -__sin(y[0], y[1], 1); - default: return -__cos(y[0], y[1]); - } -} - /********************************************************************* * sqrt (NTDLL.@) *

1 0

Conor McCarthy : vkd3d-shader/ir: Normalise control point phase output registers to include the control point id.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: vkd3d Branch: master Commit: 14295a224d9fe2e487bf3a67f4f2fc5218e1b17c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/14295a224d9fe2e487bf3a67f4f2f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 4 17:55:05 2023 +1000 vkd3d-shader/ir: Normalise control point phase output registers to include the control point id. In SPIR-V the address must include the invocation id, but in TPF it is implicit. Move the register index up one slot and insert an OUTPOINTID relative address. --- libs/vkd3d-shader/ir.c | 101 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 32 +++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 + 3 files changed, 111 insertions(+), 25 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/ir: Insert hull shader control point input declarations if no control point phase is defined.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: vkd3d Branch: master Commit: 98b5e2c6e01199d714d18fccfe54826a680aecbf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98b5e2c6e01199d714d18fccfe548… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 4 17:28:48 2023 +1000 vkd3d-shader/ir: Insert hull shader control point input declarations if no control point phase is defined. The SPIR-V backend will emit a default control point phase. Inserting inputs into the IR allows handling of declarations via the usual path instead of an ad hoc implementation which may not match later changes to input handling. --- libs/vkd3d-shader/ir.c | 86 ++++++++++++++- libs/vkd3d-shader/spirv.c | 178 +++---------------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 11 +- 3 files changed, 112 insertions(+), 163 deletions(-)

1 0

Davide Beatrici : wineoss: Use mmdevdrv structs from mmdevapi.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: bdabe6a47b9e56a6cb2e770187d9962a74ed222c URL: https://gitlab.winehq.org/wine/wine/-/commit/bdabe6a47b9e56a6cb2e770187d996… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Apr 11 09:00:25 2023 +0200 wineoss: Use mmdevdrv structs from mmdevapi. --- dlls/wineoss.drv/mmdevdrv.c | 89 +++++++-------------------------------------- 1 file changed, 13 insertions(+), 76 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 166f9408416..631f4571aa7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -44,6 +44,8 @@ #include "unixlib.h" +#include "../mmdevapi/mmdevdrv.h" + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -51,71 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; -struct ACImpl; -typedef struct ACImpl ACImpl; - -typedef struct _AudioSession { - GUID guid; - struct list clients; - - IMMDevice *device; - - float master_vol; - UINT32 channel_count; - float *channel_vols; - BOOL mute; - - struct list entry; -} AudioSession; - -typedef struct _AudioSessionWrapper { - IAudioSessionControl2 IAudioSessionControl2_iface; - IChannelAudioVolume IChannelAudioVolume_iface; - ISimpleAudioVolume ISimpleAudioVolume_iface; - - LONG ref; - - ACImpl *client; - AudioSession *session; -} AudioSessionWrapper; - -struct ACImpl { - IAudioClient3 IAudioClient3_iface; - IAudioRenderClient IAudioRenderClient_iface; - IAudioCaptureClient IAudioCaptureClient_iface; - IAudioClock IAudioClock_iface; - IAudioClock2 IAudioClock2_iface; - IAudioStreamVolume IAudioStreamVolume_iface; - - LONG ref; - - IMMDevice *parent; - IUnknown *pUnkFTMarshal; - - EDataFlow dataflow; - float *vols; - UINT32 channel_count; - stream_handle stream; - - HANDLE timer_thread; - - AudioSession *session; - AudioSessionWrapper *session_wrapper; - - struct list entry; - - /* Keep at end */ - char devnode[0]; -}; - -typedef struct _SessionMgr { - IAudioSessionManager2 IAudioSessionManager2_iface; - - LONG ref; - - IMMDevice *device; -} SessionMgr; - typedef struct _OSSDevice { struct list entry; EDataFlow flow; @@ -252,7 +189,7 @@ static HRESULT stream_release(stream_handle stream, HANDLE timer_thread) static DWORD WINAPI timer_thread(void *user) { struct timer_loop_params params; - struct ACImpl *This = user; + ACImpl *This = user; params.stream = This->stream; OSS_CALL(timer_loop, &params); @@ -447,18 +384,18 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, return AUDCLNT_E_DEVICE_INVALIDATED; } len = strlen(oss_dev->devnode); - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, devnode[len + 1])); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, device_name[len + 1])); if(!This) return E_OUTOFMEMORY; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->marshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; } This->dataflow = oss_dev->flow; - strcpy(This->devnode, oss_dev->devnode); + strcpy(This->device_name, oss_dev->devnode); This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; @@ -491,7 +428,7 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface, IsEqualIID(riid, &IID_IAudioClient3)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -519,7 +456,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if(!ref){ IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); - IUnknown_Release(This->pUnkFTMarshal); + IUnknown_Release(This->marshal); if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); @@ -711,7 +648,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } params.name = NULL; - params.device = This->devnode; + params.device = This->device_name; params.flow = This->dataflow; params.share = mode; params.flags = flags; @@ -831,7 +768,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); if(fmt) dump_fmt(fmt); - params.device = This->devnode; + params.device = This->device_name; params.flow = This->dataflow; params.share = mode; params.fmt_in = fmt; @@ -864,7 +801,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - params.device = This->devnode; + params.device = This->device_name; params.flow = This->dataflow; params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); if(!params.fmt) @@ -1193,7 +1130,7 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( IsEqualIID(riid, &IID_IAudioRenderClient)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -1274,7 +1211,7 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( IsEqualIID(riid, &IID_IAudioCaptureClient)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK;

1 0

Davide Beatrici : winepulse: Use mmdevdrv structs from mmdevapi.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 1546ef3015999ee27066b317773050a5641c2023 URL: https://gitlab.winehq.org/wine/wine/-/commit/1546ef3015999ee27066b317773050… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Apr 11 09:01:46 2023 +0200 winepulse: Use mmdevdrv structs from mmdevapi. --- dlls/winepulse.drv/mmdevdrv.c | 183 ++++++++++++++---------------------------- 1 file changed, 62 insertions(+), 121 deletions(-)

1 0

Davide Beatrici : winecoreaudio: Use mmdevdrv structs from mmdevapi.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 854066a589a834a635dd065b3e484b9cb679bd69 URL: https://gitlab.winehq.org/wine/wine/-/commit/854066a589a834a635dd065b3e484b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Apr 11 08:58:56 2023 +0200 winecoreaudio: Use mmdevdrv structs from mmdevapi. --- dlls/winecoreaudio.drv/mmdevdrv.c | 84 +++++---------------------------------- 1 file changed, 11 insertions(+), 73 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 97492440535..2fea175df63 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -42,6 +42,8 @@ #include "audiopolicy.h" #include "unixlib.h" +#include "../mmdevapi/mmdevdrv.h" + WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -49,62 +51,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; -struct ACImpl; -typedef struct ACImpl ACImpl; - -typedef struct _AudioSession { - GUID guid; - struct list clients; - - IMMDevice *device; - - float master_vol; - UINT32 channel_count; - float *channel_vols; - BOOL mute; - - struct list entry; -} AudioSession; - -typedef struct _AudioSessionWrapper { - IAudioSessionControl2 IAudioSessionControl2_iface; - IChannelAudioVolume IChannelAudioVolume_iface; - ISimpleAudioVolume ISimpleAudioVolume_iface; - - LONG ref; - - ACImpl *client; - AudioSession *session; -} AudioSessionWrapper; - -struct ACImpl { - IAudioClient3 IAudioClient3_iface; - IAudioRenderClient IAudioRenderClient_iface; - IAudioCaptureClient IAudioCaptureClient_iface; - IAudioClock IAudioClock_iface; - IAudioClock2 IAudioClock2_iface; - IAudioStreamVolume IAudioStreamVolume_iface; - - LONG ref; - - IMMDevice *parent; - IUnknown *pUnkFTMarshal; - - EDataFlow dataflow; - UINT32 channel_count; - float *vols; - - HANDLE timer; - - AudioSession *session; - AudioSessionWrapper *session_wrapper; - - stream_handle stream; - struct list entry; - - char device_name[1]; -}; - static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -116,14 +62,6 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static const IAudioSessionManager2Vtbl AudioSessionManager2_Vtbl; -typedef struct _SessionMgr { - IAudioSessionManager2 IAudioSessionManager2_iface; - - LONG ref; - - IMMDevice *device; -} SessionMgr; - static WCHAR drv_key_devicesW[256]; static CRITICAL_SECTION g_sessions_lock; @@ -457,7 +395,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; memcpy(This->device_name, name, name_len + 1); - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->marshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; @@ -487,7 +425,7 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface, IsEqualIID(riid, &IID_IAudioClient3)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); @@ -516,7 +454,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if(This->stream){ struct release_stream_params params; params.stream = This->stream; - params.timer_thread = This->timer; + params.timer_thread = This->timer_thread; UNIX_CALL(release_stream, &params); This->stream = 0; @@ -526,7 +464,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); IMMDevice_Release(This->parent); - IUnknown_Release(This->pUnkFTMarshal); + IUnknown_Release(This->marshal); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -929,9 +867,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(FAILED(hr = params.result)) return hr; - if(!This->timer) { - This->timer = CreateThread(NULL, 0, ca_timer_thread, This, 0, NULL); - SetThreadPriority(This->timer, THREAD_PRIORITY_TIME_CRITICAL); + if(!This->timer_thread) { + This->timer_thread = CreateThread(NULL, 0, ca_timer_thread, This, 0, NULL); + SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } return S_OK; @@ -1200,7 +1138,7 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( IsEqualIID(riid, &IID_IAudioRenderClient)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); @@ -1279,7 +1217,7 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( IsEqualIID(riid, &IID_IAudioCaptureClient)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv);

1 0

Davide Beatrici : winealsa: Move common mmdevdrv structs into mmdevapi.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: d67a211cb1dc620d090c3b1635cf2d4e045bc576 URL: https://gitlab.winehq.org/wine/wine/-/commit/d67a211cb1dc620d090c3b1635cf2d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Apr 11 08:57:18 2023 +0200 winealsa: Move common mmdevdrv structs into mmdevapi. --- dlls/mmdevapi/mmdevdrv.h | 79 +++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 89 +++++++------------------------------------- 2 files changed, 92 insertions(+), 76 deletions(-) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h new file mode 100644 index 00000000000..f184f3cecc9 --- /dev/null +++ b/dlls/mmdevapi/mmdevdrv.h @@ -0,0 +1,79 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +typedef struct audio_client ACImpl; + +typedef struct audio_session { + GUID guid; + struct list clients; + + IMMDevice *device; + + float master_vol; + UINT32 channel_count; + float *channel_vols; + BOOL mute; + + struct list entry; +} AudioSession; + +typedef struct audio_session_wrapper { + IAudioSessionControl2 IAudioSessionControl2_iface; + IChannelAudioVolume IChannelAudioVolume_iface; + ISimpleAudioVolume ISimpleAudioVolume_iface; + + LONG ref; + + struct audio_client *client; + struct audio_session *session; +} AudioSessionWrapper; + +typedef struct session_mgr { + IAudioSessionManager2 IAudioSessionManager2_iface; + + LONG ref; + + IMMDevice *device; +} SessionMgr; + +struct audio_client { + IAudioClient3 IAudioClient3_iface; + IAudioRenderClient IAudioRenderClient_iface; + IAudioCaptureClient IAudioCaptureClient_iface; + IAudioClock IAudioClock_iface; + IAudioClock2 IAudioClock2_iface; + IAudioStreamVolume IAudioStreamVolume_iface; + + LONG ref; + + IMMDevice *parent; + IUnknown *marshal; + + EDataFlow dataflow; + float *vols; + UINT32 channel_count; + stream_handle stream; + + HANDLE timer_thread; + + struct audio_session *session; + struct audio_session_wrapper *session_wrapper; + + struct list entry; + + /* Keep at end */ + char device_name[0]; +}; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 96a0a62d72e..09123a64311 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -47,6 +47,8 @@ #include "unixlib.h" +#include "../mmdevapi/mmdevdrv.h" + WINE_DEFAULT_DEBUG_CHANNEL(alsa); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -54,71 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; -struct ACImpl; -typedef struct ACImpl ACImpl; - -typedef struct _AudioSession { - GUID guid; - struct list clients; - - IMMDevice *device; - - float master_vol; - UINT32 channel_count; - float *channel_vols; - BOOL mute; - - struct list entry; -} AudioSession; - -typedef struct _AudioSessionWrapper { - IAudioSessionControl2 IAudioSessionControl2_iface; - IChannelAudioVolume IChannelAudioVolume_iface; - ISimpleAudioVolume ISimpleAudioVolume_iface; - - LONG ref; - - ACImpl *client; - AudioSession *session; -} AudioSessionWrapper; - -struct ACImpl { - IAudioClient3 IAudioClient3_iface; - IAudioRenderClient IAudioRenderClient_iface; - IAudioCaptureClient IAudioCaptureClient_iface; - IAudioClock IAudioClock_iface; - IAudioClock2 IAudioClock2_iface; - IAudioStreamVolume IAudioStreamVolume_iface; - - LONG ref; - - IMMDevice *parent; - IUnknown *pUnkFTMarshal; - - EDataFlow dataflow; - float *vols; - UINT32 channel_count; - stream_handle stream; - - HANDLE timer_thread; - - AudioSession *session; - AudioSessionWrapper *session_wrapper; - - struct list entry; - - /* Keep at end */ - char alsa_name[1]; -}; - -typedef struct _SessionMgr { - IAudioSessionManager2 IAudioSessionManager2_iface; - - LONG ref; - - IMMDevice *device; -} SessionMgr; - static CRITICAL_SECTION g_sessions_lock; static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = { @@ -239,7 +176,7 @@ static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread) static DWORD WINAPI alsa_timer_thread(void *user) { struct timer_loop_params params; - struct ACImpl *This = user; + ACImpl *This = user; SetThreadDescription(GetCurrentThread(), L"winealsa_timer"); @@ -474,7 +411,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_UNEXPECTED; len = strlen(alsa_name); - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, alsa_name[len + 1])); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, device_name[len + 1])); if(!This) return E_OUTOFMEMORY; @@ -485,14 +422,14 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioClock2_iface.lpVtbl = &AudioClock2_Vtbl; This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->marshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; } This->dataflow = dataflow; - memcpy(This->alsa_name, alsa_name, len + 1); + memcpy(This->device_name, alsa_name, len + 1); This->parent = dev; IMMDevice_AddRef(This->parent); @@ -518,7 +455,7 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface, IsEqualIID(riid, &IID_IAudioClient3)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); @@ -547,7 +484,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if(!ref){ IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); - IUnknown_Release(This->pUnkFTMarshal); + IUnknown_Release(This->marshal); if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); @@ -745,7 +682,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, dump_fmt(fmt); params.name = NULL; - params.device = This->alsa_name; + params.device = This->device_name; params.flow = This->dataflow; params.share = mode; params.flags = flags; @@ -870,7 +807,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out); if(fmt) dump_fmt(fmt); - params.device = This->alsa_name; + params.device = This->device_name; params.flow = This->dataflow; params.share = mode; params.fmt_in = fmt; @@ -903,7 +840,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - params.device = This->alsa_name; + params.device = This->device_name; params.flow = This->dataflow; params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); if(!params.fmt) @@ -1236,7 +1173,7 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( IsEqualIID(riid, &IID_IAudioRenderClient)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); @@ -1319,7 +1256,7 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( IsEqualIID(riid, &IID_IAudioCaptureClient)) *ppv = iface; else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + return IUnknown_QueryInterface(This->marshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv);

1 0

Piotr Caban : gdi32: Support stock brush in EMR_FRAMERGN.
by Alexandre Julliard April 11, 2023

April 11, 2023

Module: wine Branch: master Commit: 061dc3a4805c2fe5591d83abfdaf57d32451883f URL: https://gitlab.winehq.org/wine/wine/-/commit/061dc3a4805c2fe5591d83abfdaf57… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 11 17:14:51 2023 +0200 gdi32: Support stock brush in EMR_FRAMERGN. --- dlls/gdi32/enhmetafile.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 51f3a306094..bab0d5739cc 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2200,11 +2200,8 @@ BOOL WINAPI PlayEnhMetaFileRecord( { const EMRFRAMERGN *pFrameRgn = (const EMRFRAMERGN *)mr; HRGN hRgn = ExtCreateRegion(NULL, pFrameRgn->cbRgnData, (const RGNDATA *)pFrameRgn->RgnData); - FrameRgn(hdc, - hRgn, - (handletable->objectHandle)[pFrameRgn->ihBrush], - pFrameRgn->szlStroke.cx, - pFrameRgn->szlStroke.cy); + FrameRgn(hdc, hRgn, get_object_handle(handletable, pFrameRgn->ihBrush), + pFrameRgn->szlStroke.cx, pFrameRgn->szlStroke.cy); DeleteObject(hRgn); break; }

1 0