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

[PATCH v2 2/4] winepulse: Return offsets rather than ptrs to the strings.
by Huw Davies April 21, 2022

April 21, 2022

This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 9 ++++++--- dlls/winepulse.drv/pulse.c | 17 ++++++++--------- dlls/winepulse.drv/unixlib.h | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4a0ee70ee92..18009435f1f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -457,13 +457,16 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **ke } for (i = 0; i < params.num; i++) { - unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + char *pulse_name = (char *)params.endpoints + params.endpoints[i].pulse_name; + unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size))) { params.result = E_OUTOFMEMORY; break; } - memcpy(ids[i], params.endpoints[i].name, size); - get_device_guid(drv_key, flow, params.endpoints[i].pulse_name, &guids[i]); + memcpy(ids[i], name, size); + get_device_guid(drv_key, flow, pulse_name, &guids[i]); } if (drv_key) RegCloseKey(drv_key); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 6312ac58ebc..06047a21944 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -253,12 +253,11 @@ static NTSTATUS pulse_get_endpoint_ids(void *args) struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; struct endpoint *endpoint = params->endpoints; DWORD len, name_len, needed; + unsigned int offset; PhysDevice *dev; - char *ptr; params->num = list_count(list); - needed = params->num * sizeof(*params->endpoints); - ptr = (char*)(endpoint + params->num); + offset = needed = params->num * sizeof(*params->endpoints); LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { name_len = lstrlenW(dev->name) + 1; @@ -266,12 +265,12 @@ static NTSTATUS pulse_get_endpoint_ids(void *args) needed += name_len * sizeof(WCHAR) + ((len + 1) & ~1); if (needed <= params->size) { - endpoint->name = (WCHAR*)ptr; - memcpy(endpoint->name, dev->name, name_len * sizeof(WCHAR)); - ptr += name_len * sizeof(WCHAR); - endpoint->pulse_name = ptr; - memcpy(endpoint->pulse_name, dev->pulse_name, len); - ptr += (len + 1) & ~1; + endpoint->name = offset; + memcpy((char *)params->endpoints + offset, dev->name, name_len * sizeof(WCHAR)); + offset += name_len * sizeof(WCHAR); + endpoint->pulse_name = offset; + memcpy((char *)params->endpoints + offset, dev->pulse_name, len); + offset += (len + 1) & ~1; endpoint++; } } diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 4780943c4eb..f224f26c909 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -41,8 +41,8 @@ struct pulse_config struct endpoint { - WCHAR *name; - char *pulse_name; + unsigned int name; + unsigned int pulse_name; }; struct main_loop_params -- 2.25.1

2 1

[PATCH v2 1/4] winepulse: Use UINT64 handles to represent the stream.
by Huw Davies April 21, 2022

