February 2022 - Wine-Commits

Nikolay Sivov : dispex/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 3bf977788613e425ad270947ab2859f97458dab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf977788613e425ad270947… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 22 15:58:23 2022 +0300 dispex/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/tests/Makefile.in | 1 - dlls/dispex/tests/marshal.c | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dispex/tests/Makefile.in b/dlls/dispex/tests/Makefile.in index ff65a40cbb0..e5ed0baf687 100644 --- a/dlls/dispex/tests/Makefile.in +++ b/dlls/dispex/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dispex.dll IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 99af7d8aea0..137d81b9d8d 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -31,8 +31,6 @@ #include "wine/test.h" -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) - #define RELEASEMARSHALDATA WM_USER struct host_object_data @@ -59,7 +57,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) IMessageFilter * prev_filter = NULL; hr = CoRegisterMessageFilter(data->filter, &prev_filter); if (prev_filter) IMessageFilter_Release(prev_filter); - ok_ole_success(hr, CoRegisterMessageFilter); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); @@ -132,7 +130,7 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M static void end_host_object(DWORD tid, HANDLE thread) { BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); - ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); + ok(ret, "PostThreadMessage failed with error %ld\n", GetLastError()); /* be careful of races - don't return until hosting thread has terminated */ WaitForSingleObject(thread, INFINITE); CloseHandle(thread); @@ -373,7 +371,7 @@ static void test_dispex(void) EXCEPINFO excepinfo; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); tid = start_host_object(stream, &IID_IDispatchEx, (IUnknown *)dispex, MSHLFLAGS_NORMAL, &thread); IDispatchEx_Release(dispex); if(tid == 0) @@ -384,7 +382,7 @@ static void test_dispex(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(stream, &IID_IDispatchEx, (void **)&dispex); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); params.rgvarg = NULL; @@ -392,7 +390,7 @@ static void test_dispex(void) params.cArgs = 0; params.cNamedArgs = 0; hr = IDispatchEx_InvokeEx(dispex, 1, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); params.rgvarg = args; params.rgdispidNamedArgs = NULL; @@ -404,23 +402,23 @@ static void test_dispex(void) V_INTREF(&args[1]) = &i; i = 0xbeef; hr = IDispatchEx_InvokeEx(dispex, 2, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(i == 0xdead, "got %08x\n", i); /* change one of the argument vts */ i = 0xbeef; hr = IDispatchEx_InvokeEx(dispex, 3, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == DISP_E_BADCALLEE, "got %08x\n", hr); + ok(hr == DISP_E_BADCALLEE, "Unexpected hr %#lx.\n", hr); hr = IDispatchEx_InvokeEx(dispex, 4, LOCALE_SYSTEM_DEFAULT, 0xffff, &params, NULL, NULL, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); params.cArgs = 0; hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Unexpected hr %#lx.\n", hr); hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, &excepinfo, NULL); - ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); - ok(excepinfo.scode == E_OUTOFMEMORY, "got scode %08x\n", excepinfo.scode); + ok(hr == DISP_E_EXCEPTION, "Unexpected hr %#lx.\n", hr); + ok(excepinfo.scode == E_OUTOFMEMORY, "got scode %#lx.\n", excepinfo.scode); ok(excepinfo.pfnDeferredFillIn == NULL, "got non-NULL pfnDeferredFillIn\n"); IDispatchEx_Release(dispex);

1 0

Huw Davies : winealsa: Use the sessions lock to lock the client's data.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 123e748f1be9a9971b2ea2f666e3b71e0d31ef02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=123e748f1be9a9971b2ea2f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 22 08:14:15 2022 +0000 winealsa: Use the sessions lock to lock the client's data. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 45 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5bb3bdbcc73..4d38240a853 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -976,10 +976,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } EnterCriticalSection(&g_sessions_lock); - EnterCriticalSection(&This->lock); if(This->stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -988,14 +986,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); if(!stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } hr = alsa_open_device(This->alsa_name, This->dataflow, &stream->pcm_handle, &stream->hw_params); if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return hr; } @@ -1223,7 +1219,6 @@ exit: set_stream_volumes(This); } - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return hr; @@ -1884,20 +1879,24 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); + EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); if(!This->stream){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(stream->started){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_STOPPED; } @@ -1934,6 +1933,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, alsa_push_buffer_data, This, 0, stream->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); WARN("Unable to create timer: %u\n", GetLastError()); return E_OUTOFMEMORY; } @@ -1942,6 +1942,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) stream->started = TRUE; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2070,23 +2071,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); if(!This->stream){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -2101,7 +2102,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -2112,7 +2113,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -2123,7 +2124,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -2133,11 +2134,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -2843,9 +2844,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - EnterCriticalSection(&This->client->lock); + EnterCriticalSection(&g_sessions_lock); This->client->session_wrapper = NULL; - LeaveCriticalSection(&This->client->lock); + LeaveCriticalSection(&g_sessions_lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -3238,12 +3239,12 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); This->vols[index] = level; set_stream_volumes(This); - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3282,13 +3283,13 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; set_stream_volumes(This); - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3307,12 +3308,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; }

