[PATCH v5 0/2] MR10324: win32u: Fix deadlock when setting hdc_src to the window's self DC.

[Zhao Yi (＠Zhaoyi)]

Supersed !9180 and !9177

When hdc_src is the window's self DC, 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.

--
  v5: win32u/tests: Add tests for hdc_src is window's self dc when calling UpdateLayeredWindow.
      win32u: Fix deadlock when setting hdc_src to the window's self DC.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10324

[PATCH v5 1/2] win32u: Fix deadlock when setting hdc_src to the window's self DC.

[Zhao Yi]

From: Zhao Yi <[e-mail]>

Signed-off-by: Zhao Yi <[e-mail]>
---
 dlls/win32u/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index fc129df0785..bcf25bf65ab 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -2678,7 +2678,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_
     apply_window_pos( hwnd, 0, swp_flags, surface, &new_rects, NULL );
     if (!surface) return FALSE;
 
-    if (!hdc_src || surface == &dummy_surface)
+    if (!hdc_src || surface == &dummy_surface || NtUserWindowFromDC( hdc_src ) == hwnd)
     {
         user_driver->pUpdateLayeredWindow( hwnd, source_alpha, flags );
         ret = TRUE;
-- 
GitLab


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

[PATCH v5 2/2] win32u/tests: Add tests for hdc_src is window's self dc when calling UpdateLayeredWindow.

[Zhao Yi]

From: Zhao Yi <[e-mail]>

Signed-off-by: Zhao Yi <[e-mail]>
---
 dlls/user32/tests/win.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 135b11ddac4..6ef13eaeaa3 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -9297,6 +9297,12 @@ static void test_layered_window(void)
     HBITMAP hbm;
     BOOL ret;
     MSG msg;
+    HDC hdc_from_hwnd;
+    BLENDFUNCTION bf;
+    bf.AlphaFormat = 0;
+    bf.BlendFlags = 0;
+    bf.BlendOp = 0;
+    bf.SourceConstantAlpha = 180;
 
     if (!pGetLayeredWindowAttributes || !pSetLayeredWindowAttributes || !pUpdateLayeredWindow)
     {
@@ -9320,10 +9326,18 @@ static void test_layered_window(void)
     ret = pSetLayeredWindowAttributes( hwnd, 0, 0, LWA_ALPHA );
     ok( !ret, "SetLayeredWindowAttributes should fail on non-layered window\n" );
     SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED );
+    hdc_from_hwnd = GetDC( hwnd );
+    ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc_from_hwnd, &pt, 0, &bf, ULW_ALPHA );
+    ReleaseDC ( hwnd, hdc_from_hwnd );
+    ok( ret, "UpdateLayeredWindow should succeed on layered window\n" );
     ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
     ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" );
     ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE );
     ok( ret, "UpdateLayeredWindow should succeed on layered window\n" );
+    hdc_from_hwnd = GetDC( hwnd );
+    ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc_from_hwnd, &pt, 0, &bf, ULW_ALPHA );
+    ReleaseDC ( hwnd, hdc_from_hwnd );
+    ok( ret, "UpdateLayeredWindow should succeed on layered window\n" );
     ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags );
     ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" );
     ret = pSetLayeredWindowAttributes( hwnd, 0x123456, 44, LWA_ALPHA );
@@ -9459,6 +9473,10 @@ static void test_layered_window(void)
     SetWindowLongA( hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED );
     ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE );
     ok( ret, "UpdateLayeredWindow should succeed on layered window\n" );
+    hdc_from_hwnd = GetDC( hwnd );
+    ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc_from_hwnd, &pt, 0, &bf, ULW_ALPHA );
+    ReleaseDC ( hwnd, hdc_from_hwnd );
+    ok( ret, "UpdateLayeredWindow should succeed on layered window\n" );
 
     ret = pSetLayeredWindowAttributes( hwnd, 0, 255, LWA_ALPHA );
     ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" );
-- 
GitLab

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

[PATCH v5 0/2] MR10324: win32u: Fix deadlock when setting hdc_src to the window's self DC. - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10324