wine-devel

wine-devel@winehq.org

84463 discussions

[PATCH 2/4] win32u: Move clipboard data management from user32.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/clipboard.c | 292 ++++++----------------------------- dlls/user32/edit.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 16 ++ dlls/user32/user_private.h | 2 + dlls/win32u/clipboard.c | 302 +++++++++++++++++++++++++++++++++++-- dlls/win32u/sysparams.c | 4 - include/ntuser.h | 25 ++- 8 files changed, 383 insertions(+), 262 deletions(-)

2 1

[PATCH 1/4] win32u: Add more clipboard stubs.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/clipboard.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 4 ++++ dlls/win32u/win32u.spec | 8 ++++---- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/wrappers.c | 24 ++++++++++++++++++++++++ include/ntuser.h | 14 ++++++++++++++ 6 files changed, 87 insertions(+), 4 deletions(-)

2 1

[PATCH 6/6] winecoreaudio: Implement Wow64 midi entry points in the Unix libraray.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 8 +- dlls/winecoreaudio.drv/coremidi.c | 367 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 7 + 3 files changed, 378 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index fb36298ba57..8fe568e52b5 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1966,11 +1966,11 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_get_frequency, is_started, wow64_set_volumes, - midi_init, + wow64_midi_init, midi_release, - midi_out_message, - midi_in_message, - midi_notify_wait, + wow64_midi_out_message, + wow64_midi_in_message, + wow64_midi_notify_wait, }; #endif /* _WIN64 */ diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ba3b7096b7f..998b8f1bd46 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -1222,3 +1222,370 @@ NTSTATUS midi_notify_wait(void *args) return STATUS_SUCCESS; } + +#ifdef _WIN64 + +typedef UINT PTR32; + +NTSTATUS wow64_midi_init(void *args) +{ + struct + { + PTR32 err; + } *params32 = args; + struct midi_init_params params = + { + .err = ULongToPtr(params32->err) + }; + return midi_init(&params); +} + +struct notify_context32 +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + UINT param_1; + UINT param_2; + UINT callback; + UINT flags; + PTR32 device; + UINT instance; +}; + +static void notify_to_notify32(struct notify_context32 *notify32, + const struct notify_context *notify) +{ + notify32->send_notify = notify->send_notify; + notify32->dev_id = notify->dev_id; + notify32->msg = notify->msg; + notify32->param_1 = notify->param_1; + notify32->param_2 = notify->param_2; + notify32->callback = notify->callback; + notify32->flags = notify->flags; + notify32->device = PtrToUlong(notify->device); + notify32->instance = notify->instance; +} + +struct midi_open_desc32 +{ + PTR32 hMidi; + UINT dwCallback; + UINT dwInstance; + UINT dnDevNode; + UINT cIds; + MIDIOPENSTRMID rgIds; +}; + +struct midi_hdr32 +{ + PTR32 lpData; + UINT dwBufferLength; + UINT dwBytesRecorded; + UINT dwUser; + UINT dwFlags; + PTR32 lpNext; + UINT reserved; + UINT dwOffset; + UINT dwReserved[8]; +}; + +static UINT wow64_midi_out_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static UINT wow64_midi_out_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + +NTSTATUS wow64_midi_out_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_open_desc32 *desc32; + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIOPENDESC open_desc; + MIDIHDR hdr; + struct midi_out_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + .notify = &notify + }; + notify32->send_notify = FALSE; + + switch (params32->msg) + { + case MODM_OPEN: + desc32 = ULongToPtr(params32->param_1); + + open_desc.hMidi = ULongToPtr(desc32->hMidi); + open_desc.dwCallback = desc32->dwCallback; + open_desc.dwInstance = desc32->dwInstance; + open_desc.dnDevNode = desc32->dnDevNode; + open_desc.cIds = desc32->cIds; + open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID; + open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID; + + params.param_1 = (UINT_PTR)&open_desc; + break; + + case MODM_LONGDATA: + hdr32 = ULongToPtr(params32->param_1); + + memset(&hdr, 0, sizeof(hdr)); + hdr.lpData = ULongToPtr(hdr32->lpData); + hdr.dwBufferLength = hdr32->dwBufferLength; + hdr.dwFlags = hdr32->dwFlags; + + params.param_1 = (UINT_PTR)&hdr; + params.param_2 = sizeof(hdr); + break; + + case MODM_PREPARE: /* prepare and unprepare are easier to handle explicitly */ + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_out_prepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + + case MODM_UNPREPARE: + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_out_unprepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + } + + midi_out_message(&params); + + switch (params32->msg) + { + case MODM_LONGDATA: + hdr32 = ULongToPtr(params32->param_1); + + hdr32->dwFlags = hdr.dwFlags; + break; + } + + if (notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MOM_DONE) + notify32->param_1 = params32->param_1; /* restore the 32-bit hdr */ + } + return STATUS_SUCCESS; +} + +static UINT wow64_midi_in_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + + return MMSYSERR_NOERROR; +} + +static UINT wow64_midi_in_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + + return MMSYSERR_NOERROR; +} + +NTSTATUS wow64_midi_in_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_open_desc32 *desc32; + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIOPENDESC open_desc; + MIDIHDR *hdr = NULL; + struct midi_in_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + .notify = &notify + }; + notify32->send_notify = FALSE; + + switch (params32->msg) + { + case MIDM_OPEN: + desc32 = ULongToPtr(params32->param_1); + + open_desc.hMidi = ULongToPtr(desc32->hMidi); + open_desc.dwCallback = desc32->dwCallback; + open_desc.dwInstance = desc32->dwInstance; + open_desc.dnDevNode = desc32->dnDevNode; + open_desc.cIds = desc32->cIds; + open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID; + open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID; + + params.param_1 = (UINT_PTR)&open_desc; + break; + + case MIDM_ADDBUFFER: + hdr32 = ULongToPtr(params32->param_1); + + hdr = calloc(1, sizeof(*hdr)); + hdr->lpData = ULongToPtr(hdr32->lpData); + hdr->dwBufferLength = hdr32->dwBufferLength; + hdr->dwFlags = hdr32->dwFlags; + hdr->dwReserved[7] = params32->param_1; /* keep hdr32 for MIM_LONGDATA notification */ + + params.param_1 = (UINT_PTR)hdr; + params.param_2 = sizeof(*hdr); + break; + + case MIDM_PREPARE: /* prepare and unprepare are easier to handle explicitly */ + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_in_prepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + + case MIDM_UNPREPARE: + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_in_unprepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + } + + midi_in_message(&params); + + switch (params32->msg) + { + case MIDM_ADDBUFFER: + hdr32 = ULongToPtr(params32->param_1); + + if (!*params.err) + { + hdr32->dwFlags = hdr->dwFlags; + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->lpNext = 0; + } + else + free(hdr); + break; + } + + if (notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MIM_LONGDATA) + { + hdr = (MIDIHDR *)notify.param_1; + notify32->param_1 = hdr->dwReserved[7]; + hdr32 = ULongToPtr(notify32->param_1); + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->dwFlags = hdr->dwFlags; + free(hdr); + } + } + return STATUS_SUCCESS; +} + +NTSTATUS wow64_midi_notify_wait(void *args) +{ + struct + { + PTR32 quit; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIHDR *hdr; + struct midi_notify_wait_params params = + { + .quit = ULongToPtr(params32->quit), + .notify = &notify + }; + notify32->send_notify = FALSE; + + midi_notify_wait(&params); + + if (!*params.quit && notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MIM_LONGDATA) + { + hdr = (MIDIHDR *)notify.param_1; + notify32->param_1 = hdr->dwReserved[7]; + hdr32 = ULongToPtr(notify32->param_1); + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->dwFlags = hdr->dwFlags; + free(hdr); + } + } + return STATUS_SUCCESS; +} + +#endif /* _WIN64 */ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 56b75a55b4c..d92dbb5e33f 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -264,6 +264,13 @@ NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait( void * ) DECLSPEC_HIDDEN; +#ifdef _WIN64 +NTSTATUS wow64_midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +#endif + extern unixlib_handle_t coreaudio_handle; #define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, unix_ ## func, params ) -- 2.23.0

