diff -r ca8a1b6995f6 -r 52e343bb8f80 memspy/Engine/Source/SysMemTracker/MemSpyEngineHelperSysMemTrackerEntryManager.cpp
--- a/memspy/Engine/Source/SysMemTracker/MemSpyEngineHelperSysMemTrackerEntryManager.cpp	Tue Aug 31 16:45:49 2010 +0300
+++ b/memspy/Engine/Source/SysMemTracker/MemSpyEngineHelperSysMemTrackerEntryManager.cpp	Wed Sep 01 12:37:10 2010 +0100
@@ -443,13 +443,12 @@
     }
 #endif
 
-// TODO: Uncomment when  bitmap handels are fixed
-//    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryBitmapHandles )
-//        {
-//        RDebug::Print( KMemSpyKeepaliveMessage );
-//        // Bitmap
-//        CreateSeedItemsBitmapL( *chunks );        
-//        }
+    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryBitmapHandles )
+        {
+        RDebug::Print( KMemSpyKeepaliveMessage );
+        // Bitmap
+        CreateSeedItemsBitmapL( *chunks );        
+        }
 
 #ifdef SYSMEMTRACKERLOGGING
     {
@@ -480,13 +479,12 @@
     }
 #endif
 
-//  TODO: Uncomment after fix
-//    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryKernelHeap )
-//        {
-//        RDebug::Print( KMemSpyKeepaliveMessage );
-//        // Look for kernel heaps
-//        CreateSeedItemsHeapKernelL( *chunks );
-//        }
+    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryKernelHeap )
+        {
+        RDebug::Print( KMemSpyKeepaliveMessage );
+        // Look for kernel heaps
+        CreateSeedItemsHeapKernelL( *chunks );
+        }
 
 #ifdef SYSMEMTRACKERLOGGING
     {
@@ -553,13 +551,12 @@
     }
 #endif
 
-//    TODO: Uncomment after fix
-//    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryUserStacks )
-//        {
-//        RDebug::Print( KMemSpyKeepaliveMessage );
-//        // Stacks ($DAT)
-//        CreateSeedItemsStacksL( *chunks );        
-//        }
+    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryUserStacks )
+        {
+        RDebug::Print( KMemSpyKeepaliveMessage );
+        // Stacks ($DAT)
+        CreateSeedItemsStacksL( *chunks );        
+        }
 
 #ifdef SYSMEMTRACKERLOGGING
      {
@@ -572,13 +569,12 @@
     }
 #endif
 
-//  TODO: Uncomment after fix
-//    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryGlobalData )
-//        {
-//        RDebug::Print( KMemSpyKeepaliveMessage );
-//        // Global data (DLL$DATA)
-//        CreateSeedItemsGlobalDataL( *chunks );        
-//        }
+    if ( config.iEnabledCategories & TMemSpyEngineHelperSysMemTrackerConfig::EMemSpyEngineSysMemTrackerCategoryGlobalData )
+        {
+        RDebug::Print( KMemSpyKeepaliveMessage );
+        // Global data (DLL$DATA)
+        CreateSeedItemsGlobalDataL( *chunks );        
+        }
 
  #ifdef SYSMEMTRACKERLOGGING
     {