Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Properly remove window properties when destroying the window.

Browse source 
svn path=/trunk/; revision=60684
This commit is contained in:
James Tabor 2013-10-16 00:11:23 +00:00
parent 512ac8d32c
commit 1a21c35d02
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/win32ss/user/ntuser/prop.c
View file

@ -16,12 +16,12 @@ IntGetProp(PWND Window, ATOM Atom)
{ {
PLIST_ENTRY ListEntry; PLIST_ENTRY ListEntry;
PPROPERTY Property; PPROPERTY Property;
int i;
ListEntry = Window->PropListHead.Flink; ListEntry = Window->PropListHead.Flink;
while (ListEntry != &Window->PropListHead) for (i = 0; i < Window->PropListItems; i++ )
{ {
Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry);
if (!Property) break;
if (Property->Atom == Atom) if (Property->Atom == Atom)
{ {
return(Property); return(Property);
@ -79,6 +79,25 @@ IntSetProp(PWND pWnd, ATOM Atom, HANDLE Data)
return TRUE; return TRUE;
} }
VOID FASTCALL
IntRemoveWindowProp(PWND Window)
{
PLIST_ENTRY ListEntry;
PPROPERTY Property;
int i, Count = Window->PropListItems;
ListEntry = Window->PropListHead.Flink;
for (i = 0; i < Count; i++ )
{
Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry);
ListEntry = ListEntry->Flink;
RemoveEntryList(&Property->PropListEntry);
UserHeapFree(Property);
Window->PropListItems--;
}
return;
}
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
NTSTATUS APIENTRY NTSTATUS APIENTRY

1
reactos/win32ss/user/ntuser/prop.h
View file

@ -4,3 +4,4 @@ PPROPERTY FASTCALL IntGetProp(PWND,ATOM);
BOOL FASTCALL IntRemoveProp(PWND,ATOM); BOOL FASTCALL IntRemoveProp(PWND,ATOM);
BOOL FASTCALL IntSetProp(PWND, ATOM, HANDLE); BOOL FASTCALL IntSetProp(PWND, ATOM, HANDLE);
HANDLE FASTCALL UserGetProp(PWND, ATOM); HANDLE FASTCALL UserGetProp(PWND, ATOM);
VOID FASTCALL IntRemoveWindowProp(PWND Window);

11
reactos/win32ss/user/ntuser/window.c
View file

@ -426,8 +426,6 @@ static LRESULT co_UserFreeWindow(PWND Window,
PWND Child; PWND Child;
PMENU_OBJECT Menu; PMENU_OBJECT Menu;
BOOLEAN BelongsToThreadData; BOOLEAN BelongsToThreadData;
PLIST_ENTRY ListEntry;
PPROPERTY Property;
ASSERT(Window); ASSERT(Window);
@ -556,12 +554,11 @@ static LRESULT co_UserFreeWindow(PWND Window,
IntUnlinkWindow(Window); IntUnlinkWindow(Window);
ListEntry = Window->PropListHead.Flink; if (Window->PropListItems)
while (ListEntry != &Window->PropListHead)
{ {
Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); IntRemoveWindowProp(Window);
ListEntry = ListEntry->Flink; TRACE("Window->PropListItems %d\n",Window->PropListItems);
IntRemoveProp(Window, Property->Atom); ASSERT(Window->PropListItems==0);
} }
UserReferenceObject(Window); UserReferenceObject(Window);