[PATCH 5/5] user32: Verify we got a valid window handle in GetDCEx().

[Henri Verbeet]

---
 dlls/user32/painting.c  |    2 ++
 dlls/user32/tests/dce.c |   24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c
index 732c889..5b519bb 100644
--- a/dlls/user32/painting.c
+++ b/dlls/user32/painting.c
@@ -908,6 +908,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags )
 
     TRACE("hwnd %p, hrgnClip %p, flags %08x\n", hwnd, hrgnClip, flags);
 
+    if (!IsWindow(hwnd)) return NULL;
+
     /* fixup flags */
 
     if (flags & (DCX_WINDOW | DCX_PARENTCLIP)) flags |= DCX_CACHE;
diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c
index 37b9546..31c6ec0 100644
--- a/dlls/user32/tests/dce.c
+++ b/dlls/user32/tests/dce.c
@@ -392,6 +392,23 @@ static void test_invisible_create(void)
     DestroyWindow(hwnd_owndc);
 }
 
+static void test_destroyed_window(void)
+{
+    HDC dc;
+
+    dc = GetDCEx(hwnd_cache, 0, DCX_USESTYLE);
+    ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc);
+
+    dc = GetDCEx(hwnd_owndc, 0, DCX_USESTYLE);
+    ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc);
+
+    dc = GetDCEx(hwnd_classdc, 0, DCX_USESTYLE);
+    ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc);
+
+    dc = GetDCEx(hwnd_classdc2, 0, DCX_USESTYLE);
+    ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc);
+}
+
 START_TEST(dce)
 {
     WNDCLASSA cls;
@@ -431,4 +448,11 @@ START_TEST(dce)
     test_dc_visrgn();
     test_begin_paint();
     test_invisible_create();
+
+    DestroyWindow(hwnd_classdc2);
+    DestroyWindow(hwnd_classdc);
+    DestroyWindow(hwnd_owndc);
+    DestroyWindow(hwnd_cache);
+
+    test_destroyed_window();
 }
-- 
1.6.4.4