June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Claire (＠ClearlyClaire)

On Thu Jun 30 13:27:07 2022 +0000, Andrew Eikum wrote: > Can you just set to `override` here instead of calling > `find_product_name_override` twice? Sure, that was my intent! -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3047

June 30, 2022

Re: [PATCH v3 0/2] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Andrew Eikum (＠aeikum)

On Thu Jun 30 13:49:45 2022 +0000, Andrew Eikum wrote: > Current version (1e8b1b3195c832aafa4e6c2ab37d6d5b24e7b317) is failing to build: > ``` > /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c: In function ‘pulse_get_device_settings’: > /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c:750:26: error: > ‘PhysDevice’ {aka ‘struct _PhysDevice’} has no member named ‘fmt’ > 750 | params->fmt = dev->fmt; > | ^~ > /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c:751:33: error: > ‘PhysDevice’ {aka ‘struct _PhysDevice’} has no member named ‘def_period’ > 751 | params->def_period = dev->def_period; > | ^~ > /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c:752:33: error: > ‘PhysDevice’ {aka ‘struct _PhysDevice’} has no member named ‘min_period’ > 752 | params->min_period = dev->min_period; > | ^~ > make[1]: *** [Makefile:231696: dlls/winepulse.drv/pulse.o] Error 1 > ``` Woops, my mistake. Missed the first commit. Still getting used to this gitlab thing :) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_3045

June 30, 2022

Re: [PATCH v3 0/2] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Andrew Eikum (＠aeikum)

