--- a/compressionlibs/ziplib/group/bld.inf Tue Apr 27 18:23:16 2010 +0300
+++ b/compressionlibs/ziplib/group/bld.inf Tue May 11 17:47:24 2010 +0300
@@ -48,7 +48,7 @@
PRJ_MMPFILES
ezlib.mmp
ezip.mmp
- #include "../test/oldezlib/group/BLD.INF"
+ #include "../test/oldezlib/group/bld.inf"
#include "../test/rtest/group/bld.inf"
#include "../test/tef/group/bld.inf"
#endif //ifndef TOOLS endif
--- a/genericopenlibs/openenvcore/backend/inc/signalclient.h Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/inc/signalclient.h Tue May 11 17:47:24 2010 +0300
@@ -43,6 +43,11 @@
TInt SendPipe(RPipe& aPipe);
TInt SendSignal(TInt aPid,TInt aSignal);
TInt SendSignalValue(TInt aPid,TInt aSignal,TInt aValue);
+ inline void Close()
+ {
+ iLock.Close();
+ RSessionBase::Close();
+ }
private:
TInt OnDemandConnection();
--- a/genericopenlibs/openenvcore/backend/inc/sysif.h Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/inc/sysif.h Tue May 11 17:47:24 2010 +0300
@@ -114,7 +114,7 @@
*/
{
public:
- void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock, RTz * aTzs)
+ void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock)
{
iHeap = aHeap;
iFs = aFs;
@@ -122,7 +122,6 @@
iCs = aCs;
iSsLock = aSsLock;
iCsLock = aCsLock;
- iTzS = aTzs;
}
~TCLSICleanup()
@@ -133,7 +132,6 @@
iCs->Close();
iCsLock->Close();
iHeap->Close();
- iTzS->Close();
}
private:
RHeap* iHeap;
@@ -142,7 +140,6 @@
RCommServ* iCs;
RFastLock* iSsLock;
RFastLock* iCsLock;
- RTz * iTzS;
};
--- a/genericopenlibs/openenvcore/backend/ipcserver/ipccli/inc/ipcclient.h Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/ipcserver/ipccli/inc/ipcclient.h Tue May 11 17:47:24 2010 +0300
@@ -29,6 +29,7 @@
#include <sys/types.h>
#include <sys/sem.h>
+
struct msqid_ds;
struct shmid_ds;
@@ -52,8 +53,14 @@
{
public:
RIpcSession():iIsConnected(EFalse)
- {iLock.CreateLocal();}
-
+ {
+ iLock.CreateLocal();
+ }
+ inline void Close()
+ {
+ iLock.Close();
+ RSessionBase::Close();
+ }
//msgqueue functions
int msgctl(int msqid, int cmd, struct msqid_ds *buf, int &aerrno);
int msgget(key_t key, int msgflg, int& aerrno);
--- a/genericopenlibs/openenvcore/backend/ipcserver/ipcsrv/group/ipcserver.mmp Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/ipcserver/ipcsrv/group/ipcserver.mmp Tue May 11 17:47:24 2010 +0300
@@ -17,7 +17,7 @@
//
//
-TARGET LibCIpcServer.exe
+TARGET libcipcserver.exe
TARGETTYPE exe
// TODO : Update uid with the unused UID.
UID 0 0x10207370
--- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Tue May 11 17:47:24 2010 +0300
@@ -183,7 +183,7 @@
User::Panic(KEstlibInit, err);
}
- iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock, &iTzServer);
+ iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock);
// No connection settings by default
iDefConnPref = NULL;
@@ -200,9 +200,12 @@
iASelectLock.Close();
// Close the default connection lock
iDefConnLock.Close();
+
//close the default RConnection
if(iDefConnection.SubSessionHandle() != 0)
+ {
iDefConnection.Close();
+ }
RHeap* oHeap = User::SwitchHeap(iPrivateHeap);
for (TInt i = 0, count = iTLDInfoList.Count(); i < count; i++ )
@@ -216,14 +219,12 @@
int err;
// passing 1 to cancelaselect will kill all the threads serving aselect
cancelaselect(NULL,err,1);
- // Switch to backend heap
- RHeap* oldHeap = User::SwitchHeap(iPrivateHeap);
+
// Close the array that maintains aselect request details
iASelectRequest.Close();
//close the RTz connection
iTzServer.Close();
- // Switch back to old heap
- User::SwitchHeap(oldHeap);
+
if( iDefConnPref )
{
@@ -231,20 +232,14 @@
{
case TConnPref::EConnPrefSnap:
{
- RHeap* oldHeap = User::SwitchHeap(iPrivateHeap);
delete (TCommSnapPref*)iDefConnPref;
- // Switch back to old heap
- User::SwitchHeap(oldHeap);
iDefConnPref = NULL;
}
break;
case TConnPref::EConnPrefCommDb:
{
- RHeap* oldHeap = User::SwitchHeap(iPrivateHeap);
delete (TCommDbConnPref*)iDefConnPref;
- // Switch back to old heap
- User::SwitchHeap(oldHeap);
iDefConnPref = NULL;
}
break;
@@ -257,11 +252,25 @@
}
#if (defined SYMBIAN_OE_POSIX_SIGNALS && defined SYMBIAN_OE_LIBRT)
- iTimerOverrunsMutex.Close();
+ iTimerOverrunsMutex.Close();
iTimerOverruns.Close();
#endif
+
+#if (defined SYMBIAN_OE_POSIX_SIGNALS)
+ iSigInitWaitMutex.Close();
+ iSigInitWaitSemaphore.Close();
+ iBlockedSAMutex.Close();
+ iSignalWaiterMutex.Close();
+ iSignalInitSemaphore.Close();
+#endif
//close the RpointerArray
iOpenDirList.Close();
+
+ iSSLock.Close();
+ iCSLock.Close();
+ iSignalSession.Close();
+ iIpcS.Close();
+
User::SwitchHeap(oHeap);
}
@@ -334,8 +343,8 @@
}
int CLocalSystemInterface::stat (const wchar_t* name, struct stat *st, int& anErrno)
- {
- const wchar_t* filename;
+ {
+ const wchar_t* filename = name;
// This needs to be zero terminated
TBuf<KMaxFileName> inputName;
TUint pathAtt = 0;
@@ -349,12 +358,6 @@
}
filename = (wchar_t*)inputName.PtrZ();
}
- // try to stat anyway
- else
- {
- inputName.Copy((const TText16*)name);
- filename = (wchar_t*)inputName.PtrZ();
- }
TSpecialFileType fileType;
struct SLinkInfo enBuf;
// Check the type of file
--- a/genericopenlibs/openenvcore/backend/src/corebackend/uredirdesc.cpp Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/uredirdesc.cpp Tue May 11 17:47:24 2010 +0300
@@ -152,6 +152,7 @@
//
TInt CRedirDesc::FinalClose()
{
+ iLock.Close();
iSession.Close();
return KErrNone;
}
--- a/genericopenlibs/openenvcore/libc/test/testmulticast/group/bld.inf Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/test/testmulticast/group/bld.inf Tue May 11 17:47:24 2010 +0300
@@ -23,9 +23,9 @@
PRJ_TESTEXPORTS
../scripts/tmulticastclient.script /epoc32/winscw/c/tstdapis/tmulticastclient.script
-ethernetced_staticIP.xml /epoc32/winscw/c/CommDb/ethernetced_staticip.xml
-ethernetced_dynamicIP.xml /epoc32/winscw/c/CommDb/ethernetced_dynamicip.xml
-eth_stat.bat /epoc32/winscw/c/CommDb/eth_stat.bat
-eth_dyn.bat /epoc32/winscw/c/CommDb/eth_dyn.bat
-autoexec.bat /epoc32/winscw/c/CommDb/autoexec.bat
+ethernetced_staticIP.xml /epoc32/winscw/c/commdb/ethernetced_staticip.xml
+ethernetced_dynamicIP.xml /epoc32/winscw/c/commdb/ethernetced_dynamicip.xml
+eth_stat.bat /epoc32/winscw/c/commdb/eth_stat.bat
+eth_dyn.bat /epoc32/winscw/c/commdb/eth_dyn.bat
+autoexec.bat /epoc32/winscw/c/commdb/autoexec.bat
multicastclient.iby /epoc32/rom/include/multicastclient.iby
--- a/genericopenlibs/openenvcore/libc/test/teststdlib/childprocess/group/bld.inf Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/test/teststdlib/childprocess/group/bld.inf Tue May 11 17:47:24 2010 +0300
@@ -16,4 +16,4 @@
*/
PRJ_TESTMMPFILES
-TEST_WRITE.MMP
+test_write.mmp
--- a/genericopenlibs/openenvcore/libpthread/src/wsd_init.cpp Tue Apr 27 18:23:16 2010 +0300
+++ b/genericopenlibs/openenvcore/libpthread/src/wsd_init.cpp Tue May 11 17:47:24 2010 +0300
@@ -70,6 +70,9 @@
// Destructor to supress warnings
_global_data_t::~_global_data_t()
{
+ globalLockForMutex.Close();
+ lockThreadTable.Close();
+ lockSemTable.Close();
}
_global_data_t* GetGlobals()