1 0

Huw Davies : winealsa: Use a pthread mutex for the stream lock.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 9eb0ec9037930eaa6af2b538ca7c9b6abb560aa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eb0ec9037930eaa6af2b538… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 22 08:14:16 2022 +0000 winealsa: Use a pthread mutex for the stream lock. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 162 +++++++++++++++++++++---------------------- dlls/winealsa.drv/unixlib.h | 2 + 2 files changed, 80 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9eb0ec9037930eaa6af2…

1 0

Rémi Bernon : winegstreamer: Move the conditional cleanup to the create error path.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 34a55c7b96c97b178ea1ab519eb0e847096f2076 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a55c7b96c97b178ea1ab51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 12:23:22 2022 -0600 winegstreamer: Move the conditional cleanup to the create error path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 73 +++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index e4545774428..c309523dd36 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -62,12 +62,10 @@ NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; - if (transform->my_sink) - g_object_unref(transform->my_sink); - if (transform->my_src) - g_object_unref(transform->my_src); - + g_object_unref(transform->my_sink); + g_object_unref(transform->my_src); free(transform); + return STATUS_SUCCESS; } @@ -77,61 +75,52 @@ NTSTATUS wg_transform_create(void *args) struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; GstCaps *src_caps = NULL, *sink_caps = NULL; + NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; - NTSTATUS status; if (!init_gstreamer()) return STATUS_UNSUCCESSFUL; - status = STATUS_NO_MEMORY; - if (!(transform = calloc(1, sizeof(*transform)))) - goto done; + return STATUS_NO_MEMORY; if (!(src_caps = wg_format_to_caps(&input_format))) - goto done; - if (!(sink_caps = wg_format_to_caps(&output_format))) - goto done; - + goto out_free_transform; if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) - goto done; - if (!(transform->my_src = gst_pad_new_from_template(template, "src"))) - goto done; + goto out_free_src_caps; + transform->my_src = gst_pad_new_from_template(template, "src"); g_object_unref(template); - template = NULL; + if (!transform->my_src) + goto out_free_src_caps; + if (!(sink_caps = wg_format_to_caps(&output_format))) + goto out_free_src_pad; if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) - goto done; - if (!(transform->my_sink = gst_pad_new_from_template(template, "sink"))) - goto done; + goto out_free_sink_caps; + transform->my_sink = gst_pad_new_from_template(template, "sink"); g_object_unref(template); - template = NULL; + if (!transform->my_sink) + goto out_free_sink_caps; gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); - status = STATUS_SUCCESS; - -done: - if (template) - g_object_unref(template); - if (sink_caps) - gst_caps_unref(sink_caps); - if (src_caps) - gst_caps_unref(src_caps); - - if (status) - { - GST_ERROR("Failed to create winegstreamer transform."); - if (transform) - wg_transform_destroy(transform); - } - else - { - GST_INFO("Created winegstreamer transform %p.", transform); - params->transform = transform; - } + gst_caps_unref(sink_caps); + gst_caps_unref(src_caps); + + GST_INFO("Created winegstreamer transform %p.", transform); + params->transform = transform; + return STATUS_SUCCESS; +out_free_sink_caps: + gst_caps_unref(sink_caps); +out_free_src_pad: + gst_object_unref(transform->my_src); +out_free_src_caps: + gst_caps_unref(src_caps); +out_free_transform: + free(transform); + GST_ERROR("Failed to create winegstreamer transform."); return status; }

1 0