April 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 8 +++--- dlls/winepulse.drv/pulse.c | 46 ++++++++++++++++++++--------------- dlls/winepulse.drv/unixlib.h | 40 +++++++++++++++--------------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7b5ef7cfe39..4a0ee70ee92 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -156,7 +156,7 @@ struct ACImpl { UINT32 channel_count; HANDLE timer; - struct pulse_stream *pulse_stream; + stream_handle pulse_stream; AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -228,7 +228,7 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void pulse_release_stream(struct pulse_stream *stream, HANDLE timer) +static void pulse_release_stream(stream_handle stream, HANDLE timer) { struct release_stream_params params; params.stream = stream; @@ -668,7 +668,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if (!ref) { if (This->pulse_stream) { pulse_release_stream(This->pulse_stream, This->timer); - This->pulse_stream = NULL; + This->pulse_stream = 0; EnterCriticalSection(&session_cs); list_remove(&This->entry); LeaveCriticalSection(&session_cs); @@ -822,7 +822,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; unsigned int i, channel_count; - struct pulse_stream *stream; + stream_handle stream; char *name; HRESULT hr; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 901e054f6d0..6312ac58ebc 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -131,6 +131,11 @@ static void pulse_broadcast(void) pthread_cond_broadcast(&pulse_cond); } +static struct pulse_stream *handle_get_stream(stream_handle h) +{ + return (struct pulse_stream *)(UINT_PTR)h; +} + static void dump_attr(const pa_buffer_attr *attr) { TRACE("maxlength: %u\n", attr->maxlength); @@ -1067,7 +1072,7 @@ static NTSTATUS pulse_create_stream(void *args) } *params->channel_count = stream->ss.channels; - *params->stream = stream; + *params->stream = (stream_handle)(UINT_PTR)stream; exit: if (FAILED(params->result = hr)) { @@ -1086,7 +1091,7 @@ exit: static NTSTATUS pulse_release_stream(void *args) { struct release_stream_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); SIZE_T size; if(params->timer) { @@ -1407,7 +1412,7 @@ static void pulse_read(struct pulse_stream *stream) static NTSTATUS pulse_timer_loop(void *args) { struct timer_loop_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); LARGE_INTEGER delay; pa_usec_t last_time; UINT32 adv_bytes; @@ -1515,7 +1520,7 @@ static NTSTATUS pulse_timer_loop(void *args) static NTSTATUS pulse_start(void *args) { struct start_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); int success; pa_operation *o; @@ -1571,7 +1576,7 @@ static NTSTATUS pulse_start(void *args) static NTSTATUS pulse_stop(void *args) { struct stop_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pa_operation *o; int success; @@ -1614,7 +1619,7 @@ static NTSTATUS pulse_stop(void *args) static NTSTATUS pulse_reset(void *args) { struct reset_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -1720,7 +1725,7 @@ static UINT32 pulse_capture_padding(struct pulse_stream *stream) static NTSTATUS pulse_get_render_buffer(void *args) { struct get_render_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); size_t bytes; UINT32 wri_offs_bytes; @@ -1799,7 +1804,7 @@ static void pulse_wrap_buffer(struct pulse_stream *stream, BYTE *buffer, UINT32 static NTSTATUS pulse_release_render_buffer(void *args) { struct release_render_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); UINT32 written_bytes; BYTE *buffer; @@ -1856,7 +1861,7 @@ static NTSTATUS pulse_release_render_buffer(void *args) static NTSTATUS pulse_get_capture_buffer(void *args) { struct get_capture_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); ACPacket *packet; pulse_lock(); @@ -1902,7 +1907,7 @@ static NTSTATUS pulse_get_capture_buffer(void *args) static NTSTATUS pulse_release_capture_buffer(void *args) { struct release_capture_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!stream->locked && params->done) @@ -1937,14 +1942,15 @@ static NTSTATUS pulse_release_capture_buffer(void *args) static NTSTATUS pulse_get_buffer_size(void *args) { struct get_buffer_size_params *params = args; + struct pulse_stream *stream = handle_get_stream(params->stream); params->result = S_OK; pulse_lock(); - if (!pulse_stream_valid(params->stream)) + if (!pulse_stream_valid(stream)) params->result = AUDCLNT_E_DEVICE_INVALIDATED; else - *params->size = params->stream->bufsize_frames; + *params->size = stream->bufsize_frames; pulse_unlock(); return STATUS_SUCCESS; @@ -1953,7 +1959,7 @@ static NTSTATUS pulse_get_buffer_size(void *args) static NTSTATUS pulse_get_latency(void *args) { struct get_latency_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); const pa_buffer_attr *attr; REFERENCE_TIME lat; @@ -1978,7 +1984,7 @@ static NTSTATUS pulse_get_latency(void *args) static NTSTATUS pulse_get_current_padding(void *args) { struct get_current_padding_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -2003,7 +2009,7 @@ static NTSTATUS pulse_get_current_padding(void *args) static NTSTATUS pulse_get_next_packet_size(void *args) { struct get_next_packet_size_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); pulse_capture_padding(stream); @@ -2020,7 +2026,7 @@ static NTSTATUS pulse_get_next_packet_size(void *args) static NTSTATUS pulse_get_frequency(void *args) { struct get_frequency_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -2041,7 +2047,7 @@ static NTSTATUS pulse_get_frequency(void *args) static NTSTATUS pulse_get_position(void *args) { struct get_position_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -2079,7 +2085,7 @@ static NTSTATUS pulse_get_position(void *args) static NTSTATUS pulse_set_volumes(void *args) { struct set_volumes_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); unsigned int i; for (i = 0; i < stream->ss.channels; i++) @@ -2091,7 +2097,7 @@ static NTSTATUS pulse_set_volumes(void *args) static NTSTATUS pulse_set_event_handle(void *args) { struct set_event_handle_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); HRESULT hr = S_OK; pulse_lock(); @@ -2112,7 +2118,7 @@ static NTSTATUS pulse_set_event_handle(void *args) static NTSTATUS pulse_is_started(void *args) { struct is_started_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); params->started = pulse_stream_valid(stream) && stream->started; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 9089e2829fc..4780943c4eb 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -21,7 +21,7 @@ #define MAX_PULSE_NAME_LEN 256 -struct pulse_stream; +typedef UINT64 stream_handle; enum phys_device_bus_type { phys_device_bus_invalid = -1, @@ -71,42 +71,42 @@ struct create_stream_params const WAVEFORMATEX *fmt; HRESULT result; UINT32 *channel_count; - struct pulse_stream **stream; + stream_handle *stream; }; struct release_stream_params { - struct pulse_stream *stream; + stream_handle stream; HANDLE timer; HRESULT result; }; struct start_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; }; struct stop_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; }; struct reset_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; }; struct timer_loop_params { - struct pulse_stream *stream; + stream_handle stream; }; struct get_render_buffer_params { - struct pulse_stream *stream; + stream_handle stream; UINT32 frames; HRESULT result; BYTE **data; @@ -114,7 +114,7 @@ struct get_render_buffer_params struct release_render_buffer_params { - struct pulse_stream *stream; + stream_handle stream; UINT32 written_frames; DWORD flags; HRESULT result; @@ -122,7 +122,7 @@ struct release_render_buffer_params struct get_capture_buffer_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; BYTE **data; UINT32 *frames; @@ -133,49 +133,49 @@ struct get_capture_buffer_params struct release_capture_buffer_params { - struct pulse_stream *stream; + stream_handle stream; BOOL done; HRESULT result; }; struct get_buffer_size_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; UINT32 *size; }; struct get_latency_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; REFERENCE_TIME *latency; }; struct get_current_padding_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; UINT32 *padding; }; struct get_next_packet_size_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_frequency_params { - struct pulse_stream *stream; + stream_handle stream; HRESULT result; UINT64 *freq; }; struct get_position_params { - struct pulse_stream *stream; + stream_handle stream; BOOL device; HRESULT result; UINT64 *pos; @@ -184,7 +184,7 @@ struct get_position_params struct set_volumes_params { - struct pulse_stream *stream; + stream_handle stream; float master_volume; const float *volumes; const float *session_volumes; @@ -192,7 +192,7 @@ struct set_volumes_params struct set_event_handle_params { - struct pulse_stream *stream; + stream_handle stream; HANDLE event; HRESULT result; }; @@ -206,7 +206,7 @@ struct test_connect_params struct is_started_params { - struct pulse_stream *stream; + stream_handle stream; BOOL started; }; -- 2.25.1

2 1

[PATCH 1/3] winepulse: Use handles to represent the stream.
by Huw Davies April 21, 2022

April 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 8 +-- dlls/winepulse.drv/pulse.c | 122 ++++++++++++++++++++++++++++------ dlls/winepulse.drv/unixlib.h | 40 ++++++----- 3 files changed, 125 insertions(+), 45 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 7b5ef7cfe39..96b8b28d1b5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -156,7 +156,7 @@ struct ACImpl { UINT32 channel_count; HANDLE timer; - struct pulse_stream *pulse_stream; + unsigned int pulse_stream; AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -228,7 +228,7 @@ static void pulse_call(enum unix_funcs code, void *params) assert(!status); } -static void pulse_release_stream(struct pulse_stream *stream, HANDLE timer) +static void pulse_release_stream(unsigned int stream, HANDLE timer) { struct release_stream_params params; params.stream = stream; @@ -668,7 +668,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if (!ref) { if (This->pulse_stream) { pulse_release_stream(This->pulse_stream, This->timer); - This->pulse_stream = NULL; + This->pulse_stream = 0; EnterCriticalSection(&session_cs); list_remove(&This->entry); LeaveCriticalSection(&session_cs); @@ -822,7 +822,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; unsigned int i, channel_count; - struct pulse_stream *stream; + unsigned int stream; char *name; HRESULT hr; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 901e054f6d0..5e3ddcc9b6e 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -108,6 +108,18 @@ static const REFERENCE_TIME DefaultPeriod = 100000; static pthread_mutex_t pulse_mutex; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; +struct stream_entry +{ + union + { + struct pulse_stream *stream; + unsigned int next_free; + }; +}; +static struct stream_entry *handles; +static unsigned int next_free = ~0u, next_unused, num_handles; +static pthread_mutex_t handle_lock = PTHREAD_MUTEX_INITIALIZER; + UINT8 mult_alaw_sample(UINT8, float); UINT8 mult_ulaw_sample(UINT8, float); @@ -131,6 +143,73 @@ static void pulse_broadcast(void) pthread_cond_broadcast(&pulse_cond); } +static unsigned int handle_alloc(struct pulse_stream *stream) +{ + unsigned int index, count; + struct stream_entry *new_handles; + + pthread_mutex_lock(&handle_lock); + + index = next_free; + if(index != ~0u) next_free = handles[index].next_free; + else if(next_unused < num_handles) index = next_unused++; + else{ + count = max(num_handles * 2, 256); + new_handles = realloc(handles, count); + if(!new_handles){ + pthread_mutex_unlock(&handle_lock); + return 0; + } + handles = new_handles; + num_handles = count; + index = next_unused++; + } + handles[index].stream = stream; + + pthread_mutex_unlock(&handle_lock); + + return index + 1; +} + +static struct stream_entry *handle_entry(unsigned int h) +{ + if(!h || h > num_handles){ + ERR("Invalid handle %08x\n", h); + return NULL; + } + return handles + h - 1; +} + +static void handle_free(unsigned int h) +{ + struct stream_entry *entry; + + pthread_mutex_lock(&handle_lock); + + entry = handle_entry(h); + if(entry){ + entry->next_free = next_free; + next_free = h - 1; + } + + pthread_mutex_unlock(&handle_lock); +} + +static struct pulse_stream *handle_get_stream(unsigned int h) +{ + struct stream_entry *entry; + struct pulse_stream *stream = NULL; + + pthread_mutex_lock(&handle_lock); + + entry = handle_entry(h); + if(entry) stream = entry->stream; + + pthread_mutex_unlock(&handle_lock); + + return stream; +} + static void dump_attr(const pa_buffer_attr *attr) { TRACE("maxlength: %u\n", attr->maxlength); @@ -1067,7 +1146,8 @@ static NTSTATUS pulse_create_stream(void *args) } *params->channel_count = stream->ss.channels; - *params->stream = stream; + *params->stream = handle_alloc(stream); + if (!*params->stream) params->result = E_OUTOFMEMORY; exit: if (FAILED(params->result = hr)) { @@ -1086,7 +1166,7 @@ exit: static NTSTATUS pulse_release_stream(void *args) { struct release_stream_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); SIZE_T size; if(params->timer) { @@ -1114,6 +1194,7 @@ static NTSTATUS pulse_release_stream(void *args) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); } + handle_free(params->stream); free(stream->peek_buffer); free(stream); return STATUS_SUCCESS; @@ -1407,7 +1488,7 @@ static void pulse_read(struct pulse_stream *stream) static NTSTATUS pulse_timer_loop(void *args) { struct timer_loop_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); LARGE_INTEGER delay; pa_usec_t last_time; UINT32 adv_bytes; @@ -1515,7 +1596,7 @@ static NTSTATUS pulse_timer_loop(void *args) static NTSTATUS pulse_start(void *args) { struct start_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); int success; pa_operation *o; @@ -1571,7 +1652,7 @@ static NTSTATUS pulse_start(void *args) static NTSTATUS pulse_stop(void *args) { struct stop_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pa_operation *o; int success; @@ -1614,7 +1695,7 @@ static NTSTATUS pulse_stop(void *args) static NTSTATUS pulse_reset(void *args) { struct reset_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -1720,7 +1801,7 @@ static UINT32 pulse_capture_padding(struct pulse_stream *stream) static NTSTATUS pulse_get_render_buffer(void *args) { struct get_render_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); size_t bytes; UINT32 wri_offs_bytes; @@ -1799,7 +1880,7 @@ static void pulse_wrap_buffer(struct pulse_stream *stream, BYTE *buffer, UINT32 static NTSTATUS pulse_release_render_buffer(void *args) { struct release_render_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); UINT32 written_bytes; BYTE *buffer; @@ -1856,7 +1937,7 @@ static NTSTATUS pulse_release_render_buffer(void *args) static NTSTATUS pulse_get_capture_buffer(void *args) { struct get_capture_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); ACPacket *packet; pulse_lock(); @@ -1902,7 +1983,7 @@ static NTSTATUS pulse_get_capture_buffer(void *args) static NTSTATUS pulse_release_capture_buffer(void *args) { struct release_capture_buffer_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!stream->locked && params->done) @@ -1937,14 +2018,15 @@ static NTSTATUS pulse_release_capture_buffer(void *args) static NTSTATUS pulse_get_buffer_size(void *args) { struct get_buffer_size_params *params = args; + struct pulse_stream *stream = handle_get_stream(params->stream); params->result = S_OK; pulse_lock(); - if (!pulse_stream_valid(params->stream)) + if (!pulse_stream_valid(stream)) params->result = AUDCLNT_E_DEVICE_INVALIDATED; else - *params->size = params->stream->bufsize_frames; + *params->size = stream->bufsize_frames; pulse_unlock(); return STATUS_SUCCESS; @@ -1953,7 +2035,7 @@ static NTSTATUS pulse_get_buffer_size(void *args) static NTSTATUS pulse_get_latency(void *args) { struct get_latency_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); const pa_buffer_attr *attr; REFERENCE_TIME lat; @@ -1978,7 +2060,7 @@ static NTSTATUS pulse_get_latency(void *args) static NTSTATUS pulse_get_current_padding(void *args) { struct get_current_padding_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -2003,7 +2085,7 @@ static NTSTATUS pulse_get_current_padding(void *args) static NTSTATUS pulse_get_next_packet_size(void *args) { struct get_next_packet_size_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); pulse_capture_padding(stream); @@ -2020,7 +2102,7 @@ static NTSTATUS pulse_get_next_packet_size(void *args) static NTSTATUS pulse_get_frequency(void *args) { struct get_frequency_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -2041,7 +2123,7 @@ static NTSTATUS pulse_get_frequency(void *args) static NTSTATUS pulse_get_position(void *args) { struct get_position_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); if (!pulse_stream_valid(stream)) @@ -2079,7 +2161,7 @@ static NTSTATUS pulse_get_position(void *args) static NTSTATUS pulse_set_volumes(void *args) { struct set_volumes_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); unsigned int i; for (i = 0; i < stream->ss.channels; i++) @@ -2091,7 +2173,7 @@ static NTSTATUS pulse_set_volumes(void *args) static NTSTATUS pulse_set_event_handle(void *args) { struct set_event_handle_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); HRESULT hr = S_OK; pulse_lock(); @@ -2112,7 +2194,7 @@ static NTSTATUS pulse_set_event_handle(void *args) static NTSTATUS pulse_is_started(void *args) { struct is_started_params *params = args; - struct pulse_stream *stream = params->stream; + struct pulse_stream *stream = handle_get_stream(params->stream); pulse_lock(); params->started = pulse_stream_valid(stream) && stream->started; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 9089e2829fc..e09362f0751 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -21,8 +21,6 @@ #define MAX_PULSE_NAME_LEN 256 -struct pulse_stream; - enum phys_device_bus_type { phys_device_bus_invalid = -1, phys_device_bus_pci, @@ -71,42 +69,42 @@ struct create_stream_params const WAVEFORMATEX *fmt; HRESULT result; UINT32 *channel_count; - struct pulse_stream **stream; + unsigned int *stream; }; struct release_stream_params { - struct pulse_stream *stream; + unsigned int stream; HANDLE timer; HRESULT result; }; struct start_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; }; struct stop_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; }; struct reset_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; }; struct timer_loop_params { - struct pulse_stream *stream; + unsigned int stream; }; struct get_render_buffer_params { - struct pulse_stream *stream; + unsigned int stream; UINT32 frames; HRESULT result; BYTE **data; @@ -114,7 +112,7 @@ struct get_render_buffer_params struct release_render_buffer_params { - struct pulse_stream *stream; + unsigned int stream; UINT32 written_frames; DWORD flags; HRESULT result; @@ -122,7 +120,7 @@ struct release_render_buffer_params struct get_capture_buffer_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; BYTE **data; UINT32 *frames; @@ -133,49 +131,49 @@ struct get_capture_buffer_params struct release_capture_buffer_params { - struct pulse_stream *stream; + unsigned int stream; BOOL done; HRESULT result; }; struct get_buffer_size_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; UINT32 *size; }; struct get_latency_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; REFERENCE_TIME *latency; }; struct get_current_padding_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; UINT32 *padding; }; struct get_next_packet_size_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; UINT32 *frames; }; struct get_frequency_params { - struct pulse_stream *stream; + unsigned int stream; HRESULT result; UINT64 *freq; }; struct get_position_params { - struct pulse_stream *stream; + unsigned int stream; BOOL device; HRESULT result; UINT64 *pos; @@ -184,7 +182,7 @@ struct get_position_params struct set_volumes_params { - struct pulse_stream *stream; + unsigned int stream; float master_volume; const float *volumes; const float *session_volumes; @@ -192,7 +190,7 @@ struct set_volumes_params struct set_event_handle_params { - struct pulse_stream *stream; + unsigned int stream; HANDLE event; HRESULT result; }; @@ -206,7 +204,7 @@ struct test_connect_params struct is_started_params { - struct pulse_stream *stream; + unsigned int stream; BOOL started; }; -- 2.25.1

2 2

[tools 1/2] testbot/cgi: Handle the timestamp formatting in ValueFormatter.
by Francois Gouget April 21, 2022

April 21, 2022

Also move the JavaScript code to a separate file so it does not have to be downloaded with every page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This can be tested on the Wine-devel page (it relies on the CollectionBlock for the formatting of the Received column). Later patches will extend datetime.js so other pages can use it too. --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 56 ++-------- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 101 ++++++++++++++++-- testbot/web/js/datetime.js | 42 ++++++++ 3 files changed, 148 insertions(+), 51 deletions(-) create mode 100644 testbot/web/js/datetime.js diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index e849d5a59..03f1d18cd 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -44,7 +44,6 @@ package ObjectModel::CGI::CollectionBlock; use Exporter 'import'; our @EXPORT = qw(new); -use POSIX qw(strftime); use URI::Escape; use ObjectModel::CGI::Table; @@ -291,18 +290,7 @@ sub GenerateDataView($$$) my $PropertyName = $PropertyDescriptor->GetName(); my $Value = $Row->{Item}->$PropertyName; - - if ($PropertyDescriptor->GetClass() eq "Basic" and - $PropertyDescriptor->GetType() eq "DT" and defined $Value) - { - print "<script type='text/javascript'></script><noscript><div>", - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)), - "</div></noscript>\n"; - return; - } - print defined $Value ? $self->escapeHTML($Value) : " "; + GenerateValueHTML($self, $PropertyDescriptor, $Value); } @@ -414,42 +402,20 @@ sub GenerateList($) my $Collection = $self->{Collection}; my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); - my $HasDT = !1; - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + + my $Items = $self->{Collection}->GetSortedItems(); + if (@$Items != 0) { - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "DT") + foreach my $PropertyDescriptor (@$PropertyDescriptors) { - $HasDT = 1; + if ($PropertyDescriptor->GetClass() eq "Basic" and + $PropertyDescriptor->GetType() eq "DT") + { + $self->{EnclosingPage}->GenerateImportJS(GetDateTimeJSFile()); + last; + } } } - if ($HasDT) - { - print <<"EOF"; -<script type='text/javascript'></script> -EOF - } print "<div class='CollectionBlock'>\n"; $self->GenerateFormStart(); diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index cad6eee1b..47236c748 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -22,8 +22,90 @@ use strict; package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; -our @EXPORT = qw(GenerateValueHTML); +our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateValueHTML); +use POSIX qw(strftime); + + +# +# Timestamp formatting +# + +=pod +=over 12 + +=item C<GetDateTimeJSFile()> + +Returns the path to the file containing the JavaScript code to format +timestamps. + +See GenerateDateTime(). + +=back +=cut + +sub GetDateTimeJSFile() +{ + return "/js/datetime.js"; +} + +=pod +=over 12 + +=item C<GenerateDateTime()> + +Returns an HTML snippet that uses the JavaScript ShowDateTime() function +to show a timestamp in ISO 8601 format in the user's local timezone. + +Note that the timestamp will be shown based on the server's timezone in case +JavaScript is disabled. +=over + +=item Sec1970 +The timestamp to display as the number of seconds since the Epoch. + +=item Class +A string containing additional classes for the <span> tag used to show the +date + time. + +=item TagAttrs +A string containing the tag name without the initial bracket, and any +additional attributes except class and timestamp. By default this is 'span'. + +=back +=back +=cut + +sub GenerateDateTime($;$$) +{ + my ($Sec1970, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "span"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}datetime' timestamp='$Sec1970'>", + strftime("%Y-%m-%d %H:%M:%S", localtime($Sec1970)), "</$Tag>"; + } + else + { + print " "; + } +} + + +# +# Property value formatting +# =pod =over 12 @@ -44,13 +126,20 @@ sub GenerateValueHTML($$$) { my ($Parent, $PropertyDescriptor, $Value) = @_; - if ($PropertyDescriptor->GetClass() eq "Basic" and - $PropertyDescriptor->GetType() eq "B") + if ($PropertyDescriptor->GetClass() eq "Basic") { - print $Value ? "Yes" : "No"; - return; + if ($PropertyDescriptor->GetType() eq "B") + { + print $Value ? "Yes" : "No"; + return; + } + if ($PropertyDescriptor->GetType() eq "DT") + { + GenerateDateTime($Value); + return; + } } - if ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) + elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { # Note: This only supports single-key Itemrefs foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js new file mode 100644 index 000000000..8f56719ca --- /dev/null +++ b/testbot/web/js/datetime.js @@ -0,0 +1,42 @@ +/* Format timestamps + * + * Copyright 2022 Francois Gouget + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +"use strict"; + +function Pad2(n) +{ + return n < 10 ? '0' + n : n; +} + +function ShowDateTime(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.innerHTML = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ + Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()) +} + +function init() +{ + document.querySelectorAll(".datetime").forEach(dom => { + ShowDateTime(dom); + }); +} + +window.addEventListener('load', init); -- 2.30.2

1 1

[tools] testbot/web: Escape the GetTaskURL() ampersands.
by Francois Gouget April 21, 2022

April 21, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See also the corresponding user details patch. --- testbot/web/Activity.pl | 2 +- testbot/web/Stats.pl | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5a5a37505..a92435805 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -238,7 +238,7 @@ EOF $Label .= "/64" if ($Bitness); } } - my $URL = GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No); + my $URL = $self->escapeHTML(GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No)); my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); $Label = "<a href='$URL' title='$Title'>$Label</a>"; } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 3c0fe9990..773fe3bb9 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -147,7 +147,7 @@ sub _GetStatHtml($$;$$) my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); if (defined $TaskNo) { - return "<a href='". GetTaskURL($JobId, $StepNo, $TaskNo) ."'>$Value</a>"; + return "<a href='". $Stats->{Page}->escapeHTML(GetTaskURL($JobId, $StepNo, $TaskNo)) ."'>$Value</a>"; } return "<a href='/index.pl#job$JobId'>$Value</a>"; } @@ -174,6 +174,7 @@ sub _GenStatsLine($$$$;$) foreach my $Col (@$ColumnKeys) { my $Stats = $RowStats->{items}->{$Col}; + $Stats->{Page} = $RowStats->{Page}; my $Value = _GetStatHtml($Stats, $StatKey, $RowStats, $Flags); print "<td>$Value</td>\n"; } @@ -205,6 +206,7 @@ sub GenerateBody($) ### Show global statistics my $GlobalStats = $Stats->{global}; + $GlobalStats->{Page} = $self; print "<h2>General statistics</h2>\n"; print "<div class='CollectionBlock'><table>\n"; @@ -251,6 +253,7 @@ sub GenerateBody($) print "<tr><td class='StatSeparator'>Activity</td><td colspan='2'><hr></td></tr>\n"; my $VMsStats = $Stats->{vms}; + $VMsStats->{Page} = $self; _GenGlobalLine($VMsStats, "elapsed", "Activity history", "How far back the activity records go. This is used for the VM and VM host tables."); _GenGlobalLine($GlobalStats, "records.count", "Record count", "The number of activity records."); @@ -264,7 +267,8 @@ sub GenerateBody($) print "<thead><tr><th>Stat</th>\n"; my $HostsStats = $Stats->{hosts}; - my $SortedHosts = [ sort keys %{$Stats->{hosts}->{items}} ]; + $HostsStats->{Page} = $self; + my $SortedHosts = [ sort keys %{$HostsStats->{items}} ]; foreach my $Host (@$SortedHosts) { my $DisplayHost = $Host; -- 2.30.2

1 0

[tools] testbot/web: Tweak the main page's job details links.
by Francois Gouget April 21, 2022

April 21, 2022

There is no need to call uri_escape() on integers. But GetDetailsLink() should go through escapeHTML() in case it contains ampersands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See also the corresponding user details patch. --- testbot/web/index.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 0b8a9cb78..1c506c9b1 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -26,7 +26,6 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use POSIX qw(strftime); -use URI::Escape; use WineTestBot::Branches; use WineTestBot::Users; @@ -89,9 +88,9 @@ sub GenerateDataView($$$) } elsif ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Row->{Item}->GetKey()); my $DetailsLink = $self->GetDetailsLink($Row); - print "<a id='job$EscapedKey' href='$DetailsLink'>"; + print "<a id='job", $Job->Id, "' href='", $self->escapeHTML($DetailsLink), + "'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>", -- 2.30.2

1 0

[tools] testbot/web: Escape URLs to the user details page.
by Francois Gouget April 21, 2022

April 21, 2022

It may contain ampersands which should be escaped in HTML documents. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Web browsers don't actually care and HTML 5 reportedly allows not escaping them in URLs as long as they are not ambiguous (!~ /&[a-zA-Z]+;/) which ours shouldn't be (=~ /&[a-zA-Z]+=/). But the TestBot is still on HTML 4 which means strictly speaking it should escape these ampersands. --- testbot/web/admin/UsersList.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index dcdb8111c..ec6d2822e 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -82,7 +82,7 @@ sub GenerateDataView($$$) { ($Class, $Label) = ('usernone', 'none'); } - my $DetailsLink = $self->GetDetailsLink($Row); + my $DetailsLink = $self->escapeHTML($self->GetDetailsLink($Row)); print "<a href='$DetailsLink'><span class='$Class'>$Label</span></a>"; } else -- 2.30.2

1 0

[tools] testbot: Shorten the "No patch found" disposition name.
by Francois Gouget April 21, 2022

April 21, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/tests/TestWTBS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d2ac52e4e..c0768bea7 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -550,7 +550,7 @@ sub NewPatch($$;$) my $SubjectInfo = $Patch->ParseSubject(); if (@PatchBodies == 0) { - $Patch->Disposition("No patch found"); + $Patch->Disposition("No patch"); } elsif (@PatchBodies > 1) { diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 8067a62e5..e5cd44832 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1460,7 +1460,7 @@ sub CheckPatches() { ok(($Patch->Subject =~ /NoPatch/ or $Patch->Disposition eq "Reply to a patch series" or - $Patch->Disposition eq "No patch found"), + $Patch->Disposition eq "No patch"), "Found no file for patch ". $Patch->Id .": ". $Patch->Subject) or diag("Disposition=". $Patch->Disposition); } -- 2.30.2

1 0

[PATCH V3 1/5] dlls/kernel32/tests: move CreateProcess() handle inheritance test into a dedicated function
by Eric Pouech April 21, 2022

April 21, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8f18a0d37a7..e7b4f30b565 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1521,10 +1521,6 @@ static void test_Console(void) CONSOLE_SCREEN_BUFFER_INFO sbi, sbiC; DWORD modeIn, modeOut, modeInC, modeOutC; DWORD cpIn, cpOut, cpInC, cpOutC; - DWORD w; - HANDLE hChildIn, hChildInInh, hChildOut, hChildOutInh, hParentIn, hParentOut; - const char* msg = "This is a std-handle inheritance test."; - unsigned msg_len; BOOL run_tests = TRUE; char *result; @@ -1647,6 +1643,17 @@ static void test_Console(void) release_memory(); DeleteFileA(resfile); +} + +static void test_StdInheritance(void) +{ + char buffer[2 * MAX_PATH + 35]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + DWORD w; + HANDLE hChildIn, hChildInInh, hChildOut, hChildOutInh, hParentIn, hParentOut; + const char* msg = "This is a std-handle inheritance test."; + unsigned msg_len; ok(CreatePipe(&hParentIn, &hChildOut, NULL, 0), "Creating parent-input pipe\n"); ok(DuplicateHandle(GetCurrentProcess(), hChildOut, GetCurrentProcess(), @@ -5095,6 +5102,7 @@ START_TEST(process) test_SuspendFlag(); test_DebuggingFlag(); test_Console(); + test_StdInheritance(); test_ExitCode(); test_OpenProcess(); test_GetProcessVersion();

4 9

[PATCH 4/4] wineoss: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib.
by Huw Davies April 21, 2022

April 21, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 39 -------------------------------------- dlls/wineoss.drv/ossmidi.c | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index aa672e211b9..9615c9892b9 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -663,41 +663,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modPrepare [internal] - */ -static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * modUnprepare [internal] - */ -static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -803,10 +768,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_PREPARE: - return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: - return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 7ab78bcbfdd..b97c5159e89 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1014,6 +1014,36 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct return MMSYSERR_NOERROR; } +static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, 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 midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, 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 midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1039,6 +1069,12 @@ NTSTATUS midi_out_message(void *args) case MODM_LONGDATA: *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); break; + case MODM_PREPARE: + *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MODM_UNPREPARE: + *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1