- Wine-devel - list.winehq.org

[PATCH 1/4] winealsa: Use the sessions lock to lock the client's data.
by Huw Davies 22 Feb '22

22 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; } -- 2.25.1

2 1

[PATCH] include/wine/test.h: fix winetest_argv[1] in case of single test
by Eric Pouech 22 Feb '22

22 Feb '22

Wine's test infrastructure allows to call ./wine <test>.exe without test name when only a single test is available in <test>.exe. Unfortunately, a lots of tests also rely on winetest_argv[1] to be the name of current test (esp. when respawning themselves to run sub processes). So, ensure wintest_argv is correctly populated in the case of a <test> containing a single test file and called without any argument on command line. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/test.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 599234b3519..fc96bfa9877 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -691,7 +691,11 @@ int main( int argc, char **argv ) if (!argv[1]) { if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */ + { + static char* fake_argv[3] = {argv[0], winetest_testlist[0].name, NULL}; + winetest_argv = fake_argv; return run_test( winetest_testlist[0].name ); + } usage( argv[0] ); } if (!strcmp( argv[1], "--list" ))

2 1

[PATCH 12/12] win32u: Move cursor icon handle management from user32.
by Jacek Caban 22 Feb '22

22 Feb '22

2 1

[PATCH 11/12] win32u: Move user_handles from user32.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This part could be a bit nicer using my shm patches, that's what I originally used to implement this. However, those patches still need more work. Ideally, I'd prototype more of it, but at the same time I don't want to pile even more patches. My current thinking is to continue moving things without shm patches for now, but keep them around to revisit later. I hope to use experience from shm patches to make sure that we match their design where possible. All functions exposed from win32u by this patch are ultimately meant to be internal to win32u. dlls/user32/user_private.h | 13 ----- dlls/user32/win.c | 83 +++----------------------- dlls/user32/win.h | 37 ------------ dlls/win32u/ntuser_private.h | 53 +++++++++++++++++ dlls/win32u/sysparams.c | 11 ++++ dlls/win32u/window.c | 109 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 ++ 7 files changed, 185 insertions(+), 126 deletions(-)

2 1

[PATCH 10/12] win32u: Move user lock from user32.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Ultimately we will want those to be private to win32u (and PE code should never be executed with with the lock). dlls/user32/hook.c | 2 -- dlls/user32/user_main.c | 20 +++--------------- dlls/win32u/hook.c | 2 ++ dlls/win32u/sysparams.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 6 files changed, 48 insertions(+), 19 deletions(-)

3 2

[PATCH 09/12] user32: Simplify icon delay handling.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

2 1

[PATCH 08/12] user32: Use create_cursoricon_object in CURSORICON_CreateIconFromANI.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 122 ++++++++------------------------------- 1 file changed, 24 insertions(+), 98 deletions(-)

3 2

[PATCH 07/12] user32: Use create_cursoricon_object in CreateIconIndirect.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 73 +++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 42 deletions(-)

3 2

[PATCH 06/12] user32: Introduce NtUserSetCursorIconData.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 196 ++++++++++++++++++++++++++++++--------- include/ntuser.h | 15 +++ 2 files changed, 168 insertions(+), 43 deletions(-)

2 1

[PATCH 05/12] user32: Factor out create_icon_frame.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 134 +++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 70 deletions(-)

2 1