2 1

[PATCH 5/6] winecoreaudio: Implement Wow64 mmdevapi entry points in the Unix libraray.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 313 +++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 463a330eeda..fb36298ba57 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1661,3 +1661,316 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_in_message, midi_notify_wait, }; + +#ifdef _WIN64 + +typedef UINT PTR32; + +static NTSTATUS wow64_get_endpoint_ids(void *args) +{ + struct + { + EDataFlow flow; + PTR32 endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; + } *params32 = args; + struct get_endpoint_ids_params params = + { + .flow = params32->flow, + .endpoints = ULongToPtr(params32->endpoints), + .size = params32->size + }; + get_endpoint_ids(&params); + params32->size = params.size; + params32->result = params.result; + params32->num = params.num; + params32->default_idx = params.default_idx; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_create_stream(void *args) +{ + struct + { + DWORD dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + REFERENCE_TIME duration; + REFERENCE_TIME period; + PTR32 fmt; + HRESULT result; + PTR32 stream; + } *params32 = args; + struct create_stream_params params = + { + .dev_id = params32->dev_id, + .flow = params32->flow, + .share = params32->share, + .duration = params32->duration, + .period = params32->period, + .fmt = ULongToPtr(params32->fmt), + .stream = ULongToPtr(params32->stream) + }; + create_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_render_buffer(void *args) +{ + struct + { + stream_handle stream; + UINT32 frames; + HRESULT result; + PTR32 data; + } *params32 = args; + BYTE *data = NULL; + struct get_render_buffer_params params = + { + .stream = params32->stream, + .frames = params32->frames, + .data = &data + }; + get_render_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_capture_buffer(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 data; + PTR32 frames; + PTR32 flags; + PTR32 devpos; + PTR32 qpcpos; + } *params32 = args; + BYTE *data = NULL; + struct get_capture_buffer_params params = + { + .stream = params32->stream, + .data = &data, + .frames = ULongToPtr(params32->frames), + .flags = ULongToPtr(params32->flags), + .devpos = ULongToPtr(params32->devpos), + .qpcpos = ULongToPtr(params32->qpcpos) + }; + get_capture_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +}; + +static NTSTATUS wow64_is_format_supported(void *args) +{ + struct + { + EDataFlow flow; + DWORD dev_id; + AUDCLNT_SHAREMODE share; + PTR32 fmt_in; + PTR32 fmt_out; + HRESULT result; + } *params32 = args; + struct is_format_supported_params params = + { + .flow = params32->flow, + .dev_id = params32->dev_id, + .share = params32->share, + .fmt_in = ULongToPtr(params32->fmt_in), + .fmt_out = ULongToPtr(params32->fmt_out) + }; + is_format_supported(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_mix_format(void *args) +{ + struct + { + EDataFlow flow; + DWORD dev_id; + PTR32 fmt; + HRESULT result; + } *params32 = args; + struct get_mix_format_params params = + { + .flow = params32->flow, + .dev_id = params32->dev_id, + .fmt = ULongToPtr(params32->fmt) + }; + get_mix_format(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_buffer_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_buffer_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + get_buffer_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_latency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 latency; + } *params32 = args; + struct get_latency_params params = + { + .stream = params32->stream, + .latency = ULongToPtr(params32->latency) + }; + get_latency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_current_padding(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 padding; + } *params32 = args; + struct get_current_padding_params params = + { + .stream = params32->stream, + .padding = ULongToPtr(params32->padding) + }; + get_current_padding(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_next_packet_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_next_packet_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + get_next_packet_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_position(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 pos; + PTR32 qpctime; + } *params32 = args; + struct get_position_params params = + { + .stream = params32->stream, + .pos = ULongToPtr(params32->pos), + .qpctime = ULongToPtr(params32->qpctime) + }; + get_position(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_frequency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 freq; + } *params32 = args; + struct get_frequency_params params = + { + .stream = params32->stream, + .freq = ULongToPtr(params32->freq) + }; + get_frequency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_set_volumes(void *args) +{ + struct + { + stream_handle stream; + float master_volume; + PTR32 volumes; + PTR32 session_volumes; + int channel; + } *params32 = args; + struct set_volumes_params params = + { + .stream = params32->stream, + .master_volume = params32->master_volume, + .volumes = ULongToPtr(params32->volumes), + .session_volumes = ULongToPtr(params32->session_volumes), + .channel = params32->channel + }; + return set_volumes(&params); +} + +unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_get_endpoint_ids, + wow64_create_stream, + release_stream, + start, + stop, + reset, + wow64_get_render_buffer, + release_render_buffer, + wow64_get_capture_buffer, + release_capture_buffer, + wow64_get_mix_format, + wow64_is_format_supported, + wow64_get_buffer_size, + wow64_get_latency, + wow64_get_current_padding, + wow64_get_next_packet_size, + wow64_get_position, + wow64_get_frequency, + is_started, + wow64_set_volumes, + midi_init, + midi_release, + midi_out_message, + midi_in_message, + midi_notify_wait, +}; + +#endif /* _WIN64 */ -- 2.23.0

