September 2022 - Wine-commits

Davide Beatrici : winecoreaudio: Fix RegEnumKeyExW() call passing wrong unit for the buffer size.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 93d3ecb90f00093b5c6a834cb407666f05ba3d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/93d3ecb90f00093b5c6a834cb40766… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 16 10:25:41 2022 +0200 winecoreaudio: Fix RegEnumKeyExW() call passing wrong unit for the buffer size. The function takes the number of (wide) characters in input, not bytes. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index da6c05bdc1f..69b61781058 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -388,7 +388,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) DWORD size, type; GUID reg_guid; - key_name_size = sizeof(key_name); + key_name_size = ARRAY_SIZE(key_name); if(RegEnumKeyExW(devices_key, i++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break;

1 0

Davide Beatrici : winecoreaudio: Switch to string as device identifier, to match other drivers.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 013f662c050148e9ce25357ac8b2695254e58d88 URL: https://gitlab.winehq.org/wine/wine/-/commit/013f662c050148e9ce25357ac8b269… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 16 06:38:06 2022 +0200 winecoreaudio: Switch to string as device identifier, to match other drivers. --- dlls/winecoreaudio.drv/coreaudio.c | 52 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 35 +++++++++++++------------ dlls/winecoreaudio.drv/unixlib.h | 8 +++--- 3 files changed, 55 insertions(+), 40 deletions(-)

1 0

Davide Beatrici : mmdevapi: Integrate winecoreaudio's additions in unixlib.h.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 2fa22538a582b9e4ed40272d5b511c6ddebdf6b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fa22538a582b9e4ed40272d5b511c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 22:06:18 2022 +0200 mmdevapi: Integrate winecoreaudio's additions in unixlib.h. The data type for "done" was accidentally changed in e29dc33aebf4e1d4e30fd158b69338331edd3f65. BOOL is basically the same as UINT32, but it should only be used for flags. BOOLEAN would be better for that though, as it's single-byte. --- dlls/mmdevapi/unixlib.h | 13 ++++++++++--- dlls/winealsa.drv/alsa.c | 12 ++++++++---- dlls/winealsa.drv/alsamidi.c | 6 +++--- dlls/winealsa.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/oss.c | 12 ++++++++---- dlls/wineoss.drv/ossmidi.c | 6 +++--- dlls/winepulse.drv/mmdevdrv.c | 3 ++- dlls/winepulse.drv/pulse.c | 12 ++++++++---- 9 files changed, 46 insertions(+), 24 deletions(-)

1 0

Davide Beatrici : winecoreaudio: Drop "unix_" prefix in unixlib enum, apply it to the functions instead.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: bc404b6c9c93a80e9a6e2ddd607a8fe276fc12dc URL: https://gitlab.winehq.org/wine/wine/-/commit/bc404b6c9c93a80e9a6e2ddd607a8f… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 07:15:36 2022 +0200 winecoreaudio: Drop "unix_" prefix in unixlib enum, apply it to the functions instead. --- dlls/winecoreaudio.drv/coreaudio.c | 194 ++++++++++++++++++------------------- dlls/winecoreaudio.drv/coremidi.c | 26 ++--- dlls/winecoreaudio.drv/unixlib.h | 70 ++++++------- 3 files changed, 145 insertions(+), 145 deletions(-)

1 0

Davide Beatrici : winecoreaudio: Adapt "create_stream_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: de9da9bcdb8873a5582e1ae85d81a4880f0ccc5d URL: https://gitlab.winehq.org/wine/wine/-/commit/de9da9bcdb8873a5582e1ae85d81a4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 08:41:43 2022 +0200 winecoreaudio: Adapt "create_stream_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/coreaudio.c | 6 ++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 3 +++ dlls/winecoreaudio.drv/unixlib.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e3e697dad88..4f469b582ce 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1707,23 +1707,29 @@ static NTSTATUS unix_wow64_create_stream(void *args) { struct { + PTR32 name; PTR32 device; EDataFlow flow; AUDCLNT_SHAREMODE share; + DWORD flags; REFERENCE_TIME duration; REFERENCE_TIME period; PTR32 fmt; HRESULT result; + PTR32 channel_count; PTR32 stream; } *params32 = args; struct create_stream_params params = { + .name = ULongToPtr(params32->name), .device = ULongToPtr(params32->device), .flow = params32->flow, .share = params32->share, + .flags = params32->flags, .duration = params32->duration, .period = params32->period, .fmt = ULongToPtr(params32->fmt), + .channel_count = ULongToPtr(params32->channel_count), .stream = ULongToPtr(params32->stream) }; unix_create_stream(&params); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2d061db4e1b..79d617650f4 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -734,12 +734,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } + params.name = NULL; params.device = This->device_name; params.flow = This->dataflow; params.share = mode; + params.flags = flags; params.duration = duration; params.period = period; params.fmt = fmt; + params.channel_count = NULL; params.stream = &stream; UNIX_CALL(create_stream, &params); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index a01999daffd..2c22eef5cc4 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -39,13 +39,16 @@ struct get_endpoint_ids_params struct create_stream_params { + const char *name; const char *device; EDataFlow flow; AUDCLNT_SHAREMODE share; + DWORD flags; REFERENCE_TIME duration; REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; + UINT32 *channel_count; stream_handle *stream; };

1 0

Davide Beatrici : winecoreaudio: Adapt "release_stream_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 9a30a71e3b1a76f5aa877410bc13d6d59f627a62 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a30a71e3b1a76f5aa877410bc13d6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 08:53:16 2022 +0200 winecoreaudio: Adapt "release_stream_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/coreaudio.c | 20 +++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 1 + dlls/winecoreaudio.drv/unixlib.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 4f469b582ce..25e74cc2712 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1737,6 +1737,24 @@ static NTSTATUS unix_wow64_create_stream(void *args) return STATUS_SUCCESS; } +static NTSTATUS unix_wow64_release_stream(void *args) +{ + struct + { + stream_handle stream; + PTR32 timer_thread; + HRESULT result; + } *params32 = args; + struct release_stream_params params = + { + .stream = params32->stream, + .timer_thread = ULongToHandle(params32->timer_thread) + }; + unix_release_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + static NTSTATUS unix_wow64_get_render_buffer(void *args) { struct @@ -1966,7 +1984,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_wow64_get_endpoint_ids, unix_wow64_create_stream, - unix_release_stream, + unix_wow64_release_stream, unix_start, unix_stop, unix_reset, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 79d617650f4..c6a31d2480b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -535,6 +535,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } if(This->stream){ params.stream = This->stream; + params.timer_thread = NULL; UNIX_CALL(release_stream, &params); } if(This->session){ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 2c22eef5cc4..50e224e4c26 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -55,6 +55,7 @@ struct create_stream_params struct release_stream_params { stream_handle stream; + HANDLE timer_thread; HRESULT result; };

1 0

Davide Beatrici : winecoreaudio: Adapt "release_render_buffer_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 0987d1b002003e88a28ac221a76671e5d6faa995 URL: https://gitlab.winehq.org/wine/wine/-/commit/0987d1b002003e88a28ac221a76671… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 09:16:20 2022 +0200 winecoreaudio: Adapt "release_render_buffer_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/coreaudio.c | 14 +++++++------- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/unixlib.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 25e74cc2712..bfc637958bb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1424,12 +1424,12 @@ static NTSTATUS unix_release_render_buffer(void *args) OSSpinLockLock(&stream->lock); - if(!params->frames){ + if(!params->written_frames){ stream->getbuf_last = 0; params->result = S_OK; }else if(!stream->getbuf_last) params->result = AUDCLNT_E_OUT_OF_ORDER; - else if(params->frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + else if(params->written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) params->result = AUDCLNT_E_INVALID_SIZE; else{ if(stream->getbuf_last >= 0) @@ -1438,18 +1438,18 @@ static NTSTATUS unix_release_render_buffer(void *args) buffer = stream->tmp_buffer; if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, params->frames); + silence_buffer(stream, buffer, params->written_frames); if(stream->getbuf_last < 0) ca_wrap_buffer(stream->local_buffer, stream->wri_offs_frames * stream->fmt->nBlockAlign, stream->bufsize_frames * stream->fmt->nBlockAlign, - buffer, params->frames * stream->fmt->nBlockAlign); + buffer, params->written_frames * stream->fmt->nBlockAlign); - stream->wri_offs_frames += params->frames; + stream->wri_offs_frames += params->written_frames; stream->wri_offs_frames %= stream->bufsize_frames; - stream->held_frames += params->frames; - stream->written_frames += params->frames; + stream->held_frames += params->written_frames; + stream->written_frames += params->written_frames; stream->getbuf_last = 0; params->result = S_OK; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c6a31d2480b..03250a61cf7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1285,7 +1285,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("(%p)->(%u, %lx)\n", This, frames, flags); params.stream = This->stream; - params.frames = frames; + params.written_frames = frames; params.flags = flags; UNIX_CALL(release_render_buffer, &params); return params.result; diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 50e224e4c26..603796e9510 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -88,8 +88,8 @@ struct get_render_buffer_params struct release_render_buffer_params { stream_handle stream; - UINT32 frames; - DWORD flags; + UINT32 written_frames; + UINT flags; HRESULT result; };

1 0

Davide Beatrici : winecoreaudio: Adapt "get_capture_buffer_params" struct to mmdevapi's.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: af1257f741cb2f18423e869f46677983842c1dd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/af1257f741cb2f18423e869f466779… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 09:21:17 2022 +0200 winecoreaudio: Adapt "get_capture_buffer_params" struct to mmdevapi's. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/unixlib.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 03250a61cf7..8902356d1e0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1357,7 +1357,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT *)flags; params.devpos = devpos; params.qpcpos = qpcpos; UNIX_CALL(get_capture_buffer, &params); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 603796e9510..b91f90496d5 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -99,7 +99,7 @@ struct get_capture_buffer_params HRESULT result; BYTE **data; UINT32 *frames; - DWORD *flags; + UINT *flags; UINT64 *devpos; UINT64 *qpcpos; };

1 0

Davide Beatrici : winecoreaudio: Switch to mmdevapi's unixlib.h.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 8537b722026def587fb899451acf4ae4e76503b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8537b722026def587fb899451acf4a… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Sep 9 11:37:47 2022 +0200 winecoreaudio: Switch to mmdevapi's unixlib.h. --- dlls/winecoreaudio.drv/coreaudio.c | 30 ++++- dlls/winecoreaudio.drv/mmdevdrv.c | 8 -- dlls/winecoreaudio.drv/unixlib.h | 244 +------------------------------------ 3 files changed, 25 insertions(+), 257 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index bfc637958bb..b48a0c751fd 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1647,31 +1647,40 @@ static NTSTATUS unix_set_volumes(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { + NULL, + NULL, + NULL, unix_get_endpoint_ids, unix_create_stream, unix_release_stream, unix_start, unix_stop, unix_reset, + NULL, unix_get_render_buffer, unix_release_render_buffer, unix_get_capture_buffer, unix_release_capture_buffer, - unix_get_mix_format, unix_is_format_supported, + unix_get_mix_format, + NULL, unix_get_buffer_size, unix_get_latency, unix_get_current_padding, unix_get_next_packet_size, - unix_get_position, unix_get_frequency, - unix_is_started, + unix_get_position, unix_set_volumes, + NULL, + NULL, + unix_is_started, + NULL, unix_midi_init, unix_midi_release, unix_midi_out_message, unix_midi_in_message, unix_midi_notify_wait, + NULL, }; #ifdef _WIN64 @@ -1982,31 +1991,40 @@ static NTSTATUS unix_wow64_set_volumes(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { + NULL, + NULL, + NULL, unix_wow64_get_endpoint_ids, unix_wow64_create_stream, unix_wow64_release_stream, unix_start, unix_stop, unix_reset, + NULL, unix_wow64_get_render_buffer, unix_release_render_buffer, unix_wow64_get_capture_buffer, unix_release_capture_buffer, - unix_wow64_get_mix_format, unix_wow64_is_format_supported, + unix_wow64_get_mix_format, + NULL, unix_wow64_get_buffer_size, unix_wow64_get_latency, unix_wow64_get_current_padding, unix_wow64_get_next_packet_size, - unix_wow64_get_position, unix_wow64_get_frequency, - unix_is_started, + unix_wow64_get_position, unix_wow64_set_volumes, + NULL, + NULL, + unix_is_started, + NULL, unix_wow64_midi_init, unix_midi_release, unix_wow64_midi_out_message, unix_wow64_midi_in_message, unix_wow64_midi_notify_wait, + NULL, }; #endif /* _WIN64 */ diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 8902356d1e0..5d8a9654a3a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -214,14 +214,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -/* From <dlls/mmdevapi/mmdevapi.h> */ -enum DriverPriority { - Priority_Unavailable = 0, - Priority_Low, - Priority_Neutral, - Priority_Preferred -}; - int WINAPI AUDDRV_GetPriority(void) { return Priority_Neutral; diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index b91f90496d5..caa352d2dfa 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -17,250 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "mmddk.h" -typedef UINT64 stream_handle; - -struct endpoint -{ - unsigned int name; - unsigned int device; -}; - -struct get_endpoint_ids_params -{ - EDataFlow flow; - struct endpoint *endpoints; - unsigned int size; - HRESULT result; - unsigned int num; - unsigned int default_idx; -}; - -struct create_stream_params -{ - const char *name; - const char *device; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - DWORD flags; - REFERENCE_TIME duration; - REFERENCE_TIME period; - const WAVEFORMATEX *fmt; - HRESULT result; - UINT32 *channel_count; - stream_handle *stream; -}; - -struct release_stream_params -{ - stream_handle stream; - HANDLE timer_thread; - HRESULT result; -}; - -struct start_params -{ - stream_handle stream; - HRESULT result; -}; - -struct stop_params -{ - stream_handle stream; - HRESULT result; -}; - -struct reset_params -{ - stream_handle stream; - HRESULT result; -}; - -struct get_render_buffer_params -{ - stream_handle stream; - UINT32 frames; - HRESULT result; - BYTE **data; -}; - -struct release_render_buffer_params -{ - stream_handle stream; - UINT32 written_frames; - UINT flags; - HRESULT result; -}; - -struct get_capture_buffer_params -{ - stream_handle stream; - HRESULT result; - BYTE **data; - UINT32 *frames; - UINT *flags; - UINT64 *devpos; - UINT64 *qpcpos; -}; - -struct release_capture_buffer_params -{ - stream_handle stream; - UINT32 done; - HRESULT result; -}; - -struct get_mix_format_params -{ - const char *device; - EDataFlow flow; - WAVEFORMATEXTENSIBLE *fmt; - HRESULT result; -}; - -struct is_format_supported_params -{ - const char *device; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - const WAVEFORMATEX *fmt_in; - WAVEFORMATEXTENSIBLE *fmt_out; - HRESULT result; -}; - -struct get_buffer_size_params -{ - stream_handle stream; - HRESULT result; - UINT32 *frames; -}; - -struct get_latency_params -{ - stream_handle stream; - HRESULT result; - REFERENCE_TIME *latency; -}; - -struct get_current_padding_params -{ - stream_handle stream; - HRESULT result; - UINT32 *padding; -}; - -struct get_next_packet_size_params -{ - stream_handle stream; - HRESULT result; - UINT32 *frames; -}; - -struct get_position_params -{ - stream_handle stream; - HRESULT result; - UINT64 *pos; - UINT64 *qpctime; -}; - -struct get_frequency_params -{ - stream_handle stream; - HRESULT result; - UINT64 *freq; -}; - -struct is_started_params -{ - stream_handle stream; - HRESULT result; -}; - -struct set_volumes_params -{ - stream_handle stream; - float master_volume; - const float *volumes; - const float *session_volumes; - int channel; -}; - -struct midi_init_params -{ - UINT *err; -}; - -struct notify_context -{ - BOOL send_notify; - WORD dev_id; - WORD msg; - UINT_PTR param_1; - UINT_PTR param_2; - UINT_PTR callback; - UINT flags; - HANDLE device; - UINT_PTR instance; -}; - -struct midi_out_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; - struct notify_context *notify; -}; - -struct midi_in_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; - struct notify_context *notify; -}; - -struct midi_notify_wait_params -{ - struct notify_context *notify; - BOOL *quit; -}; - -enum unix_funcs -{ - get_endpoint_ids, - create_stream, - release_stream, - start, - stop, - reset, - get_render_buffer, - release_render_buffer, - get_capture_buffer, - release_capture_buffer, - get_mix_format, - is_format_supported, - get_buffer_size, - get_latency, - get_current_padding, - get_next_packet_size, - get_position, - get_frequency, - is_started, - set_volumes, - midi_init, - midi_release, - midi_out_message, - midi_in_message, - midi_notify_wait, -}; +#include "../mmdevapi/unixlib.h" NTSTATUS unix_midi_init( void * ) DECLSPEC_HIDDEN; NTSTATUS unix_midi_release( void * ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ntdll: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 539ef7c462852cf9b528e9d7b8fc6999ed8d5f2d URL: https://gitlab.winehq.org/wine/wine/-/commit/539ef7c462852cf9b528e9d7b8fc69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 11 17:58:45 2022 -0500 ntdll: Avoid comparing the result of pointer arithmetic to zero. gcc warns about this: ../wine/dlls/ntdll/unix/virtual.c: In function ‘mmap_add_reserved_area’: ../wine/dlls/ntdll/unix/virtual.c:241:9: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘(char *)addr + (sizetype)size’ must not be NULL [-Werror=address] 241 | if (!((char *)addr + size)) size--; /* avoid wrap-around */ | ^ --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 96a5e095d16..e0aa410373e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -238,7 +238,7 @@ static void mmap_add_reserved_area( void *addr, SIZE_T size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ LIST_FOR_EACH( ptr, &reserved_areas ) { @@ -287,7 +287,7 @@ static void mmap_remove_reserved_area( void *addr, SIZE_T size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ ptr = list_head( &reserved_areas ); /* find the first area covering address */

1 0