Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32] imagelist: Invalidate the cookie of a destroyed imagelist

Browse source 
CORE-16316
CORE-16275
This commit is contained in:
Mark Jansen 2019-08-17 01:42:29 +02:00
parent ab2c90f1b9
commit c2b9f94234
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dll/win32/comctl32/imagelist.c
View file

@ -115,6 +115,9 @@ struct _IMAGELIST
};
#define IMAGELIST_MAGIC 0x53414D58
#ifdef __REACTOS__
#define IMAGELIST_MAGIC_DESTROYED 0x44454144
#endif
/* Header used by ImageList_Read() and ImageList_Write() */
#include "pshpack2.h"
@ -3494,6 +3497,9 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface)
if (This->hbrBlend25) DeleteObject (This->hbrBlend25);
if (This->hbrBlend50) DeleteObject (This->hbrBlend50);
#ifdef __REACTOS__
This->usMagic = IMAGELIST_MAGIC_DESTROYED;
#endif
This->IImageList2_iface.lpVtbl = NULL;
heap_free(This->has_alpha);
heap_free(This);
@ -3996,6 +4002,10 @@ static BOOL is_valid(HIMAGELIST himl)
{
#ifdef __REACTOS__
valid = himl && himl->usMagic == IMAGELIST_MAGIC;
if (!valid && himl && himl->usMagic == IMAGELIST_MAGIC_DESTROYED)
{
ERR("Imagelist no longer valid: 0x%p\n", himl);
}
#else
valid = himl && himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl;
#endif
@ -4098,6 +4108,11 @@ BOOL is_valid2(HIMAGELIST himl)
valid = himl &&
himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl &&
himl->usMagic == IMAGELIST_MAGIC;
if (!valid && himl &&
himl->usMagic == IMAGELIST_MAGIC_DESTROYED)
{
ERR("Imagelist no longer valid: 0x%p\n", himl);
}
}
__EXCEPT_PAGE_FAULT
{