Giovanni Mascellani : winegstreamer: Do not block forever if EOS races with command queue.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 4853f65c844de8277b8b0420df1a2cdb1c5b17c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4853f65c844de8277b8b0420… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 9 09:40:52 2022 +0100 winegstreamer: Do not block forever if EOS races with command queue. Currently, the winegstreamer media source checks for EOS when RequestSample() is called, but doesn't handle the cases when EOS is detected between the RequestSample() call and the moment when the request is popped from the command queue and serviced. This can result in the media source waiting forever for a sample and get stuck. This commit fixes the bug by adding a check for EOS in wait_for_event(). This commit fixes Medieval Dynasty hanging on developer logos on the Steam Deck. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e40974bf73a..32006964f3b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -535,6 +535,12 @@ static void wait_on_sample(struct media_stream *stream, IUnknown *token) TRACE("%p, %p\n", stream, token); + if (stream->eos) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEError, &GUID_NULL, MF_E_END_OF_STREAM, &empty_var); + return; + } + for (;;) { if (!wg_parser_stream_get_event(stream->wg_stream, &event))

1 0

Huw Davies : winealsa: Use NtAllocateVirtualMemory() to alloc the buffers returned to the user.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 7262da2afcb18682da76d9787ead8cbdfe5ab20a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7262da2afcb18682da76d978… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 22 08:14:17 2022 +0000 winealsa: Use NtAllocateVirtualMemory() to alloc the buffers returned to the user. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 52 +++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 23a420c8ac7..d89ae4ee9ec 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -597,12 +597,19 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if (stream){ + SIZE_T size; snd_pcm_drop(stream->pcm_handle); snd_pcm_close(stream->pcm_handle); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + } HeapFree(GetProcessHeap(), 0, stream->remapping_buf); HeapFree(GetProcessHeap(), 0, stream->silence_buf); - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); HeapFree(GetProcessHeap(), 0, stream->hw_params); CoTaskMemFree(stream->fmt); HeapFree(GetProcessHeap(), 0, stream->vols); @@ -928,6 +935,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, unsigned int rate, alsa_period_us; int err, i; HRESULT hr = S_OK; + SIZE_T size; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -1158,9 +1166,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, goto exit; } - stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, - stream->bufsize_frames * fmt->nBlockAlign); - if(!stream->local_buffer){ + size = stream->bufsize_frames * fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ hr = E_OUTOFMEMORY; goto exit; } @@ -1212,8 +1220,10 @@ exit: HeapFree(GetProcessHeap(), 0, sw_params); if(FAILED(hr)){ snd_pcm_close(stream->pcm_handle); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); - stream->local_buffer = NULL; + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } CoTaskMemFree(stream->fmt); stream->fmt = NULL; HeapFree(GetProcessHeap(), 0, stream->vols); @@ -2297,6 +2307,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, ACImpl *This = impl_from_IAudioRenderClient(iface); struct alsa_stream *stream = This->stream; UINT32 write_pos; + SIZE_T size; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -2325,10 +2336,15 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, write_pos = stream->wri_offs_frames; if(write_pos + frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - frames * stream->fmt->nBlockAlign); - if(!stream->tmp_buffer){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; alsa_unlock(stream); return E_OUTOFMEMORY; } @@ -2465,6 +2481,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, { ACImpl *This = impl_from_IAudioCaptureClient(iface); struct alsa_stream *stream = This->stream; + SIZE_T size; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -2495,10 +2512,15 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(stream->tmp_buffer_frames < *frames){ - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - *frames * stream->fmt->nBlockAlign); - if(!stream->tmp_buffer){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; alsa_unlock(stream); return E_OUTOFMEMORY; }

1 0

Huw Davies : winealsa: Move create_stream and release_stream to the unixlib.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 71d0cdde89af4b28d29b74adbe67942f5d7c24d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d0cdde89af4b28d29b74ad… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 22 08:14:18 2022 +0000 winealsa: Move create_stream and release_stream to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 303 +++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 489 ++++--------------------------------------- dlls/winealsa.drv/unixlib.h | 21 ++ 3 files changed, 360 insertions(+), 453 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71d0cdde89af4b28d29b…

1 0

Rémi Bernon : dinput: Avoid invalid rglDirection access when effect cAxes is 0.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 0bb48fcb6dfd4839a640fe17a6fe4558a56f0cdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bb48fcb6dfd4839a640fe17… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 13:04:27 2022 +0100 dinput: Avoid invalid rglDirection access when effect cAxes is 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 00fd01b483a..80991e8c150 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2296,7 +2296,7 @@ static void convert_directions_to_spherical( const DIEFFECT *in, DIEFFECT *out ) tmp = atan2( in->rglDirection[i], tmp ); out->rglDirection[i - 1] = tmp * 18000 / M_PI; } - out->rglDirection[in->cAxes - 1] = 0; + if (in->cAxes) out->rglDirection[in->cAxes - 1] = 0; out->cAxes = in->cAxes; break; case DIEFF_POLAR: @@ -2306,7 +2306,8 @@ static void convert_directions_to_spherical( const DIEFFECT *in, DIEFFECT *out ) out->cAxes = in->cAxes; break; case DIEFF_SPHERICAL: - for (i = 0; i < in->cAxes - 1; ++i) + if (!in->cAxes) i = 0; + else for (i = 0; i < in->cAxes - 1; ++i) { out->rglDirection[i] = in->rglDirection[i] % 36000; if (out->rglDirection[i] < 0) out->rglDirection[i] += 36000;

1 0

Rémi Bernon : winebus.sys: Link the first two absolute axes to the effect directions.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 2f41101b954b7c7d021f133f53702e6e463b8a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f41101b954b7c7d021f133f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 13:04:29 2022 +0100 winebus.sys: Link the first two absolute axes to the effect directions. And use the same usages as for the axes themselves instead of generic HID usages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 22 +++++++++++++++++----- dlls/winebus.sys/unix_private.h | 2 ++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index df648a2019a..8d34fc86e63 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -235,10 +235,11 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) return hid_report_descriptor_append(desc, template, sizeof(template)); } -static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count) +static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count, + USAGE usage_page, const USAGE *usages) { struct hid_device_state *state = &iface->hid_device_state; - USHORT offset = state->bit_size / 8; + USHORT i, offset = state->bit_size / 8; if (!rel && state->rel_axis_count) ERR("absolute axes should be added before relative axes!\n"); @@ -257,6 +258,17 @@ static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE } else { + if (state->abs_axis_count + count > ARRAY_SIZE(state->abs_axis_usages)) + { + ERR("absolute axis usage overflow, too many elements!\n"); + return FALSE; + } + for (i = 0; i < count; ++i) + { + state->abs_axis_usages[state->abs_axis_count + i].UsagePage = usage_page; + state->abs_axis_usages[state->abs_axis_count + i].Usage = usages[i]; + } + if (!state->abs_axis_count) state->abs_axis_start = offset; state->abs_axis_count += count; state->bit_size += 32 * count; @@ -289,7 +301,7 @@ BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usage_page }; int i; - if (!hid_device_add_axis_count(iface, rel, count)) + if (!hid_device_add_axis_count(iface, rel, count, usage_page, usages)) return FALSE; if (!hid_report_descriptor_append(desc, template_begin, sizeof(template_begin))) @@ -872,8 +884,8 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co USAGE(1, PID_USAGE_AXES_ENABLE), COLLECTION(1, Logical), - USAGE(4, (HID_USAGE_PAGE_GENERIC<<16)|HID_USAGE_GENERIC_X), - USAGE(4, (HID_USAGE_PAGE_GENERIC<<16)|HID_USAGE_GENERIC_Y), + USAGE(4, (state->abs_axis_usages[0].UsagePage<<16)|state->abs_axis_usages[0].Usage), + USAGE(4, (state->abs_axis_usages[1].UsagePage<<16)|state->abs_axis_usages[1].Usage), LOGICAL_MINIMUM(1, 0), LOGICAL_MAXIMUM(1, 1), REPORT_SIZE(1, 1), diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 04545b7eb98..3c37f219a4b 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winternl.h> +#include <ddk/hidsdi.h> #include "unixlib.h" @@ -189,6 +190,7 @@ struct hid_physical struct hid_device_state { ULONG bit_size; + USAGE_AND_PAGE abs_axis_usages[32]; USHORT abs_axis_start; USHORT abs_axis_count; USHORT rel_axis_start;

1 0

Rémi Bernon : winegstreamer: Remove \n at the end of GST log messages.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 4d929972c341bff2da3616606b8cbeadf85dba26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d929972c341bff2da361660… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 22 12:23:21 2022 -0600 winegstreamer: Remove \n at the end of GST log messages. GStreamer already adds one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d0883c4c024..e5ed496387e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1436,7 +1436,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1465,7 +1465,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1486,7 +1486,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1496,7 +1496,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1520,7 +1520,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1531,7 +1531,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1559,7 +1559,7 @@ static void init_gstreamer_once(void) GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } @@ -1597,7 +1597,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering; - GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; }

1 0