# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1284738619 -3600
# Node ID cbb906b0db9bc96b7679eb7c650129d6bd076ab7
# Parent  9e2d4f7f502879fc6848768f89b86f57e0d483a2# Parent  880ff05ad71033ac1e7360f353c10ec89a0edcb3
Merge re-apply fixes for Bug 2149, 2283, GCCE support and rom_sbs.pl

diff -r 880ff05ad710 -r cbb906b0db9b kernel/eka/include/e32ver.h
--- a/kernel/eka/include/e32ver.h	Thu Sep 02 17:20:00 2010 +0100
+++ b/kernel/eka/include/e32ver.h	Fri Sep 17 16:50:19 2010 +0100
@@ -28,7 +28,7 @@
 
 const TInt KE32MajorVersionNumber=2;
 const TInt KE32MinorVersionNumber=0;
-const TInt KE32BuildVersionNumber=2655;
+const TInt KE32BuildVersionNumber=2657;
 
 const TInt KMachineConfigurationMajorVersionNumber=1;
 const TInt KMachineConfigurationMinorVersionNumber=0;
diff -r 880ff05ad710 -r cbb906b0db9b kernel/eka/kernel/sexec.cpp
--- a/kernel/eka/kernel/sexec.cpp	Thu Sep 02 17:20:00 2010 +0100
+++ b/kernel/eka/kernel/sexec.cpp	Fri Sep 17 16:50:19 2010 +0100
@@ -2198,10 +2198,10 @@
 	__KTRACE_OPT(KBOOT,Kern::Printf("File server thread registered"));
 	DThread* pT = TheCurrentThread;
 	DProcess* pP = pT->iOwningProcess;
+	if (K::TheFileServerProcess && K::TheFileServerProcess!=pP)
+		K::PanicCurrentThread(EAccessDenied);
 	pP->iFlags |= (KThreadFlagProcessCritical | KProcessFlagSystemPermanent);
 	pT->iFlags |= KThreadFlagSystemPermanent;
-	if (K::TheFileServerProcess && K::TheFileServerProcess!=pP)
-		K::PanicCurrentThread(EAccessDenied);
 	K::TheFileServerProcess=pP;
 	K::ThreadEnterCS();
 	pP->SetPriority(EPriorityFileServer);
diff -r 880ff05ad710 -r cbb906b0db9b kernel/eka/release.txt
--- a/kernel/eka/release.txt	Thu Sep 02 17:20:00 2010 +0100
+++ b/kernel/eka/release.txt	Fri Sep 17 16:50:19 2010 +0100
@@ -1,3 +1,21 @@
+Version 2.00.2657
+=================
+(Made by fadhliM 06/08/2010)
+
+1.	jimhofe
+	1.	MINOR_CHANGE Removing author names from documentation
+
+2.	davegord
+	1.	ou1cimx1#506836  Problem with ExecHandler::FsRegisterThread()
+
+Version 2.00.2656
+=================
+(Made by fadhliM 29/07/2010)
+
+1.	h14jiang
+	1.	ou1cimx1#504401 [92] Disk full notification pops up
+
+
 Version 2.00.2655
 =================
 (Made by fadhliM 27/07/2010)
@@ -14,7 +32,7 @@
 (Made by fadhliM 19/07/2010)
 
 1.	gcochran
-	1.	DEF144551 t_svrpinning, _P,_UP test fails with unexpected thread exit type on Vasco/TB9.2
+	1.	ou1cimx1#498818/DEF144551 t_svrpinning, _P,_UP test fails with unexpected thread exit type on Vasco/TB9.2
 
 2.	martai
 	1.	ou1cimx1#494023 E32TEST T_SHADOW Fails during testMultipleReadFile()
diff -r 880ff05ad710 -r cbb906b0db9b kernelhwsrv_info/doc_pub/base_how_to_use_t_fatcharsetconv_framework.doc
Binary file kernelhwsrv_info/doc_pub/base_how_to_use_t_fatcharsetconv_framework.doc has changed
diff -r 880ff05ad710 -r cbb906b0db9b kernelhwsrv_info/doc_pub/base_migrating_device_drivers_dfc_q.doc
Binary file kernelhwsrv_info/doc_pub/base_migrating_device_drivers_dfc_q.doc has changed
diff -r 880ff05ad710 -r cbb906b0db9b kernelhwsrv_info/doc_pub/base_migrating_kernel api preconditions checking.doc
Binary file kernelhwsrv_info/doc_pub/base_migrating_kernel api preconditions checking.doc has changed
diff -r 880ff05ad710 -r cbb906b0db9b userlibandfileserver/fileserver/group/release.txt
--- a/userlibandfileserver/fileserver/group/release.txt	Thu Sep 02 17:20:00 2010 +0100
+++ b/userlibandfileserver/fileserver/group/release.txt	Fri Sep 17 16:50:19 2010 +0100
@@ -1,3 +1,10 @@
+Version 2.00.2506
+=================
+(Made by fadhliM 06/08/2010)
+
+1.	michcox
+	1.	ou1cimx1#508327 [ENV][9.2] Fileserver Coverity Defects
+
 Version 2.00.2505
 =================
 (Made by fadhliM 26/07/2010)
diff -r 880ff05ad710 -r cbb906b0db9b userlibandfileserver/fileserver/inc/f32ver.h
--- a/userlibandfileserver/fileserver/inc/f32ver.h	Thu Sep 02 17:20:00 2010 +0100
+++ b/userlibandfileserver/fileserver/inc/f32ver.h	Fri Sep 17 16:50:19 2010 +0100
@@ -58,6 +58,6 @@
 
 @see TVersion
 */
-const TInt KF32BuildVersionNumber=2504;
+const TInt KF32BuildVersionNumber=2506;
 //
 #endif
diff -r 880ff05ad710 -r cbb906b0db9b userlibandfileserver/fileserver/sfsrv/cl_scan.cpp
--- a/userlibandfileserver/fileserver/sfsrv/cl_scan.cpp	Thu Sep 02 17:20:00 2010 +0100
+++ b/userlibandfileserver/fileserver/sfsrv/cl_scan.cpp	Fri Sep 17 16:50:19 2010 +0100
@@ -408,7 +408,7 @@
 	TInt r;
 	aDirEntries=NULL;
 		
-	if(iStack && iStack->IsEmpty())
+	if(iStack->IsEmpty())
 	    return;
 	
 	CDirList* list=iStack->Peek();