Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-06 18:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k]

Browse source 
- Fix applications exit before the release of class atoms.


svn path=/trunk/; revision=60599
This commit is contained in:
James Tabor 2013-10-10 12:40:30 +00:00
parent 0fa39dfff7
commit 196ba3d618
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/win32ss/user/ntuser/class.c
View file

@ -9,6 +9,9 @@
#include <win32k.h> #include <win32k.h>
DBG_DEFAULT_CHANNEL(UserClass); DBG_DEFAULT_CHANNEL(UserClass);
BOOL FASTCALL IntClassDestroyIcon(HANDLE hCurIcon);
static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom);
REGISTER_SYSCLASS DefaultServerClasses[] = REGISTER_SYSCLASS DefaultServerClasses[] =
{ {
{ ((PWSTR)((ULONG_PTR)(WORD)(0x8001))), { ((PWSTR)((ULONG_PTR)(WORD)(0x8001))),
@ -227,6 +230,13 @@ IntDestroyClass(IN OUT PCLS Class)
CallProc = NextCallProc; CallProc = NextCallProc;
} }
// Fixes running the static test then run class test issue.
// Some applications do not use UnregisterClass before exiting.
// Keep from reusing the same atom with case insensitive
// comparisons, remove registration of the atom if not zeroed.
if (Class->atomClassName)
IntDeregisterClassAtom(Class->atomClassName);
if (Class->pdce) if (Class->pdce)
{ {
DceFreeClassDCE(((PDCE)Class->pdce)->hDC); DceFreeClassDCE(((PDCE)Class->pdce)->hDC);
@ -236,6 +246,9 @@ IntDestroyClass(IN OUT PCLS Class)
IntFreeClassMenuName(Class); IntFreeClassMenuName(Class);
} }
if (Class->hIconSmIntern)
IntClassDestroyIcon(Class->hIconSmIntern);
pDesk = Class->rpdeskParent; pDesk = Class->rpdeskParent;
Class->rpdeskParent = NULL; Class->rpdeskParent = NULL;
@ -1481,6 +1494,7 @@ UserUnregisterClass(IN PUNICODE_STRING ClassName,
{ {
TRACE("Class 0x%p\n", Class); TRACE("Class 0x%p\n", Class);
TRACE("UserUnregisterClass: Good Exit!\n"); TRACE("UserUnregisterClass: Good Exit!\n");
Class->atomClassName = 0; // Don't let it linger...
/* Finally free the resources */ /* Finally free the resources */
IntDestroyClass(Class); IntDestroyClass(Class);
return TRUE; return TRUE;