2 1

[PATCH 4/6] winecoreaudio: Limit Wow64 buffer allocations to 32-bit addresses.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 955b7d2afaf..463a330eeda 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -615,6 +615,15 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni return S_OK; } +static ULONG_PTR zero_bits(void) +{ +#ifdef _WIN64 + return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; +#else + return 0; +#endif +} + static NTSTATUS create_stream(void *args) { struct create_stream_params *params = args; @@ -685,8 +694,8 @@ static NTSTATUS create_stream(void *args) } size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; } @@ -1371,7 +1380,7 @@ static NTSTATUS get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = params->frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; @@ -1469,7 +1478,7 @@ static NTSTATUS get_capture_buffer(void *args) chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ size = stream->period_frames * stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; -- 2.23.0

2 1

[PATCH 3/6] winecoreaudio: Return offsets rather than ptrs to the strings.
by Huw Davies 25 Apr '22

25 Apr '22

This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 14 +++++++------- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++++-- dlls/winecoreaudio.drv/unixlib.h | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 901c58e5276..955b7d2afaf 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -185,7 +185,7 @@ static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) static NTSTATUS get_endpoint_ids(void *args) { struct get_endpoint_ids_params *params = args; - unsigned int num_devices, i, needed; + unsigned int num_devices, i, needed, offset; AudioDeviceID *devices, default_id; AudioObjectPropertyAddress addr; struct endpoint *endpoint; @@ -196,7 +196,7 @@ static NTSTATUS get_endpoint_ids(void *args) AudioDeviceID id; } *info; OSStatus sc; - WCHAR *ptr; + UniChar *ptr; params->num = 0; params->default_idx = 0; @@ -262,21 +262,21 @@ static NTSTATUS get_endpoint_ids(void *args) } free(devices); - needed = sizeof(*endpoint) * params->num; + offset = needed = sizeof(*endpoint) * params->num; endpoint = params->endpoints; - ptr = (WCHAR *)(endpoint + params->num); for(i = 0; i < params->num; i++){ SIZE_T len = CFStringGetLength(info[i].name); needed += (len + 1) * sizeof(WCHAR); if(needed <= params->size){ - endpoint->name = ptr; - CFStringGetCharacters(info[i].name, CFRangeMake(0, len), (UniChar*)endpoint->name); + endpoint->name = offset; + ptr = (UniChar *)((char *)params->endpoints + offset); + CFStringGetCharacters(info[i].name, CFRangeMake(0, len), ptr); ptr[len] = 0; endpoint->id = info[i].id; endpoint++; - ptr += len + 1; + offset += (len + 1) * sizeof(WCHAR); } CFRelease(info[i].name); if(info[i].id == default_id) params->default_idx = i; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cc7b2e5bf49..acdc0891a11 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -341,13 +341,15 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, } for(i = 0; i < params.num; i++){ - int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + int size = (wcslen(name) + 1) * sizeof(WCHAR); + ids[i] = heap_alloc(size); if(!ids[i]){ params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], params.endpoints[i].name, size); + memcpy(ids[i], name, size); get_device_guid(flow, params.endpoints[i].id, guids + i); } *def_index = params.default_idx; diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 19b14c7f968..56b75a55b4c 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -23,7 +23,7 @@ typedef UINT64 stream_handle; struct endpoint { - WCHAR *name; + unsigned int name; DWORD id; }; -- 2.23.0

