[PATCH v3 0/2] MR9180: win32u: Fix deadlock caused by nested locking.

[Zhao Yi (＠Zhaoyi)]

Within the NtUserUpdateLayeredWindow function, there exists the following call sequence:
window_surface_lock()->NtGdiAlphaBlend()->window_surface_unlock(). However, the implementation
of the NtGdiAlphaBlend() function calls the windrv_GetImage() function, which internally
invokes lock_surface() and unlock_surface(). In this situation, window_surface_lock() is called
first to acquire a lock. When lock_surface() is subsequently called to acquire the same lock,
the initial lock has not yet been released, ultimately resulting in a deadlock.

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com>

--
  v3: shell32: Fix a memory leak issue.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9180

[PATCH v3 1/2] win32u: Fix deadlock caused by nested locking.

[Zhao Yi]

From: Zhao Yi <zhaoyi(a)uniontech.com>

Within the NtUserUpdateLayeredWindow function, there exists the following call sequence:
window_surface_lock()->NtGdiAlphaBlend()->window_surface_unlock(). However, the implementation
of the NtGdiAlphaBlend() function calls the windrv_GetImage() function, which internally
invokes lock_surface() and unlock_surface(). In this situation, window_surface_lock() is called
first to acquire a lock. When lock_surface() is subsequently called to acquire the same lock,
the initial lock has not yet been released, ultimately resulting in a deadlock.

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com>
---
 dlls/win32u/window.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 7e7726f52f9..e420ebd1b39 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -2550,7 +2550,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_
         intersect_rect( &rect, &rect, &surface_rect );
 
         if (!(hdc = NtGdiCreateCompatibleDC( 0 ))) goto done;
-        window_surface_lock( surface );
+        if (surface != &dummy_surface) pthread_mutex_lock( &surfaces_lock );
         NtGdiSelectBitmap( hdc, surface->color_bitmap );
 
         if (dirty) intersect_rect( &rect, &rect, dirty );
@@ -2566,7 +2566,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_
         if (ret) add_bounds_rect( &surface->bounds, &rect );
 
         NtGdiDeleteObjectApp( hdc );
-        window_surface_unlock( surface );
+        if (surface != &dummy_surface) pthread_mutex_unlock( &surfaces_lock );
 
         if (!(flags & ULW_COLORKEY)) key = CLR_INVALID;
         window_surface_set_layered( surface, key, -1, 0xff000000 );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9180

[PATCH v3 2/2] shell32: Fix a memory leak issue.

[Zhao Yi]

From: Zhao Yi <zhaoyi(a)uniontech.com>

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com>
---
 dlls/shell32/cpanelfolder.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index 69af6734f57..f611ced3c1c 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -131,7 +131,8 @@ HRESULT WINAPI IControlPanel_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOI
     sf->pUnkOuter = pUnkOuter ? pUnkOuter : (IUnknown *)&sf->IShellFolder2_iface;
 
     if (FAILED(IShellFolder2_QueryInterface(&sf->IShellFolder2_iface, riid, ppv))) {
-        IShellFolder2_Release(&sf->IShellFolder2_iface);
+        SHFree(sf->pidlRoot);
+        LocalFree(sf);
 	return E_NOINTERFACE;
     }
     IShellFolder2_Release(&sf->IShellFolder2_iface);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9180