Skip to content

W
wine-cw
Commit 4ef24426 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

comctl32: Don't free user32 objects with a gdi32 function in imagelist test.

Use DestroyIcon for releasing the resources associated with created icons.
parent 06f0e723
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
dlls/comctl32/tests/imagelist.c
View file @ 4ef24426
...@@ -340,10 +340,9 @@ static BOOL DoTest1(void) ...@@ -340,10 +340,9 @@ static BOOL DoTest1(void)
/* destroy it */ /* destroy it */
ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); ok(ImageList_Destroy(himl),"destroy imagelist failed\n");
/* icons should be deleted by the imagelist */ ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n");
ok(!DeleteObject(hicon1),"icon 1 wasn't deleted\n"); ok(DestroyIcon(hicon2),"icon 2 wasn't deleted\n");
ok(!DeleteObject(hicon2),"icon 2 wasn't deleted\n"); ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n");
ok(!DeleteObject(hicon3),"icon 3 wasn't deleted\n");
return TRUE; return TRUE;
} }
...@@ -376,10 +375,9 @@ static BOOL DoTest2(void) ...@@ -376,10 +375,9 @@ static BOOL DoTest2(void)
/* destroy it */ /* destroy it */
ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); ok(ImageList_Destroy(himl),"destroy imagelist failed\n");
/* icons should be deleted by the imagelist */ ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n");
ok(!DeleteObject(hicon1),"icon 1 wasn't deleted\n"); ok(DestroyIcon(hicon2),"icon 2 wasn't deleted\n");
ok(!DeleteObject(hicon2),"icon 2 wasn't deleted\n"); ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n");
ok(!DeleteObject(hicon3),"icon 3 wasn't deleted\n");
return TRUE; return TRUE;
} }
...@@ -551,7 +549,7 @@ static void testMerge(void) ...@@ -551,7 +549,7 @@ static void testMerge(void)
ImageList_Destroy(himl1); ImageList_Destroy(himl1);
ImageList_Destroy(himl2); ImageList_Destroy(himl2);
DeleteObject(hicon1); DestroyIcon(hicon1);
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment