gdiplus: Don't leak a device context when GdipCreateFromHWND fails.

c3d23956 · Vincent Povirk · Alexandre Julliard · 8a3d9ff7 · c3d23956
Commit c3d23956 authored Apr 24, 2009 by Vincent Povirk Committed by Alexandre Julliard Apr 27, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

graphics.c dlls/gdiplus/graphics.c +7 -1

No files found.
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -941,11 +941,17 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra
 GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics)
 {
    GpStatus ret;
+    HDC hdc;

    TRACE("(%p, %p)\n", hwnd, graphics);

-    if((ret = GdipCreateFromHDC(GetDC(hwnd), graphics)) != Ok)
+    hdc = GetDC(hwnd);
+
+    if((ret = GdipCreateFromHDC(hdc, graphics)) != Ok)
+    {
+        ReleaseDC(hwnd, hdc);
        return ret;
+    }

    (*graphics)->hwnd = hwnd;
    (*graphics)->owndc = TRUE;