[WIN32K]

- Use TAG_KEYBOARD for keyboard layouts
- Free TAG_ACCEL and TAG_DRIVER allocations with their tags

svn path=/trunk/; revision=47637

diff --git a/reactos/subsystems/win32/win32k/misc/driver.c b/reactos/subsystems/win32/win32k/misc/driver.c
index f427e3f..8b25b13 100644 (file)
--- a/reactos/subsystems/win32/win32k/misc/driver.c
+++ b/reactos/subsystems/win32/win32k/misc/driver.c
@@ -167,7 +167,7 @@ PFN_DrvEnableDriver DRIVER_FindDDIDriver(LPCWSTR Name)
 
   if (!NT_SUCCESS(Status))
   {
-    ExFreePool(FullName);
+    ExFreePoolWithTag(FullName, TAG_DRIVER);
     return NULL;
   }
 
@@ -572,8 +572,8 @@ BOOL DRIVER_UnregisterDriver(LPCWSTR  Name)
 
   if (Driver != NULL)
   {
-    ExFreePool(Driver->Name);
-    ExFreePool(Driver);
+    ExFreePoolWithTag(Driver->Name, TAG_DRIVER);
+    ExFreePoolWithTag(Driver, TAG_DRIVER);
 
     return  TRUE;
   }

diff --git a/reactos/subsystems/win32/win32k/ntuser/accelerator.c b/reactos/subsystems/win32/win32k/ntuser/accelerator.c
index b59f1d1..d963344 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/accelerator.c
+++ b/reactos/subsystems/win32/win32k/ntuser/accelerator.c
@@ -436,7 +436,7 @@ NtUserDestroyAcceleratorTable(
 
    if (Accel->Table != NULL)
    {
-      ExFreePool(Accel->Table);
+      ExFreePoolWithTag(Accel->Table, TAG_ACCEL);
       Accel->Table = NULL;
    }
 

diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
index 8ee11dc..5d04cd8 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
+++ b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
@@ -199,7 +199,7 @@ static PKBL UserLoadDllAndCreateKbl(DWORD LocaleId)
    ULONG hKl;
    LANGID langid;
 
-   NewKbl = ExAllocatePool(PagedPool, sizeof(KBL));
+   NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), TAG_KEYBOARD);
 
    if(!NewKbl)
    {
@@ -212,7 +212,7 @@ static PKBL UserLoadDllAndCreateKbl(DWORD LocaleId)
    if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables))
    {
       DPRINT("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId);
-      ExFreePool(NewKbl);
+      ExFreePoolWithTag(NewKbl, TAG_KEYBOARD);
       return NULL;
    }
 
@@ -401,7 +401,7 @@ BOOL UserUnloadKbl(PKBL pKbl)
       //Unload the layout
       EngUnloadImage(pKbl->hModule);
       RemoveEntryList(&pKbl->List);
-      ExFreePool(pKbl);
+      ExFreePoolWithTag(pKbl, TAG_KEYBOARD);
    }
 
    return TRUE;