--- a/fbs/fontandbitmapserver/sfbs/FBSBMP.CPP	Wed Sep 01 12:39:21 2010 +0100
+++ b/fbs/fontandbitmapserver/sfbs/FBSBMP.CPP	Tue Sep 14 23:50:05 2010 +0300
@@ -569,12 +569,7 @@
         IsFileInRom(aFileName, rompointer);
         TBool romPointerValid;
         err = DoLoadFromRom(rompointer, aId, aFileOffset, romPointerValid);
-        if(romPointerValid)
-            {
-            FBS_OST(OstTrace1( TRACE_ERROR, CFBSBITMAP_LOAD2_ERROR2, "! this=0x%08x; romPointerValid", (TUint)this);)
-            err = KErrCouldNotConnect;
-            }
-        else
+        if(!romPointerValid)
             {
             _LIT(KResourcePath, "?:\\Resource\\*");
             TInt match = aFileName.MatchF(KResourcePath);

--- a/fbs/fontandbitmapserver/sfbs/FBSCLI.CPP	Wed Sep 01 12:39:21 2010 +0100
+++ b/fbs/fontandbitmapserver/sfbs/FBSCLI.CPP	Tue Sep 14 23:50:05 2010 +0300
@@ -89,6 +89,7 @@
 
 CFbClient::~CFbClient()
 	{
+    FBS_OST( OstTraceExt2( GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS, CFBCLIENT_DESTRUCTOR_INFO, "# Server session destroyed; rc=%d; iSSH=0x%08x;", iResourceCount, iSessionHandle);)
 	/*
 	Don't call any CFontStore functions if CFbClient::NewL has left, or if FBSERV has already deleted the
 	font store, which happens in test programs like TFBS when FBSERV is closed before the client(s).
@@ -101,16 +102,33 @@
 		}
 	
 	if (font_store)
+	    {
 		font_store->DeleteSessionCache(iSessionHandle);
+	    }
 	
 	// If the font store doesn't exist, neither will the shared heap owned by FBSERV.
 	if (font_store)
+	    {
 		iHeap->Free(iOpenFontGlyphData);
-	
-	// delete fonts hold by the client
+	    }
+
+    // output each bitmap that is about to be destroyed...
+	FBS_OST
+        ({
+        for (TInt ii = iIx->Count() - 1; ii >= 0; --ii)
+            {
+            CObject* object = (*iIx)[ii];
+            TInt localHandle = iIx->At(object);
+            if ((localHandle != KErrNotFound) && (iIx->At(localHandle, fbTop->BitmapConUniqueID()) != NULL))
+                {
+                OstTraceExt3( GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS, CFBCLIENT_DESTRUCTOR_INFO2, "# Server resource destroyed; iSSH=0x%08x; rc=%d; iH=0x%08x;", iSessionHandle, iResourceCount, localHandle);
+                }
+            }
+	    })
+	// delete fonts and bitmaps held by the client
 	delete iIx;
 	
-	// delete font files hold by the client
+	// delete font files held by the client
     if (iFontFileIndex)
         {
         TInt count = iFontFileIndex->Count();

--- a/fbs/fontandbitmapserver/traces_FBSCLI/fixed_id.definitions	Wed Sep 01 12:39:21 2010 +0100
+++ b/fbs/fontandbitmapserver/traces_FBSCLI/fixed_id.definitions	Tue Sep 14 23:50:05 2010 +0300
@@ -75,6 +75,7 @@
 [TRACE]TRACE_ERROR[0x41]_CFBSBITMAP_LOAD4_ERROR2=0x15
 [TRACE]TRACE_ERROR[0x41]_CFBSBITMAP_LOADANDCOMPRESS2_ERROR=0xf
 [TRACE]TRACE_ERROR[0x41]_CFBSBITMAP_LOADANDCOMPRESS4_ERROR=0x16
+[TRACE]TRACE_ERROR[0x41]_CFBSBITMAP_LOADANDCOMPRESS4_ERROR2=0x1e
 [TRACE]TRACE_ERROR[0x41]_CFBSBITMAP_LOCKHEAP_ERROR=0x12
 [TRACE]TRACE_ERROR[0x41]_CFBSBITMAP_UNLOCKHEAP_ERROR=0x13
 [TRACE]TRACE_ERROR[0x41]_RFBSSESSION_CONNECT2_ERROR=0x1b
@@ -82,11 +83,3 @@
 [TRACE]TRACE_ERROR[0x41]_RFBSSESSION_CONNECT2_ERROR3=0x1d
 [TRACE]TRACE_ERROR[0x41]_RFBSSESSION_CONNECT_ERROR=0x19
 [TRACE]TRACE_ERROR[0x41]_RFBSSESSION_CONNECT_ERROR2=0x1a
-[[OBSOLETE]][GROUP]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS=0x43
-[[OBSOLETE]][TRACE]GRAPHICS_CONTROL_FUNCTIONS[0x42]_CFBSBITMAP_LOCKHEAP_EXIT2=0x6
-[[OBSOLETE]][TRACE]GRAPHICS_CONTROL_FUNCTIONS[0x42]_CFBSBITMAP_UNLOCKHEAP_EXIT2=0x9
-[[OBSOLETE]][TRACE]GRAPHICS_CONTROL_FUNCTIONS[0x42]_RFBSSESSION_DISCONNECT_EXIT=0x14
-[[OBSOLETE]][TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x43]_RFBSSESSION_CONNECT2_INFO=0x2
-[[OBSOLETE]][TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x43]_RFBSSESSION_CONNECT_INFO=0x1
-[[OBSOLETE]][TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x43]_RFBSSESSION_DISCONNECT_INFO=0x3
-[[OBSOLETE]][TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x43]_RFBSSESSION_DOCONNECT_INFO=0x4

--- a/fbs/fontandbitmapserver/traces_FBSERV/fixed_id.definitions	Wed Sep 01 12:39:21 2010 +0100
+++ b/fbs/fontandbitmapserver/traces_FBSERV/fixed_id.definitions	Tue Sep 14 23:50:05 2010 +0300
@@ -1,6 +1,8 @@
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS=0x40
 [TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x40]_CFBCLIENT_COPYFONTINFOINTORETURNMESSAGE_INFO=0x3
+[TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x40]_CFBCLIENT_DESTRUCTOR_INFO=0xd
+[TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x40]_CFBCLIENT_DESTRUCTOR_INFO2=0xc
 [TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x40]_CFBCLIENT_HANDLEMESGFONTDUPLICATE_INFO=0x2
 [TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x40]_CFBCLIENT_PROCBITMAPMESSAGE_INFO=0x4
 [TRACE]GRAPHICS_RESOURCE_MANAGEMENT_SEMANTICS[0x40]_CFBCLIENT_PROCBITMAPMESSAGE_INFO2=0x5

--- a/windowing/windowserver/group/BLD.INF	Wed Sep 01 12:39:21 2010 +0100
+++ b/windowing/windowserver/group/BLD.INF	Tue Sep 14 23:50:05 2010 +0300
@@ -36,7 +36,7 @@
 
 PRJ_MMPFILES
 #ifdef SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
-#include "openwfc/BLD.INF"
+#include "openwfc/bld.inf"
 #else
-#include "restricted/BLD.INF"
+#include "restricted/bld.inf"
 #endif

--- a/windowing/windowserverplugins/group/BLD.INF	Wed Sep 01 12:39:21 2010 +0100
+++ b/windowing/windowserverplugins/group/BLD.INF	Tue Sep 14 23:50:05 2010 +0300
@@ -31,9 +31,9 @@
 PRJ_MMPFILES
 
 #ifndef SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
-#include "../restricted/group/BLD.INF"
+#include "../restricted/group/bld.inf"
 #else
-#include "../openwfc/group/BLD.INF"
+#include "../openwfc/group/bld.inf"
 #endif