Current version (1e8b1b3195c832aafa4e6c2ab37d6d5b24e7b317) is failing to build: ``` /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c: In function ‘pulse_get_device_settings’: /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c:750:26: error: ‘PhysDevice’ {aka ‘struct _PhysDevice’} has no member named ‘fmt’ 750 | params->fmt = dev->fmt; | ^~ /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c:751:33: error: ‘PhysDevice’ {aka ‘struct _PhysDevice’} has no member named ‘def_period’ 751 | params->def_period = dev->def_period; | ^~ /home/aeikum/src/wine/dlls/winepulse.drv/pulse.c:752:33: error: ‘PhysDevice’ {aka ‘struct _PhysDevice’} has no member named ‘min_period’ 752 | params->min_period = dev->min_period; | ^~ make[1]: *** [Makefile:231696: dlls/winepulse.drv/pulse.o] Error 1 ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_3044

June 30, 2022

[PATCH 1/1] include: Define atomic read/write helpers for 32-bit integers.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Based on the corresponding functions from Windows SDK header files. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 50f6452b145..29dcb149fe8 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6528,6 +6528,61 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __i386__ */ +/* Since Visual Studio 2012, volatile accesses do not always imply acquire and + * release semantics. We explicitly use ISO volatile semantics, manually + * placing barriers as appropriate. + */ +#if _MSC_VER >= 1700 +#pragma intrinsic(__iso_volatile_load32) +#pragma intrinsic(__iso_volatile_store32) +#define __WINE_LOAD32_NO_FENCE(src) (__iso_volatile_load32(src)) +#define __WINE_STORE32_NO_FENCE(dest, value) (__iso_volatile_store32(dest, value)) +#else /* _MSC_VER >= 1700 */ +#define __WINE_LOAD32_NO_FENCE(src) (*(src)) +#define __WINE_STORE32_NO_FENCE(dest, value) ((void)(*(dest) = (value))) +#endif /* _MSC_VER >= 1700 */ + +#if defined(__i386__) || defined(__x86_64__) +#pragma intrinsic(_ReadWriteBarrier) +void _ReadWriteBarrier(void); +#endif /* defined(__i386__) || defined(__x86_64__) */ + +static void __wine_memory_barrier_acq_rel(void) +{ +#if defined(__i386__) || defined(__x86_64__) +#pragma warning(suppress:4996) + _ReadWriteBarrier(); +#elif defined(__arm__) + __dmb(_ARM_BARRIER_ISH); +#elif defined(__aarch64__) + __dmb(_ARM64_BARRIER_ISH); +#endif /* defined(__i386__) || defined(__x86_64__) */ +} + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = __WINE_LOAD32_NO_FENCE( (int const volatile *)src ); + __wine_memory_barrier_acq_rel(); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = __WINE_LOAD32_NO_FENCE( (int const volatile *)src ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __wine_memory_barrier_acq_rel(); + __WINE_STORE32_NO_FENCE( (int volatile *)dest, value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_STORE32_NO_FENCE( (int volatile *)dest, value ); +} + #elif defined(__GNUC__) static FORCEINLINE BOOLEAN WINAPI BitScanForward(DWORD *index, DWORD mask) @@ -6671,6 +6726,43 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +#if defined(__x86_64__) || defined(__i386__) +/* On x86, Support old GCC with either no or buggy (GCC BZ#81316) __atomic_* support */ +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) do { *(ret) = *(ptr); __asm__ __volatile__( "" ::: "memory" ); } while (0) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) do { *(ret) = *(ptr); } while (0) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) do { __asm__ __volatile__( "" ::: "memory" ); *(ptr) = *(val); } while (0) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) do { *(ptr) = *(val); } while (0) +#else +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_ACQUIRE) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_RELAXED) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELEASE) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELAXED) +#endif /* defined(__x86_64__) || defined(__i386__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_ACQUIRE( src, &value ); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_RELAXED( src, &value ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELEASE( dest, &value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELAXED( dest, &value ); +} + static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) { #if defined(__x86_64__) || defined(__i386__) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/351

June 30, 2022

[PATCH 0/1] MR351: include: Define atomic read/write helpers for 32-bit integers.

by Jinoh Kang (＠iamahuman)

Based on the corresponding functions from Windows SDK header files. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/351

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Also this introduces some warnings: ``` /home/aeikum/src/wine/dlls/mmdevapi/devenum.c: In function ‘MMDevice_Create’: /home/aeikum/src/wine/dlls/mmdevapi/devenum.c:356:35: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 356 | if ((override = find_product_name_override(pv2.pwszVal)) != NULL) | ^ /home/aeikum/src/wine/dlls/mmdevapi/devenum.c:357:36: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 357 | pv.pwszVal = find_product_name_override(pv2.pwszVal); | ^ ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3043

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Thanks, this is looking good. Just a couple more nitpicks. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3042

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Andrew Eikum (@aeikum) commented about dlls/mmdevapi/devenum.c: > > pv.vt = VT_LPWSTR; > pv.pwszVal = name; > + > + if (SUCCEEDED(set_driver_prop_value(id, flow, &devicepath_key))) { > + PROPVARIANT pv2; > + > + PropVariantInit(&pv2); > + > + if (SUCCEEDED(MMDevice_GetPropValue(id, flow, &devicepath_key, &pv2)) && pv2.vt == VT_LPWSTR) { > + WCHAR *override; > + if ((override = find_product_name_override(pv2.pwszVal)) != NULL) > + pv.pwszVal = find_product_name_override(pv2.pwszVal); Can you just set to `override` here instead of calling `find_product_name_override` twice? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3041

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Andrew Eikum (@aeikum) commented about dlls/mmdevapi/devenum.c: > > pv.vt = VT_LPWSTR; > pv.pwszVal = name; > + > + if (SUCCEEDED(set_driver_prop_value(id, flow, &devicepath_key))) { > + PROPVARIANT pv2; > + > + PropVariantInit(&pv2); > + > + if (SUCCEEDED(MMDevice_GetPropValue(id, flow, &devicepath_key, &pv2)) && pv2.vt == VT_LPWSTR) { This isn't a blocker, but it feels a little silly to get the value in `set_driver_prop_value` and then get it again here. You could change the `set_driver_prop_value` API to (optionally?) pass back the value it gets to the caller, who would then free it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3040

June 30, 2022

Re: [PATCH v4 0/1] MR320: riched20/tests: Test for ITextDocument::Undo and ITextDocument::Redo (#53289).

by Jinoh Kang (＠iamahuman)

v3: Remove the state transition table and fold it into the action function. Also note: the full patch that implements Undo/Redo after !320 and !326 is at https://testbot.winehq.org/GetFile.pl?JobKey=117985&StepKey=1 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/320#note_3038

June 30, 2022