Use DeleteDC instead of DeleteObject to free HDCs (spotted by Dietrich

Teickner <Dietrich_Teickner@t-online.de>). Clear the imagelist structure on deletion, as some stupid apps free imagelists multiple times.

Use DeleteDC instead of DeleteObject to free HDCs (spotted by Dietrich
0fe326c4 · Dimitrie O. Paun · Alexandre Julliard · 27faf02e · 0fe326c4
Commit 0fe326c4 authored Nov 18, 2002 by Dimitrie O. Paun Committed by Alexandre Julliard Nov 18, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

imagelist.c dlls/comctl32/imagelist.c +4 -3

No files found.
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -694,6 +694,7 @@ ImageList_Destroy (HIMAGELIST himl)
    if (himl->hbrBlend50)
        DeleteObject (himl->hbrBlend50);

+    ZeroMemory(himl, sizeof(*himl));
    COMCTL32_Free (himl);

    return TRUE;
@@ -1223,9 +1224,9 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
 cleanup:
    DeleteObject(hBlendMaskBmp);
    DeleteObject(hImageBmp);
-    DeleteObject(hImageDC);
-    DeleteObject(hImageListDC);
-    DeleteObject(hMaskListDC);
+    DeleteDC(hImageDC);
+    DeleteDC(hImageListDC);
+    DeleteDC(hMaskListDC);

    return bResult;
 }