2 1

[PATCH 2/6] winecoreaudio: Use UINT64 handles to represent the stream.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 39 +++++++++++++++++------------- dlls/winecoreaudio.drv/mmdevdrv.c | 4 +-- dlls/winecoreaudio.drv/unixlib.h | 36 +++++++++++++-------------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5892a0e44f4..901c58e5276 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -107,6 +107,11 @@ static HRESULT osstatus_to_hresult(OSStatus sc) return E_FAIL; } +static struct coreaudio_stream *handle_get_stream(stream_handle h) +{ + return (struct coreaudio_stream *)(UINT_PTR)h; +} + /* copied from kernelbase */ static int muldiv( int a, int b, int c ) { @@ -700,7 +705,7 @@ end: free(stream->fmt); free(stream); } else - *params->stream = stream; + *params->stream = (stream_handle)(UINT_PTR)stream; return STATUS_SUCCESS; } @@ -708,7 +713,7 @@ end: static NTSTATUS release_stream( void *args ) { struct release_stream_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); SIZE_T size; if(stream->unit){ @@ -1148,7 +1153,7 @@ static void capture_resample(struct coreaudio_stream *stream) static NTSTATUS get_buffer_size(void *args) { struct get_buffer_size_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); *params->frames = stream->bufsize_frames; @@ -1212,7 +1217,7 @@ static HRESULT ca_get_max_stream_latency(struct coreaudio_stream *stream, UInt32 static NTSTATUS get_latency(void *args) { struct get_latency_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); UInt32 latency, stream_latency, size; AudioObjectPropertyAddress addr; OSStatus sc; @@ -1258,7 +1263,7 @@ static UINT32 get_current_padding_nolock(struct coreaudio_stream *stream) static NTSTATUS get_current_padding(void *args) { struct get_current_padding_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); *params->padding = get_current_padding_nolock(stream); @@ -1270,7 +1275,7 @@ static NTSTATUS get_current_padding(void *args) static NTSTATUS start(void *args) { struct start_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1289,7 +1294,7 @@ static NTSTATUS start(void *args) static NTSTATUS stop(void *args) { struct stop_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1308,7 +1313,7 @@ static NTSTATUS stop(void *args) static NTSTATUS reset(void *args) { struct reset_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1336,7 +1341,7 @@ static NTSTATUS reset(void *args) static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); SIZE_T size; UINT32 pad; @@ -1393,7 +1398,7 @@ end: static NTSTATUS release_render_buffer(void *args) { struct release_render_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); BYTE *buffer; OSSpinLockLock(&stream->lock); @@ -1437,7 +1442,7 @@ static NTSTATUS release_render_buffer(void *args) static NTSTATUS get_capture_buffer(void *args) { struct get_capture_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); UINT32 chunk_bytes, chunk_frames; LARGE_INTEGER stamp, freq; SIZE_T size; @@ -1493,7 +1498,7 @@ end: static NTSTATUS release_capture_buffer(void *args) { struct release_capture_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1521,7 +1526,7 @@ static NTSTATUS release_capture_buffer(void *args) static NTSTATUS get_next_packet_size(void *args) { struct get_next_packet_size_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1541,7 +1546,7 @@ static NTSTATUS get_next_packet_size(void *args) static NTSTATUS get_position(void *args) { struct get_position_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); LARGE_INTEGER stamp, freq; OSSpinLockLock(&stream->lock); @@ -1565,7 +1570,7 @@ static NTSTATUS get_position(void *args) static NTSTATUS get_frequency(void *args) { struct get_frequency_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); if(stream->share == AUDCLNT_SHAREMODE_SHARED) *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; @@ -1579,7 +1584,7 @@ static NTSTATUS get_frequency(void *args) static NTSTATUS is_started(void *args) { struct is_started_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); if(stream->playing) params->result = S_OK; @@ -1592,7 +1597,7 @@ static NTSTATUS is_started(void *args) static NTSTATUS set_volumes(void *args) { struct set_volumes_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); Float32 level = 1.0, tmp; OSStatus sc; UINT32 i; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2ba4e7ee028..cc7b2e5bf49 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -103,7 +103,7 @@ struct ACImpl { AudioSession *session; AudioSessionWrapper *session_wrapper; - struct coreaudio_stream *stream; + stream_handle stream; struct list entry; }; @@ -666,7 +666,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct release_stream_params release_params; struct create_stream_params params; - struct coreaudio_stream *stream; + stream_handle stream; UINT32 i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e48670ab2f0..19b14c7f968 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -19,7 +19,7 @@ */ #include "mmddk.h" -struct coreaudio_stream; +typedef UINT64 stream_handle; struct endpoint { @@ -46,36 +46,36 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; - struct coreaudio_stream **stream; + stream_handle *stream; }; struct release_stream_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct start_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct stop_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct reset_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct get_render_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; UINT32 frames; HRESULT result; BYTE **data; @@ -83,7 +83,7 @@ struct get_render_buffer_params struct release_render_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; UINT32 frames; DWORD flags; HRESULT result; @@ -91,7 +91,7 @@ struct release_render_buffer_params struct get_capture_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; BYTE **data; UINT32 *frames; @@ -102,7 +102,7 @@ struct get_capture_buffer_params struct release_capture_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; UINT32 done; HRESULT result; }; @@ -127,35 +127,35 @@ struct is_format_supported_params struct get_buffer_size_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_latency_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; REFERENCE_TIME *latency; }; struct get_current_padding_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT32 *padding; }; struct get_next_packet_size_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_position_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT64 *pos; UINT64 *qpctime; @@ -163,20 +163,20 @@ struct get_position_params struct get_frequency_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT64 *freq; }; struct is_started_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct set_volumes_params { - struct coreaudio_stream *stream; + stream_handle stream; float master_volume; const float *volumes; const float *session_volumes; -- 2.23.0

2 1

[PATCH 4/4] wineoss: Move MODM_RESET to the unixlib.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 47 -------------------------------------- dlls/wineoss.drv/ossmidi.c | 43 +++++++++++++++++++++++++++++++--- dlls/wineoss.drv/unixlib.h | 14 ------------ 3 files changed, 40 insertions(+), 64 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 8c3a2405b0f..470e8e4403d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -64,13 +64,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static WINE_MIDIIN *MidiInDev; -static WINE_MIDIOUT *MidiOutDev; - -/* this is the total number of MIDI out devices found (synth and port) */ -static int MODM_NumDevs = 0; -/* this is the number of FM synthesizers (index from 0 to NUMFMSYNTHDEVS - 1) */ -static int MODM_NumFMSynthDevs = 0; -/* the Midi ports have index from NUMFMSYNTHDEVS to NumDevs - 1 */ /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; @@ -119,9 +112,6 @@ static LRESULT OSS_MidiInit(void) if (!err) { MidiInDev = params.srcs; - MidiOutDev = params.dests; - MODM_NumDevs = params.num_dests; - MODM_NumFMSynthDevs = params.num_synths; MIDM_NumDevs = params.num_srcs; } return err; @@ -140,10 +130,6 @@ static LRESULT OSS_MidiExit(void) return 1; MidiInDev = NULL; - MidiOutDev = NULL; - - MODM_NumDevs = 0; - MODM_NumFMSynthDevs = 0; MIDM_NumDevs = 0; return 0; @@ -646,37 +632,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/*-----------------------------------------------------------------------*/ - -DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - -/************************************************************************** - * modReset [internal] - */ -static DWORD modReset(WORD wDevID) -{ - unsigned chn; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ - for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - OSS_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CTL_CHANGE | chn, 0); - /* remove sustain on all channels */ - OSS_modMessage(wDevID, MODM_DATA, 0, (CTL_SUSTAIN << 8) | MIDI_CTL_CHANGE | chn, 0); - } - /* FIXME: the LongData buffers must also be returned to the app */ - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -742,8 +697,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_RESET: - return modReset(wDevID); } params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 4b419c2716c..ba3017a5ad7 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -48,6 +48,17 @@ #include "unixlib.h" +struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ + MIDIOUTCAPSW caps; + int fd; +}; + static unsigned int num_dests, num_srcs, num_synths, seq_refs; static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; @@ -381,10 +392,7 @@ wrapup: *params->err = 0; params->num_srcs = num_srcs; - params->num_dests = num_dests; - params->num_synths = num_synths; params->srcs = srcs; - params->dests = dests; return STATUS_SUCCESS; } @@ -1065,6 +1073,32 @@ static UINT midi_out_get_volume(WORD dev_id, UINT *volume) return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; } +static UINT midi_out_reset(WORD dev_id) +{ + struct midi_dest *dest; + unsigned chn; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + /* stop all notes */ + /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that + * it's channel dependent... + */ + for (chn = 0; chn < 16; chn++) + { + /* turn off every note */ + midi_out_data(dev_id, 0x7800 | MIDI_CTL_CHANGE | chn); + /* remove sustain on all channels */ + midi_out_data(dev_id, (CTL_SUSTAIN << 8) | MIDI_CTL_CHANGE | chn); + } + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1108,6 +1142,9 @@ NTSTATUS midi_out_message(void *args) case MODM_SETVOLUME: *params->err = 0; break; + case MODM_RESET: + *params->err = midi_out_reset(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index d56e11b8d23..183f5017d04 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -225,24 +225,10 @@ typedef struct midi_src int fd; } WINE_MIDIIN; -typedef struct midi_dest -{ - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIHDR *lpQueueHdr; - void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ - MIDIOUTCAPSW caps; - int fd; -} WINE_MIDIOUT; - struct midi_init_params { UINT *err; - unsigned int num_dests; unsigned int num_srcs; - unsigned int num_synths; - struct midi_dest *dests; struct midi_src *srcs; }; -- 2.25.1

2 1

[PATCH 3/4] wineoss: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 15 --------------- dlls/wineoss.drv/ossmidi.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index cc8fc54568c..8c3a2405b0f 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -648,17 +648,6 @@ static DWORD midStop(WORD wDevID) /*-----------------------------------------------------------------------*/ -/************************************************************************** - * modGetVolume [internal] - */ -static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) -{ - if (!lpdwVolume) return MMSYSERR_INVALPARAM; - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - *lpdwVolume = 0xFFFFFFFF; - return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; -} - DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); @@ -753,10 +742,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_GETVOLUME: - return modGetVolume(wDevID, (DWORD*)dwParam1); - case MODM_SETVOLUME: - return 0; case MODM_RESET: return modReset(wDevID); } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index f307a54b81f..4b419c2716c 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1056,6 +1056,14 @@ static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_volume(WORD dev_id, UINT *volume) +{ + if (!volume) return MMSYSERR_INVALPARAM; + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + + *volume = 0xFFFFFFFF; + return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} NTSTATUS midi_out_message(void *args) { @@ -1094,6 +1102,12 @@ NTSTATUS midi_out_message(void *args) case MODM_GETNUMDEVS: *params->err = num_dests; break; + case MODM_GETVOLUME: + *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1); + break; + case MODM_SETVOLUME: + *params->err = 0; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

[PATCH 2/4] wineoss: Move MODM_GETNUMDEVS to the unixlib.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 2 -- dlls/wineoss.drv/ossmidi.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index cda733b9ca3..cc8fc54568c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -753,8 +753,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_GETNUMDEVS: - return MODM_NumDevs; case MODM_GETVOLUME: return modGetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index d9b2bbe7c92..f307a54b81f 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1091,6 +1091,9 @@ NTSTATUS midi_out_message(void *args) case MODM_GETDEVCAPS: *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); break; + case MODM_GETNUMDEVS: + *params->err = num_dests; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel