# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282120064 -10800 # Node ID bf6a71c50e4256ad287be68fa78a94bb9fe2cf6e # Parent 5fae379060a7765eab5fc351a8ea388737672379 Revision: 201033 Kit: 201033 diff -r 5fae379060a7 -r bf6a71c50e42 build.config.xml --- a/build.config.xml Fri Jun 11 15:26:22 2010 +0300 +++ b/build.config.xml Wed Aug 18 11:27:44 2010 +0300 @@ -124,10 +124,11 @@ + + - diff -r 5fae379060a7 -r bf6a71c50e42 compressionlibs/ziplib/inc/zipfilememberiterator.h --- a/compressionlibs/ziplib/inc/zipfilememberiterator.h Fri Jun 11 15:26:22 2010 +0300 +++ b/compressionlibs/ziplib/inc/zipfilememberiterator.h Wed Aug 18 11:27:44 2010 +0300 @@ -32,7 +32,7 @@ @publishedAll @released */ -class CZipFileMemberIterator +class CZipFileMemberIterator // codescanner::missingcclass { friend class CZipFile; diff -r 5fae379060a7 -r bf6a71c50e42 compressionlibs/ziplib/test/rtest/group/compressionlibs-RTEST.pkg --- a/compressionlibs/ziplib/test/rtest/group/compressionlibs-RTEST.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/compressionlibs/ziplib/test/rtest/group/compressionlibs-RTEST.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -19,11 +19,11 @@ &EN ;rtest-install -"/epoc32/release/armv5/urel/ZIPTEST.exe"-"C:/test/ZIPTEST.exe" -"/epoc32/release/armv5/urel/ezlibtest.exe"-"C:/test/ezlibtest.exe" -"/epoc32/release/armv5/urel/ezdefect.exe"-"C:/test/ezdefect.exe" -"/epoc32/release/armv5/urel/ezexample.exe"-"C:/test/ezexample.exe" -"/epoc32/release/armv5/urel/inflateprimetest.exe"-"C:/test/inflateprimetest.exe" +"/epoc32/release/armv5/urel/ZIPTEST.exe"-"C:/sys/bin/ZIPTEST.exe" +"/epoc32/release/armv5/urel/ezlibtest.exe"-"C:/sys/bin/ezlibtest.exe" +"/epoc32/release/armv5/urel/ezdefect.exe"-"C:/sys/bin/ezdefect.exe" +"/epoc32/release/armv5/urel/ezexample.exe"-"C:/sys/bin/ezexample.exe" +"/epoc32/release/armv5/urel/inflateprimetest.exe"-"C:/sys/bin/inflateprimetest.exe" ; Embedded SIS ; None diff -r 5fae379060a7 -r bf6a71c50e42 compressionlibs/ziplib/test/tef/group/compressionlibs-tef.pkg --- a/compressionlibs/ziplib/test/tef/group/compressionlibs-tef.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/compressionlibs/ziplib/test/tef/group/compressionlibs-tef.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -49,14 +49,14 @@ "/epoc32/data/z/tef_ezlib2/te_PerformanceTests.ini"-"C:/tef_ezlib2/te_PerformanceTests.ini" "/epoc32/data/z/tef_ezlib2/te_backwardscompatibilitytests.ini"-"C:/tef_ezlib2/te_backwardscompatibilitytests.ini" -"/epoc32/data/z/tef_ezlib2/te_manual_backwardscompatibilitytests.ini"-"C:/tef_ezlib2/te_manual_backwardscompatibilitytests.ini" -"/epoc32/data/z/tef_ezlib2/te_manual_performancetests.ini"-"C:/tef_ezlib2/te_manual_performancetests.ini" +;"/epoc32/data/z/tef_ezlib2/te_manual_backwardscompatibilitytests.ini"-"C:/tef_ezlib2/te_manual_backwardscompatibilitytests.ini" +;"/epoc32/data/z/tef_ezlib2/te_manual_performancetests.ini"-"C:/tef_ezlib2/te_manual_performancetests.ini" -"/epoc32/data/z/tef_ezlib2/te_PerformanceTests.script"-"C:/tef_ezlib2/te_PerformanceTests.Script" +"/epoc32/data/z/tef_ezlib2/te_PerformanceTests.script"-"C:/tef_ezlib2/te_PerformanceTests.script" "/epoc32/data/z/tef_ezlib2/te_backwardscompatibilitytests.script"-"C:/tef_ezlib2/te_backwardscompatibilitytests.script" "/epoc32/data/z/tef_ezlib2/te_ezlibeziptests_suite.script"-"C:/tef_ezlib2/te_ezlibeziptests_suite.script" -"/epoc32/data/z/tef_ezlib2/te_manual_backwardscompatibilitytests.script"-"C:/tef_ezlib2/te_manual_backwardscompatibilitytests.script" -"/epoc32/data/z/tef_ezlib2/te_manual_performancetests.script"-"C:/tef_ezlib2/te_manual_performancetests.script" +;"/epoc32/data/z/tef_ezlib2/te_manual_backwardscompatibilitytests.script"-"C:/tef_ezlib2/te_manual_backwardscompatibilitytests.script" +;"/epoc32/data/z/tef_ezlib2/te_manual_performancetests.script"-"C:/tef_ezlib2/te_manual_performancetests.script" "/epoc32/data/z/tef_ezlib2/te_zlib_suite.script"-"C:/tef_ezlib2/te_zlib_suite.script" "/epoc32/data/z/tef_ezlib2/te_zlib.script"-"C:/tef_ezlib2/te_zlib.script" diff -r 5fae379060a7 -r bf6a71c50e42 compressionlibs/ziplib/test/tef/te_ezlibeziptests/scripts/te_ezlibeziptests_suite.script --- a/compressionlibs/ziplib/test/tef/te_ezlibeziptests/scripts/te_ezlibeziptests_suite.script Fri Jun 11 15:26:22 2010 +0300 +++ b/compressionlibs/ziplib/test/tef/te_ezlibeziptests/scripts/te_ezlibeziptests_suite.script Wed Aug 18 11:27:44 2010 +0300 @@ -15,5 +15,5 @@ PRINT Run all of the EZlib and EZip tef tests. -RUN_SCRIPT z:\tef_ezlib2\te_performancetests.script -RUN_SCRIPT z:\tef_ezlib2\te_backwardscompatibilitytests.script +RUN_SCRIPT c:\tef_ezlib2\te_performancetests.script +RUN_SCRIPT c:\tef_ezlib2\te_backwardscompatibilitytests.script diff -r 5fae379060a7 -r bf6a71c50e42 compressionlibs/ziplib/test/tef/tlibz/scripts/te_zlib_suite.script --- a/compressionlibs/ziplib/test/tef/tlibz/scripts/te_zlib_suite.script Fri Jun 11 15:26:22 2010 +0300 +++ b/compressionlibs/ziplib/test/tef/tlibz/scripts/te_zlib_suite.script Wed Aug 18 11:27:44 2010 +0300 @@ -15,7 +15,7 @@ PRINT Run all of the zlib tef tests. -RUN_SCRIPT z:\tef_ezlib2\te_zlib.script -RUN_SCRIPT z:\tef_ezlib2\te_zlib_auto.script -RUN_SCRIPT z:\tef_ezlib2\te_zlib_blocks.script -RUN_SCRIPT z:\tef_ezlib2\te_zlib_advanced.script \ No newline at end of file +RUN_SCRIPT c:\tef_ezlib2\te_zlib.script +RUN_SCRIPT c:\tef_ezlib2\te_zlib_auto.script +RUN_SCRIPT c:\tef_ezlib2\te_zlib_blocks.script +RUN_SCRIPT c:\tef_ezlib2\te_zlib_advanced.script \ No newline at end of file diff -r 5fae379060a7 -r bf6a71c50e42 compressionlibs/ziplib/test/tef/tlibz/src/tzlibserver.cpp --- a/compressionlibs/ziplib/test/tef/tlibz/src/tzlibserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/compressionlibs/ziplib/test/tef/tlibz/src/tzlibserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 compressionlibs/ziplib/test/tef/ulibz/src/ulibzserver.cpp --- a/compressionlibs/ziplib/test/tef/ulibz/src/ulibzserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/compressionlibs/ziplib/test/tef/ulibz/src/ulibzserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -75,7 +75,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/bwins/libstdcppv5u.def --- a/genericopenlibs/cppstdlib/bwins/libstdcppv5u.def Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/bwins/libstdcppv5u.def Wed Aug 18 11:27:44 2010 +0300 @@ -461,4 +461,6 @@ ?what@__Named_exception@std@@UBEPBDXZ @ 460 NONAME ; char const * std::__Named_exception::what(void) const ?xalloc@ios_base@std@@SAHXZ @ 461 NONAME ; int std::ios_base::xalloc(void) ?nothrow@std@@3Unothrow_t@1@B @ 462 NONAME ; struct std::nothrow_t const std::nothrow - + ?backend_allocate@@YAPAXI@Z @ 463 NONAME ; void * backend_allocate(unsigned int) + ?backend_free@@YAXPAX@Z @ 464 NONAME ; void backend_free(void *) + diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def --- a/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def Wed Aug 18 11:27:44 2010 +0300 @@ -776,5 +776,6 @@ _ZNK9stlp_priv9_Messages6do_getEiiiRKSs @ 775 NONAME _ZNK9stlp_priv9_Messages7do_openERKSsRKSt6locale @ 776 NONAME _ZNK9stlp_priv9_Messages8do_closeEi @ 777 NONAME - + _Z12backend_freePv @ 778 NONAME + _Z16backend_allocatej @ 779 NONAME diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/eabi/libstdcppv5u.def --- a/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def Wed Aug 18 11:27:44 2010 +0300 @@ -776,5 +776,6 @@ _ZNK9stlp_priv9_Messages6do_getEiiiRKSs @ 775 NONAME _ZNK9stlp_priv9_Messages7do_openERKSsRKSt6locale @ 776 NONAME _ZNK9stlp_priv9_Messages8do_closeEi @ 777 NONAME + _Z12backend_freePv @ 778 NONAME + _Z16backend_allocatej @ 779 NONAME - diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/group/libstdcpp.mmp --- a/genericopenlibs/cppstdlib/group/libstdcpp.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/group/libstdcpp.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -88,6 +88,8 @@ LIBRARY libpthread.lib LIBRARY libm.lib LIBRARY euser.lib +LIBRARY backend.lib + #ifdef ARMCC_3_1 DEFFILE ../eabi/libstdcppv5.def diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/stl/src/allocators.cpp --- a/genericopenlibs/cppstdlib/stl/src/allocators.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/src/allocators.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -52,8 +52,47 @@ #define _S_free_per_thread_states get_S_free_per_thread_states() #define _S_key get_S_key() #define _S_key_initialized get_S_key_initialized() +#endif + +#ifdef __SYMBIAN32__ +extern "C" +{ +IMPORT_C void* BackendAlloc(size_t ); +IMPORT_C void BackendFree(void* ); +} +EXPORT_C void* backend_allocate(size_t __n) + { + for (;;) + { + void* p = BackendAlloc(__n); + + if (p) + { + return p; + } + + // set_new_handler uses Dll::Tls. So only this threads new handler will be changed + // for the time it is set back. No problems for other threads. + std::new_handler nh_func = std::set_new_handler(NULL); + std::set_new_handler(nh_func); + + if (nh_func) + { + nh_func(); + } + else + { + __THROW(std::bad_alloc()); + } + } + } + +EXPORT_C void backend_free(void* __p) + { + BackendFree(__p); + } #endif #if defined (__WATCOMC__) @@ -84,8 +123,13 @@ inline void* __stlp_chunk_malloc(size_t __bytes) { _STLP_CHECK_NULL_ALLOC(_STLP_VENDOR_CSTD::malloc(__bytes)); } inline void __stlp_chunck_free(void* __p) { _STLP_VENDOR_CSTD::free(__p); } # else -inline void* __stlp_chunk_malloc(size_t __bytes) { return _STLP_STD::__stl_new(__bytes); } -inline void __stlp_chunck_free(void* __p) { _STLP_STD::__stl_delete(__p); } +inline void* __stlp_chunk_malloc(size_t __bytes) { + return _STLP_STD::__stl_new(__bytes); +} +inline void __stlp_chunck_free(void* __p) { + _STLP_STD::__stl_delete(__p); +} + # endif #endif // !_DEBUG @@ -173,7 +217,13 @@ #define _STLP_NFREELISTS 16 -#if defined (_STLP_LEAKS_PEDANTIC) && defined (_STLP_USE_DYNAMIC_LIB) +/* + * On Symbian, the stlport is built as a dll and also dynamically linked against + * by the applications. The _STLP_USE_DYNAMIC_LIB should always be defined. + * _STLP_LEAKS_PEDANTIC is defined to prevent the memory leaks in __node_alloc + * when the library is dynamically loaded and unloaded. + */ +#if defined (_STLP_LEAKS_PEDANTIC) && ( defined (_STLP_USE_DYNAMIC_LIB) || defined (__SYMBIAN32__) ) /* * We can only do cleanup of the node allocator memory pool if we are * sure that the STLport library is used as a shared one as it guaranties @@ -498,7 +548,8 @@ _S_chunks = 0; _S_start_free = _S_end_free = 0; _S_heap_size = 0; - memset(__REINTERPRET_CAST(char*, &_S_free_list[0]), 0, _STLP_NFREELISTS * sizeof(_Obj*)); + // Reinterprest cast cant remove volatileness. So using C style cast + memset((char*)(&_S_free_list[0]), 0, _STLP_NFREELISTS * sizeof(_Obj*)); } # endif /* _STLP_DO_CLEAN_NODE_ALLOC */ @@ -714,7 +765,9 @@ #if defined (_STLP_DO_CLEAN_NODE_ALLOC) struct __node_alloc_cleaner { ~__node_alloc_cleaner() - { __node_alloc_impl::_S_dealloc_call(); } + { + __node_alloc_impl::_S_dealloc_call(); + } }; # if defined (_STLP_USE_LOCK_FREE_IMPLEMENTATION) diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/stl/stlport/stl/_new.h --- a/genericopenlibs/cppstdlib/stl/stlport/stl/_new.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_new.h Wed Aug 18 11:27:44 2010 +0300 @@ -138,14 +138,34 @@ # define _STLP_CHECK_NULL_ALLOC(__x) return __x # endif +#ifdef __SYMBIAN32__ +IMPORT_C void* backend_allocate(size_t); +IMPORT_C void backend_free(void*); +#endif + + _STLP_BEGIN_NAMESPACE # if ((defined (__IBMCPP__) || defined (__OS400__) || defined (__xlC__) || defined (qTidyHeap)) && defined (__DEBUG_ALLOC__)) inline void* _STLP_CALL __stl_new(size_t __n) { _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n, __FILE__, __LINE__)); } inline void _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p, __FILE__, __LINE__); } # else -inline void* _STLP_CALL __stl_new(size_t __n) { _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n)); } -inline void _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p); } +inline void* _STLP_CALL __stl_new(size_t __n) + { +#ifdef __SYMBIAN32__ + return backend_allocate(__n); +#else + _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n)); +#endif + } +inline void _STLP_CALL __stl_delete(void* __p) + { +#ifdef __SYMBIAN32__ + backend_free(__p); +#else + ::operator delete(__p); +#endif + } # endif _STLP_END_NAMESPACE diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h --- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h Wed Aug 18 11:27:44 2010 +0300 @@ -109,9 +109,9 @@ * its internal memory pool but only if STLport is used as a dynamic library * under Win32 (using MSVC like compilers). */ -/* + #define _STLP_LEAKS_PEDANTIC 1 -*/ + /* * Uncomment _STLP_USE_NEWALLOC to force allocator to use plain "new" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/stl/test/group/bld.inf --- a/genericopenlibs/cppstdlib/stl/test/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/test/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -21,7 +21,7 @@ prj_testmmpfiles stlport_test stlport_unit_test -stlport_extraExports +//stlport_extraExports PRJ_TESTEXPORTS libstdcpp_tests.iby /epoc32/rom/include/libstdcpp_tests.iby oe_autotest.iby /epoc32/rom/include/oe_autotest.iby \ No newline at end of file diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/stl/test/group/libstdcpp_tests.iby --- a/genericopenlibs/cppstdlib/stl/test/group/libstdcpp_tests.iby Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/test/group/libstdcpp_tests.iby Wed Aug 18 11:27:44 2010 +0300 @@ -17,7 +17,7 @@ file=ABI_DIR\BUILD_DIR\stlport_test.exe sys\bin\stlport_test.exe file=ABI_DIR\BUILD_DIR\stlport_unit_test.exe sys\bin\stlport_unit_test.exe file=ABI_DIR\BUILD_DIR\stlport_extraExports.dll sys\bin\stlport_extraExports.dll -file=ABI_DIR\BUILD_DIR\stdioserver.exe sys\bin\stdioserver.exe +//file=ABI_DIR\BUILD_DIR\stdioserver.exe sys\bin\stdioserver.exe file=ABI_DIR\BUILD_DIR\uncaught_exception_test.exe sys\bin\uncaught_exception_test.exe file=ABI_DIR\BUILD_DIR\terminate_handler_test.exe sys\bin\terminate_handler_test.exe file=ABI_DIR\BUILD_DIR\oper_new_test.exe sys\bin\oper_new_test.exe diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/stl/test/group/libstdcpp_tests.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/cppstdlib/stl/test/group/libstdcpp_tests.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,24 @@ + +; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http:;www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +"\epoc32\release\armv5\urel\stlport_test.exe"-"C:\sys\bin\stlport_test.exe" +"\epoc32\release\armv5\urel\stlport_unit_test.exe"-"C:\sys\bin\stlport_unit_test.exe" + +"\sf\os\ossrv\genericopenlibs\cppstdlib\test\test-automate\stdcpp_runtest.ini"-"C:\system\data\stdcpp_runtest.ini" +"\sf\os\ossrv\genericopenlibs\cppstdlib\test\test-automate\stdcpptests_hw.bat"-"C:\stdcpptests_hw.bat" + + + diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cppstdlib/stl/test/unit/cmath_test.cpp --- a/genericopenlibs/cppstdlib/stl/test/unit/cmath_test.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cppstdlib/stl/test/unit/cmath_test.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -32,7 +32,7 @@ // // TestCase class // -class CMathTest : public CPPUNIT_NS::TestCase +class CMathTest : public CPPUNIT_NS::TestCase // codescanner::missingcclass { CPPUNIT_TEST_SUITE(CMathTest); CPPUNIT_TEST(test); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/TSTLIB/TMisc3.mmp --- a/genericopenlibs/cstdlib/TSTLIB/TMisc3.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/TSTLIB/TMisc3.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -20,7 +20,7 @@ // instead of calling those in estlib.dll. OPTION CW -opt nointrinsics -TARGET tmisc3.exe +TARGET tmisc3.exe //RTEST TARGETTYPE exe USERINCLUDE ../INC diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/TSTLIB/T_PR234_LTIME.cpp --- a/genericopenlibs/cstdlib/TSTLIB/T_PR234_LTIME.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/TSTLIB/T_PR234_LTIME.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -109,8 +109,13 @@ void Testtime() { test.Next(_L(" @SYMTestCaseID:SYSLIB-STDLIB-CT-0144 \ntesting time()...\n ")); - RTz tz; - tz.Connect(); + TInt r = KErrNone; + RTz tz; + r = tz.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } CTzId* tzId = CTzId::NewL(2592); //set the timezone to Europe/London CleanupStack::PushL(tzId); tz.SetTimeZoneL(*tzId); @@ -162,11 +167,19 @@ //test when dst is on... test.Printf(_L("tests during summertime (dst on)...\t")); + + TInt rt = KErrNone; + TInt rz = KErrNone; + //set the utc time to 8.55am, 15 May 2005 -Daylight savings apply on this date TInt err=User::SetUTCTime(TTime(TDateTime(2005, EMay, 15, 8, 55, 0, 0))); test(err==0); RTz tz; - tz.Connect(); + rt = tz.Connect(); + if (rt != KErrNone) + { + User::Leave(rt); + } CTzId* tzId = CTzId::NewL(2592); //set the timezone to Europe/London CleanupStack::PushL(tzId); tz.SetTimeZoneL(*tzId); @@ -202,7 +215,12 @@ err=User::SetUTCTime(TTime(TDateTime(2005, EJanuary, 15, 8, 55, 0, 0))); test(err==0); - tz.Connect(); + rz = tz.Connect(); + if (rz != KErrNone) + { + User::Leave(rz); + } + CTzId* tzId2 = CTzId::NewL(2592); //set the timezone to Europe/London CleanupStack::PushL(tzId2); tz.SetTimeZoneL(*tzId2); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/TSTLIB/T_PR234_LTIME.mmp --- a/genericopenlibs/cstdlib/TSTLIB/T_PR234_LTIME.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/TSTLIB/T_PR234_LTIME.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -16,7 +16,7 @@ CAPABILITY WriteDeviceData VENDORID 0x70000001 -TARGET t_pr234_ltime.exe +TARGET t_pr234_ltime.exe //RTEST TARGETTYPE exe diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/TSTLIB/T_SPRINTF.MMP --- a/genericopenlibs/cstdlib/TSTLIB/T_SPRINTF.MMP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/TSTLIB/T_SPRINTF.MMP Wed Aug 18 11:27:44 2010 +0300 @@ -19,7 +19,7 @@ CAPABILITY ALL -TCB -TARGET t_sprintf.exe +TARGET t_sprintf.exe //RTEST TARGETTYPE exe OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/TSTLIB/T_StdlibDefect.mmp --- a/genericopenlibs/cstdlib/TSTLIB/T_StdlibDefect.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/TSTLIB/T_StdlibDefect.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -13,7 +13,7 @@ // Description: // -target t_stdlibdefect.exe +target t_stdlibdefect.exe //RTEST targettype exe OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/TSTLIB/T_UCRT0P1.MMP --- a/genericopenlibs/cstdlib/TSTLIB/T_UCRT0P1.MMP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/TSTLIB/T_UCRT0P1.MMP Wed Aug 18 11:27:44 2010 +0300 @@ -20,7 +20,7 @@ OPTION GCC -w TARGETTYPE exe -TARGET t_ucrt0p1.exe +TARGET t_ucrt0p1.exe //RTEST SOURCEPATH ../TSTLIB SOURCE T_UCRT0P1.CPP diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/TSTLIB/t_waitpid_launch.mmp --- a/genericopenlibs/cstdlib/TSTLIB/t_waitpid_launch.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/TSTLIB/t_waitpid_launch.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -20,7 +20,7 @@ OPTION GCC -w TARGETTYPE exe -TARGET t_waitpid_launch.exe +TARGET t_waitpid_launch.exe //RTEST SOURCEPATH ../TSTLIB SOURCE t_waitpid_launch.cpp diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/UCRT/ECRT0.CPP --- a/genericopenlibs/cstdlib/UCRT/ECRT0.CPP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/UCRT/ECRT0.CPP Wed Aug 18 11:27:44 2010 +0300 @@ -33,8 +33,6 @@ #define CALLMAIN(argc, argv, envp) main(argc, argv, envp) #endif -extern "C" void exit (int ret); - GLDEF_C TInt E32Main() { CTrapCleanup::New(); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/UCRT/MCRT0.CPP --- a/genericopenlibs/cstdlib/UCRT/MCRT0.CPP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/UCRT/MCRT0.CPP Wed Aug 18 11:27:44 2010 +0300 @@ -33,8 +33,6 @@ #define CALLMAIN(argc, argv, envp) main(argc, argv, envp) #endif -extern "C" void exit (int ret); - GLDEF_C TInt E32Main() { CTrapCleanup::New(); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/UCRT/WCRT0.CPP --- a/genericopenlibs/cstdlib/UCRT/WCRT0.CPP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/UCRT/WCRT0.CPP Wed Aug 18 11:27:44 2010 +0300 @@ -25,8 +25,6 @@ extern "C" int main (int argc, char *argv[], char *envp[]); -extern "C" void exit (int ret); - #ifndef EKA2 IMPORT_C void RegisterWsExe(const TDesC &aName); #endif diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/UCRT/WECRT0.CPP --- a/genericopenlibs/cstdlib/UCRT/WECRT0.CPP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/UCRT/WECRT0.CPP Wed Aug 18 11:27:44 2010 +0300 @@ -22,8 +22,6 @@ extern "C" int wmain (int argc, wchar_t *argv[], wchar_t *envp[]); -extern "C" void exit (int ret); - GLDEF_C TInt E32Main() { CTrapCleanup::New(); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/UCRT/WMCRT0.CPP --- a/genericopenlibs/cstdlib/UCRT/WMCRT0.CPP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/UCRT/WMCRT0.CPP Wed Aug 18 11:27:44 2010 +0300 @@ -22,8 +22,6 @@ extern "C" int wmain (int argc, wchar_t *argv[], wchar_t *envp[]); -extern "C" void exit (int ret); - GLDEF_C TInt E32Main() { CTrapCleanup::New(); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/UCRT/WWCRT0.CPP --- a/genericopenlibs/cstdlib/UCRT/WWCRT0.CPP Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/UCRT/WWCRT0.CPP Wed Aug 18 11:27:44 2010 +0300 @@ -26,8 +26,6 @@ extern "C" int wmain (int argc, wchar_t *argv[], wchar_t *envp[]); -extern "C" void exit (int ret); - #ifndef EKA2 IMPORT_C void RegisterWsExe(const TDesC &aName); #endif diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/group/stdlibtests-RTEST.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/cstdlib/group/stdlibtests-RTEST.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,71 @@ +; +; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + + +;Languages +&EN + + +; Provide value for uid +;#{"inetprotutiltest2.pkg"},(0x102729D9),1,0,0 + + +; Series60 product id for S60 3.0 +;[0x101F7961], 0, 0, 0, {"Series60ProductID"} + +; Localised Vendor name +%{"Nokia"} + +; Unique Vendor name +:"Nokia" + +; Logo +; None + +; Package signature - Optional +; None + +; Start of Package body + +; Condition blocks +; None + +; Options list +; None + +; Install files + + +;The batch file to run the tests TestFileUriSuite +"/epoc32/release/armv5/urel/T_WAITPID_LAUNCH.EXE"-"C:/sys/bin/T_WAITPID_LAUNCH.exe" +"/epoc32/release/armv5/urel/T_PR234_LTIME.EXE"-"C:/sys/bin/T_PR234_LTIME.exe" +"/epoc32/release/armv5/urel/T_StdlibDefect.EXE"-"C:/sys/bin/T_StdlibDefect.exe" +"/epoc32/release/armv5/urel/T_UCRT0P1.EXE"-"C:/sys/bin/T_UCRT0P1.exe" +"/epoc32/release/armv5/urel/TMISC3.EXE"-"C:/sys/bin/TMISC3.exe" +"/epoc32/release/armv5/urel/T_SPRINTF.EXE"-"C:/sys/bin/T_SPRINTF.exe" + + + +; Embedded SIS +; None + +; End of Package body + +; PKG dependencies +; None + +; PKG capabilities +; None diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/cstdlib/group/stdlibtests.iby --- a/genericopenlibs/cstdlib/group/stdlibtests.iby Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/cstdlib/group/stdlibtests.iby Wed Aug 18 11:27:44 2010 +0300 @@ -62,14 +62,8 @@ file=ABI_DIR\BUILD_DIR\TSERSIG.EXE Test\TSERSIG.EXE file=ABI_DIR\BUILD_DIR\TSOCK.EXE Test\TSOCK.EXE file=ABI_DIR\BUILD_DIR\TSTDLIBDEFECT.EXE Test\TSTDLIBDEFECT.EXE -file=ABI_DIR\BUILD_DIR\TMISC3.EXE Test\TMISC3.EXE -file=ABI_DIR\BUILD_DIR\T_PR234_LTIME.EXE Test\T_PR234_LTIME.EXE -file=ABI_DIR\BUILD_DIR\T_StdlibDefect.EXE Test\T_StdlibDefect.EXE -file=ABI_DIR\BUILD_DIR\T_UCRT0P1.EXE Test\T_UCRT0P1.EXE file=ABI_DIR\BUILD_DIR\T_UCRT0P2.EXE Test\T_UCRT0P2.EXE file=ABI_DIR\BUILD_DIR\T_UCRT0P3.EXE Test\T_UCRT0P3.EXE -file=ABI_DIR\BUILD_DIR\T_WAITPID_LAUNCH.EXE Test\T_WAITPID_LAUNCH.EXE file=ABI_DIR\BUILD_DIR\T_WAITPID.EXE Test\T_WAITPID.EXE -file=ABI_DIR\BUILD_DIR\T_SPRINTF.EXE Test\T_SPRINTF.EXE #endif diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/inc/fdesc.h --- a/genericopenlibs/openenvcore/backend/inc/fdesc.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/fdesc.h Wed Aug 18 11:27:44 2010 +0300 @@ -604,7 +604,7 @@ TInt Poll(TPollMode aMode,TBool& aReadyStatus,TInt& aErrno); TInt Poll(TUint aEvents); void CancelNotify(); - + void TempClose(); void SetFids(void *aFids); virtual TInt Type() diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/inc/sysif.h --- a/genericopenlibs/openenvcore/backend/inc/sysif.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/sysif.h Wed Aug 18 11:27:44 2010 +0300 @@ -58,7 +58,7 @@ class CFileDescBase; /* TODO: We don't have to do this in CFileTable. Move to methods */ class CFileSocketDesc; - +class CSocketDesc; struct TChild /* @internalComponent @@ -161,7 +161,7 @@ }; -class CFileTable +class CFileTable // codescanner::missingcclass /* @internalComponent */ @@ -515,6 +515,29 @@ RArray& ASelectRequest(); RFastLock& ASelectLock(); + + inline RFastLock& DefConnLock() { return iDefConnLock; } + + inline TInt AddSocket(CSocketDesc* aPtr) + { + RHeap* oheap = User::SwitchHeap(iPrivateHeap); + TInt ret = iSocketArray.InsertInAddressOrder(aPtr); + User::SwitchHeap(oheap); + return ret; + } + + inline void RemoveSocket(CSocketDesc* aPtr) + { + TInt index = iSocketArray.FindInAddressOrder(aPtr); + if (index != -1) + { + RHeap* oheap = User::SwitchHeap(iPrivateHeap); + iSocketArray.Remove(index); + iSocketArray.Compress(); + User::SwitchHeap(oheap); + } + } + int system (const wchar_t* aCmd, const wchar_t* aCmdArg, int& anErrno ); const wchar_t* GetDirName (int aFid); IMPORT_C int Truncate (int aFid, off_t anOffset, int& anErrno); @@ -655,6 +678,7 @@ // Default connection settings, set/cleared using setdefaultif TConnPref* iDefConnPref; RTz iTzServer; + RPointerArray iSocketArray; #ifdef SYMBIAN_OE_POSIX_SIGNALS // Signal handler thread RThread iSignalHandlerThread; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/src/StdioRedir/Server/StdioServer.cpp --- a/genericopenlibs/openenvcore/backend/src/StdioRedir/Server/StdioServer.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/StdioRedir/Server/StdioServer.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -135,9 +135,19 @@ void CStdioServer::ConstructL() { - StartL(KServerName); - iFs.Connect(); - iCs.Connect(); + TInt rf = KErrNone; + TInt rc = KErrNone; + StartL(KServerName); + rf = iFs.Connect(); + if (rf != KErrNone) + { + User::Leave(rf); + } + rc = iCs.Connect(); + if (rc != KErrNone) + { + User::Leave(rc); + } iShutDown = CShutDown::NewL(); iShutDown->Start(); } diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/src/corebackend/fdtransfer_srv.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/fdtransfer_srv.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/fdtransfer_srv.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -222,10 +222,12 @@ // ------------------------------------------------------------------------------- void CFileDesTransferServer::ConstructL() { - iShutdown = new(ELeave) CShutdown; - CleanupStack::PushL(iShutdown); - iShutdown->ConstructL(); + CShutdown* shutdown = new(ELeave) CShutdown; + CleanupStack::PushL(shutdown); + shutdown->ConstructL(); CleanupStack::Pop(); + iShutdown = shutdown; + shutdown = 0; } // ------------------------------------------------------------------------------- diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ // Construction of Backend Object which is going to be singleton object for the process EXPORT_C CLocalSystemInterface::CLocalSystemInterface() : iOpenDirList(CLocalSystemInterface::KDirGran), -iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran) +iTLDInfoList(CLocalSystemInterface::KTLDInfoListGran), iDefConnPref(NULL) { #ifdef SYMBIAN_OE_POSIX_SIGNALS iSignalsInitialized = EFalse; @@ -184,9 +184,7 @@ } iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock); - - // No connection settings by default - iDefConnPref = NULL; + } EXPORT_C CLocalSystemInterface::~CLocalSystemInterface() @@ -3736,11 +3734,11 @@ TInt err = KErrNone; //Open the database and create the IAP view. - CCommsDatabase *iApDb = CCommsDatabase::NewL(EDatabaseTypeIAP); - CleanupStack::PushL(iApDb); - iApDb->ShowHiddenRecords(); + CCommsDatabase *apDb = CCommsDatabase::NewL(EDatabaseTypeIAP); + CleanupStack::PushL(apDb); + apDb->ShowHiddenRecords(); //The following pushes the view onto the cleanup stack - CCommsDbTableView *view = iApDb->OpenTableLC(TPtrC(IAP)); + CCommsDbTableView *view = apDb->OpenTableLC(TPtrC(IAP)); //Iterate through the records to find the matching entry TAccessPointRecord apRecord; @@ -3756,7 +3754,7 @@ } CleanupStack::PopAndDestroy(); //Free the view - CleanupStack::PopAndDestroy(iApDb); //Free the db itself + CleanupStack::PopAndDestroy(apDb); //Free the db itself if(err != KErrNone) //Record not found return KErrNotFound; @@ -3771,7 +3769,7 @@ } // ----------------------------------------------------------------------------- -// CLocalSystemInterface::RestartDefConnection +// CLocalSystemInterface::StartDefConnection // // Helper function for the setdefaultif() API to restart the // default RConnection with the new settings. @@ -3779,18 +3777,20 @@ // TInt CLocalSystemInterface::StartDefConnection() { - //Close the connection and re-open it with the new preferences - if(iDefConnection.SubSessionHandle() != 0) - iDefConnection.Close(); - TInt err = iDefConnection.Open(iSs); if( err != KErrNone ) return err; - - err = iDefConnection.Start(*iDefConnPref); - if( err != KErrNone ) + // If connection preference is set + if (iDefConnPref) + { + err = iDefConnection.Start(*iDefConnPref); + } + else // No connection preference available + { + err = iDefConnection.Start(); + } + if (err != KErrNone) iDefConnection.Close(); - return err; } @@ -3807,8 +3807,20 @@ { // Obtain lock on the iDefConnection iDefConnLock.Wait(); - if(iDefConnection.SubSessionHandle() != 0) - iDefConnection.Close(); + + if (iDefConnection.SubSessionHandle() != 0) + { + TUint count = iSocketArray.Count(); + for (TInt i = 0; i < count; ++i) + { + iSocketArray[i]->TempClose(); + } + iDefConnection.Close(); + RHeap* oheap = User::SwitchHeap(iPrivateHeap); + iSocketArray.Reset(); + User::SwitchHeap(oheap); + } + if( iDefConnPref ) { switch( iDefConnPref->ExtensionId() ) @@ -3941,16 +3953,12 @@ RConnection& CLocalSystemInterface::GetDefaultConnection() { // If GetDefaultConnection is called without calling - // setdefaultif then the connection is not started + // setdefaultif then the connection started without any preferences // Obtain lock on the iDefConnection iDefConnLock.Wait(); if(iDefConnection.SubSessionHandle() == 0) { - // iDefConnPref should not be NULL for starting the connection - if( iDefConnPref ) - { - StartDefConnection(); - } + StartDefConnection(); } // Release lock on the iDefConnection iDefConnLock.Signal(); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/usocket.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -343,15 +343,19 @@ TInt CSocketDesc::FinalClose() { - RHeap* oheap = User::SwitchHeap(Backend()->Heap()); + CLocalSystemInterface* backend = Backend(); + backend->DefConnLock().Wait(); + RHeap* oheap = User::SwitchHeap(backend->Heap()); if (iSocketPtr != NULL) { iSocketPtr = NULL; StopInterface(NULL); // Checks for RConnection as well as RSubConnection + backend->RemoveSocket(this); } CSockDescBase::FinalClose(); User::SwitchHeap(oheap); + backend->DefConnLock().Signal(); return KErrNone; } @@ -1744,54 +1748,35 @@ TInt CSocketDesc::OpenUsingPreference() { TInt ret = 0; - RConnection defConnection = Backend()->GetDefaultConnection(); - + // Update when supporting INET6 + TInt addrfamily = (iAddrFamily == AF_INET6 ? KAfInet : iAddrFamily); if (iConnectionPtr != NULL) // iConnection initialized { - if (iAddrFamily == AF_INET6) - { - ret = iSocket.Open(*iSockServPtr,KAfInet,iStyle,iProtocol,iConnection); - } - else - { - ret = iSocket.Open(*iSockServPtr,iAddrFamily,iStyle,iProtocol,iConnection); - } + ret = iSocket.Open(*iSockServPtr,addrfamily,iStyle,iProtocol,iConnection); } else if (iSubConnectionPtr != NULL) // iSubConnection initialized { - if (iAddrFamily == AF_INET6) - { - ret = iSocket.Open(*iSockServPtr,KAfInet,iStyle,iProtocol,iSubConnection); - } - else - { - ret = iSocket.Open(*iSockServPtr,iAddrFamily,iStyle,iProtocol,iSubConnection); - } + ret = iSocket.Open(*iSockServPtr,addrfamily,iStyle,iProtocol,iSubConnection); } - //Now check if the default connection is intialized. This is given lesser - //priority than the socket specific preferences checked above. - else if(defConnection.SubSessionHandle() != 0) - { - if (iAddrFamily == AF_INET6) - { - ret = iSocket.Open(*iSockServPtr,KAfInet,iStyle,iProtocol,defConnection); - } - else - { - ret = iSocket.Open(*iSockServPtr,iAddrFamily,iStyle,iProtocol,defConnection); - } - } - else // No connection preference is set - { - if (iAddrFamily == AF_INET6) - { - ret = iSocket.Open(*iSockServPtr,KAfInet,iStyle,iProtocol); - } - else - { - ret = iSocket.Open(*iSockServPtr,iAddrFamily,iStyle,iProtocol); - } - } + else + { + RConnection& defConnection = Backend()->GetDefaultConnection(); + //Now check if the default connection is intialized. This is given lesser + //priority than the socket specific preferences checked above. + if(defConnection.SubSessionHandle() != 0) + { + ret = iSocket.Open(*iSockServPtr,addrfamily,iStyle,iProtocol,defConnection); + if (!ret) + { + Backend()->AddSocket(this); + } + } + else // No connection preference is set + { + ret = iSocket.Open(*iSockServPtr,addrfamily,iStyle,iProtocol); + } + } + if(KErrNone == ret) { iSocketPtr = &iSocket; @@ -1800,6 +1785,19 @@ return ret; } +void CSocketDesc::TempClose() + { + if (iSocket.SubSessionHandle() != 0) + { + iSocketPtr = NULL; + iSocket.CancelAll(); + TRequestStatus status; + iSocket.Shutdown(RSocket::EImmediate, status); + User::WaitForRequest(status); + iSocket.Close(); + } + } + void CSocketDesc::AccessPointListL(CArrayFixFlat *&aRecordPtr, TInt &aCount) { diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/src/syscall/handlenms.cpp --- a/genericopenlibs/openenvcore/backend/src/syscall/handlenms.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/src/syscall/handlenms.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -146,7 +146,7 @@ /* Get the default RConnection instance and use it if configured. NOTE: This RConnection, if configured, would be created using the socket server on backend. The same server has to be used here */ - RConnection defConnection = Backend()->GetDefaultConnection(); + RConnection& defConnection = Backend()->GetDefaultConnection(); if(defConnection.SubSessionHandle() != 0) { err = hr.Open(ss, AF_INET, IPPROTO_UDP,defConnection); @@ -324,7 +324,7 @@ /* Get the default RConnection instance and use it if configured. NOTE: This RConnection, if configured, would be created using the socket server on backend. The same server has to be used here */ - RConnection defConnection = Backend()->GetDefaultConnection(); + RConnection& defConnection = Backend()->GetDefaultConnection(); if(defConnection.SubSessionHandle() != 0) { err=r.Open(ss, format, IPPROTO_UDP, defConnection); @@ -418,7 +418,7 @@ /* Get the default RConnection instance and use it if configured. NOTE: This RConnection, if configured, would be created using the socket server on backend. The same server has to be used here */ - RConnection defConnection = Backend()->GetDefaultConnection(); + RConnection& defConnection = Backend()->GetDefaultConnection(); if (defConnection.SubSessionHandle() != 0) { err = r.Open(ss, AF_INET, IPPROTO_UDP, defConnection); @@ -637,7 +637,7 @@ /* Get the default RConnection instance and use it if configured. NOTE: This RConnection, if configured, would be created using the socket server on backend. The same server has to be used here */ - RConnection defConnection = Backend()->GetDefaultConnection(); + RConnection& defConnection = Backend()->GetDefaultConnection(); if(defConnection.SubSessionHandle() != 0) err = resolver.Open(sockServ, KAfInet, KProtocolInetUdp, defConnection); else diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/test/testbackenddes/src/tbackenddesserver.cpp --- a/genericopenlibs/openenvcore/backend/test/testbackenddes/src/tbackenddesserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/test/testbackenddes/src/tbackenddesserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -71,7 +71,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/backend/test/testlibcbackend/src/tlibcbackendserver.cpp --- a/genericopenlibs/openenvcore/backend/test/testlibcbackend/src/tlibcbackendserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/test/testlibcbackend/src/tlibcbackendserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -94,7 +94,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/include/math.h --- a/genericopenlibs/openenvcore/include/math.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/include/math.h Wed Aug 18 11:27:44 2010 +0300 @@ -17,7 +17,7 @@ */ #ifndef _MATH_H_ -#define _MATH_H_ +#define _MATH_H_ #ifdef __SYMBIAN32__ @@ -41,6 +41,11 @@ #ifdef __SYMBIAN32__ #include <_ansi.h> +#ifdef __WINSCW__ +#ifndef __SOFTFP +#define __SOFTFP +#endif /* __SOFTFP */ +#endif//__WINSCW__ #endif //__SYMBIAN32__ #include @@ -54,7 +59,7 @@ #include "signgam.h" // IEC 559 math functionality -#define __STDC_IEC_559__ 1 +#define __STDC_IEC_559__ 1 #endif //__SYMBIAN32__ /* @@ -62,142 +67,142 @@ */ #ifndef __SYMBIAN32__ extern const union __infinity_un { - unsigned char __uc[8]; - double __ud; + unsigned char __uc[8]; + double __ud; } __infinity; extern const union __nan_un { - unsigned char __uc[sizeof(float)]; - float __uf; + unsigned char __uc[sizeof(float)]; + float __uf; } __nan; #endif //__SYMBIAN32__ #if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800) -#define __MATH_BUILTIN_CONSTANTS +#define __MATH_BUILTIN_CONSTANTS #endif #if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER) -#define __MATH_BUILTIN_RELOPS +#define __MATH_BUILTIN_RELOPS #endif #ifdef __SYMBIAN32__ -#define HUGE_VAL __infinite(1.0) +#define HUGE_VAL __infinite(1.0) #else #ifdef __MATH_BUILTIN_CONSTANTS -#define HUGE_VAL __builtin_huge_val() +#define HUGE_VAL __builtin_huge_val() #else -#define HUGE_VAL (__infinity.__ud) +#define HUGE_VAL (__infinity.__ud) #endif #endif //__SYMBIAN32__ #if __ISO_C_VISIBLE >= 1999 -#define FP_ILOGB0 (-__INT_MAX) -#define FP_ILOGBNAN __INT_MAX +#define FP_ILOGB0 (-__INT_MAX) +#define FP_ILOGBNAN __INT_MAX #ifdef __MATH_BUILTIN_CONSTANTS -#define HUGE_VALF __builtin_huge_valf() -#define HUGE_VALL __builtin_huge_vall() -#define INFINITY __builtin_inf() -#define NAN __builtin_nan("") +#define HUGE_VALF __builtin_huge_valf() +#define HUGE_VALL __builtin_huge_vall() +#define INFINITY __builtin_inf() +#define NAN __builtin_nan("") #else -#define HUGE_VALF (float)HUGE_VAL -#define HUGE_VALL (long double)HUGE_VAL -#define INFINITY HUGE_VALF +#define HUGE_VALF (float)HUGE_VAL +#define HUGE_VALL (long double)HUGE_VAL +#define INFINITY HUGE_VALF #ifdef __SYMBIAN32__ -#define NAN nanvalf() +#define NAN nanvalf() #else -#define NAN (__nan.__uf) +#define NAN (__nan.__uf) #endif //__SYMBIAN32__ #endif /* __MATH_BUILTIN_CONSTANTS */ -#define MATH_ERRNO 1 -#define MATH_ERREXCEPT 2 -#define math_errhandling MATH_ERREXCEPT +#define MATH_ERRNO 1 +#define MATH_ERREXCEPT 2 +#define math_errhandling MATH_ERREXCEPT /* XXX We need a . */ #if defined(__ia64__) || defined(__sparc64__) -#define FP_FAST_FMA +#define FP_FAST_FMA #endif #ifdef __ia64__ -#define FP_FAST_FMAL +#define FP_FAST_FMAL #endif -#define FP_FAST_FMAF +#define FP_FAST_FMAF /* Symbolic constants to classify floating point numbers. */ -#define FP_INFINITE 0x01 -#define FP_NAN 0x02 -#define FP_NORMAL 0x04 -#define FP_SUBNORMAL 0x08 -#define FP_ZERO 0x10 +#define FP_INFINITE 0x01 +#define FP_NAN 0x02 +#define FP_NORMAL 0x04 +#define FP_SUBNORMAL 0x08 +#define FP_ZERO 0x10 -#define fpclassify(x) \ +#define fpclassify(x) \ ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \ : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \ : __fpclassifyl(x)) -#define isfinite(x) \ - ((sizeof (x) == sizeof (float)) ? __isfinitef(x) \ - : (sizeof (x) == sizeof (double)) ? __isfinite(x) \ +#define isfinite(x) \ + ((sizeof (x) == sizeof (float)) ? __isfinitef(x) \ + : (sizeof (x) == sizeof (double)) ? __isfinite(x) \ : __isfinitel(x)) -#define isinf(x) \ - ((sizeof (x) == sizeof (float)) ? __isinff(x) \ - : (sizeof (x) == sizeof (double)) ? __isinf(x) \ +#define isinf(x) \ + ((sizeof (x) == sizeof (float)) ? __isinff(x) \ + : (sizeof (x) == sizeof (double)) ? __isinf(x) \ : __isinfl(x)) -#define isnan(x) \ - ((sizeof (x) == sizeof (float)) ? __isnanf(x) \ - : (sizeof (x) == sizeof (double)) ? __isnan(x) \ +#define isnan(x) \ + ((sizeof (x) == sizeof (float)) ? __isnanf(x) \ + : (sizeof (x) == sizeof (double)) ? __isnan(x) \ : __isnanl(x)) -#define isnormal(x) \ - ((sizeof (x) == sizeof (float)) ? __isnormalf(x) \ - : (sizeof (x) == sizeof (double)) ? __isnormal(x) \ +#define isnormal(x) \ + ((sizeof (x) == sizeof (float)) ? __isnormalf(x) \ + : (sizeof (x) == sizeof (double)) ? __isnormal(x) \ : __isnormall(x)) #ifdef __MATH_BUILTIN_RELOPS -#define isgreater(x, y) __builtin_isgreater((x), (y)) -#define isgreaterequal(x, y) __builtin_isgreaterequal((x), (y)) -#define isless(x, y) __builtin_isless((x), (y)) -#define islessequal(x, y) __builtin_islessequal((x), (y)) -#define islessgreater(x, y) __builtin_islessgreater((x), (y)) -#define isunordered(x, y) __builtin_isunordered((x), (y)) +#define isgreater(x, y) __builtin_isgreater((x), (y)) +#define isgreaterequal(x, y) __builtin_isgreaterequal((x), (y)) +#define isless(x, y) __builtin_isless((x), (y)) +#define islessequal(x, y) __builtin_islessequal((x), (y)) +#define islessgreater(x, y) __builtin_islessgreater((x), (y)) +#define isunordered(x, y) __builtin_isunordered((x), (y)) #else -#define isgreater(x, y) (!isunordered((x), (y)) && (x) > (y)) -#define isgreaterequal(x, y) (!isunordered((x), (y)) && (x) >= (y)) -#define isless(x, y) (!isunordered((x), (y)) && (x) < (y)) -#define islessequal(x, y) (!isunordered((x), (y)) && (x) <= (y)) -#define islessgreater(x, y) (!isunordered((x), (y)) && \ - ((x) > (y) || (y) > (x))) -#define isunordered(x, y) (isnan(x) || isnan(y)) +#define isgreater(x, y) (!isunordered((x), (y)) && (x) > (y)) +#define isgreaterequal(x, y) (!isunordered((x), (y)) && (x) >= (y)) +#define isless(x, y) (!isunordered((x), (y)) && (x) < (y)) +#define islessequal(x, y) (!isunordered((x), (y)) && (x) <= (y)) +#define islessgreater(x, y) (!isunordered((x), (y)) && \ + ((x) > (y) || (y) > (x))) +#define isunordered(x, y) (isnan(x) || isnan(y)) #endif /* __MATH_BUILTIN_RELOPS */ -#define signbit(x) \ - ((sizeof (x) == sizeof (float)) ? __signbitf(x) \ - : (sizeof (x) == sizeof (double)) ? __signbit(x) \ +#define signbit(x) \ + ((sizeof (x) == sizeof (float)) ? __signbitf(x) \ + : (sizeof (x) == sizeof (double)) ? __signbit(x) \ : __signbitl(x)) -typedef __double_t double_t; -typedef __float_t float_t; +typedef __double_t double_t; +typedef __float_t float_t; #endif /* __ISO_C_VISIBLE >= 1999 */ /* * XOPEN/SVID */ #if __BSD_VISIBLE || __XSI_VISIBLE -#define M_E 2.7182818284590452354 /* e */ -#define M_LOG2E 1.4426950408889634074 /* log 2e */ -#define M_LOG10E 0.43429448190325182765 /* log 10e */ -#define M_LN2 0.69314718055994530942 /* log e2 */ -#define M_LN10 2.30258509299404568402 /* log e10 */ -#define M_PI 3.14159265358979323846 /* pi */ -#define M_PI_2 1.57079632679489661923 /* pi/2 */ -#define M_PI_4 0.78539816339744830962 /* pi/4 */ -#define M_1_PI 0.31830988618379067154 /* 1/pi */ -#define M_2_PI 0.63661977236758134308 /* 2/pi */ -#define M_2_SQRTPI 1.12837916709551257390 /* 2/sqrt(pi) */ -#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ -#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ +#define M_E 2.7182818284590452354 /* e */ +#define M_LOG2E 1.4426950408889634074 /* log 2e */ +#define M_LOG10E 0.43429448190325182765 /* log 10e */ +#define M_LN2 0.69314718055994530942 /* log e2 */ +#define M_LN10 2.30258509299404568402 /* log e10 */ +#define M_PI 3.14159265358979323846 /* pi */ +#define M_PI_2 1.57079632679489661923 /* pi/2 */ +#define M_PI_4 0.78539816339744830962 /* pi/4 */ +#define M_1_PI 0.31830988618379067154 /* 1/pi */ +#define M_2_PI 0.63661977236758134308 /* 2/pi */ +#define M_2_SQRTPI 1.12837916709551257390 /* 2/sqrt(pi) */ +#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */ +#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */ -#define MAXFLOAT ((float)3.40282346638528860e+38) +#define MAXFLOAT ((float)3.40282346638528860e+38) #ifdef __SYMBIAN32__ #ifndef __WINSCW__ extern int _signgam; @@ -210,9 +215,9 @@ #if __BSD_VISIBLE #if 0 /* Old value from 4.4BSD-Lite math.h; this is probably better. */ -#define HUGE HUGE_VAL +#define HUGE HUGE_VAL #else -#define HUGE MAXFLOAT +#define HUGE MAXFLOAT #endif #endif /* __BSD_VISIBLE */ @@ -226,207 +231,207 @@ * ANSI/POSIX */ #ifdef __SYMBIAN32__ -IMPORT_C double __infinite(double x); -IMPORT_C float __infinitef(float x); +IMPORT_C double __infinite(double x) __SOFTFP; +IMPORT_C float __infinitef(float x) __SOFTFP; -IMPORT_C double nanval(void ); -IMPORT_C float nanvalf(void ); +IMPORT_C double nanval(void )__SOFTFP; +IMPORT_C float nanvalf(void ) __SOFTFP; #endif //__SYMBIAN32__ -IMPORT_C int __fpclassifyd(double) __pure2; -IMPORT_C int __fpclassifyf(float) __pure2; -IMPORT_C int __fpclassifyl(long double) __pure2; -IMPORT_C int __isfinitef(float) __pure2; -IMPORT_C int __isfinite(double) __pure2; -IMPORT_C int __isfinitel(long double) __pure2; -IMPORT_C int __isinf(double) __pure2; -IMPORT_C int __isinff(float) __pure2; -IMPORT_C int __isinfl(long double) __pure2; +IMPORT_C int __fpclassifyd(double) __SOFTFP __pure2; +IMPORT_C int __fpclassifyf(float) __SOFTFP __pure2; +IMPORT_C int __fpclassifyl(long double) __SOFTFP __pure2; +IMPORT_C int __isfinitef(float) __SOFTFP __pure2; +IMPORT_C int __isfinite(double) __SOFTFP __pure2; +IMPORT_C int __isfinitel(long double) __SOFTFP __pure2; +IMPORT_C int __isinf(double) __SOFTFP __pure2; +IMPORT_C int __isinff(float) __SOFTFP __pure2; +IMPORT_C int __isinfl(long double) __SOFTFP __pure2; #ifdef __SYMBIAN32__ -IMPORT_C int __isnan(double) __pure2; -IMPORT_C int __isnanf(float) __pure2; +IMPORT_C int __isnan(double) __SOFTFP __pure2; +IMPORT_C int __isnanf(float) __SOFTFP __pure2; #endif //__SYMBIAN32__ -IMPORT_C int __isnanl(long double) __pure2; -IMPORT_C int __isnormalf(float) __pure2; -IMPORT_C int __isnormal(double) __pure2; -IMPORT_C int __isnormall(long double) __pure2; -IMPORT_C int __signbit(double) __pure2; -IMPORT_C int __signbitf(float) __pure2; -IMPORT_C int __signbitl(long double) __pure2; +IMPORT_C int __isnanl(long double) __SOFTFP __pure2; +IMPORT_C int __isnormalf(float) __SOFTFP __pure2; +IMPORT_C int __isnormal(double) __SOFTFP __pure2; +IMPORT_C int __isnormall(long double) __SOFTFP __pure2; +IMPORT_C int __signbit(double) __SOFTFP __pure2; +IMPORT_C int __signbitf(float) __SOFTFP __pure2; +IMPORT_C int __signbitl(long double) __SOFTFP __pure2; -IMPORT_C double acos(double); -IMPORT_C double asin(double); -IMPORT_C double atan(double); -IMPORT_C double atan2(double, double); -IMPORT_C double cos(double); -IMPORT_C double sin(double); -IMPORT_C double tan(double); +IMPORT_C double acos(double) __SOFTFP; +IMPORT_C double asin(double) __SOFTFP; +IMPORT_C double atan(double) __SOFTFP; +IMPORT_C double atan2(double, double) __SOFTFP; +IMPORT_C double cos(double) __SOFTFP; +IMPORT_C double sin(double) __SOFTFP; +IMPORT_C double tan(double) __SOFTFP; -IMPORT_C double cosh(double); -IMPORT_C double sinh(double); -IMPORT_C double tanh(double); +IMPORT_C double cosh(double) __SOFTFP; +IMPORT_C double sinh(double) __SOFTFP; +IMPORT_C double tanh(double) __SOFTFP; -IMPORT_C double exp(double); -IMPORT_C double frexp(double, int *); /* fundamentally !__pure2 */ -IMPORT_C double ldexp(double, int); -IMPORT_C double log(double); -IMPORT_C double log10(double); -IMPORT_C double modf(double, double *); /* fundamentally !__pure2 */ +IMPORT_C double exp(double) __SOFTFP; +IMPORT_C double frexp(double, int *) __SOFTFP; /* fundamentally !__pure2 */ +IMPORT_C double ldexp(double, int) __SOFTFP; +IMPORT_C double log(double) __SOFTFP; +IMPORT_C double log10(double) __SOFTFP; +IMPORT_C double modf(double, double *) __SOFTFP; /* fundamentally !__pure2 */ -IMPORT_C double pow(double, double); -IMPORT_C double sqrt(double); +IMPORT_C double pow(double, double) __SOFTFP; +IMPORT_C double sqrt(double) __SOFTFP; -IMPORT_C double ceil(double); -IMPORT_C double fabs(double) __pure2; -IMPORT_C double floor(double); -IMPORT_C double fmod(double, double); +IMPORT_C double ceil(double) __SOFTFP; +IMPORT_C double fabs(double) __SOFTFP __pure2; +IMPORT_C double floor(double) __SOFTFP; +IMPORT_C double fmod(double, double) __SOFTFP; /* * These functions are not in C90. */ #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE -IMPORT_C double acosh(double); -IMPORT_C double asinh(double); -IMPORT_C double atanh(double); -IMPORT_C double cbrt(double); -IMPORT_C double erf(double); -IMPORT_C double erfc(double); -IMPORT_C double exp2(double); -IMPORT_C double expm1(double); -IMPORT_C double fma(double, double, double); -IMPORT_C double hypot(double, double); +IMPORT_C double acosh(double) __SOFTFP; +IMPORT_C double asinh(double) __SOFTFP; +IMPORT_C double atanh(double) __SOFTFP; +IMPORT_C double cbrt(double) __SOFTFP; +IMPORT_C double erf(double) __SOFTFP; +IMPORT_C double erfc(double) __SOFTFP; +IMPORT_C double exp2(double) __SOFTFP; +IMPORT_C double expm1(double) __SOFTFP; +IMPORT_C double fma(double, double, double) __SOFTFP; +IMPORT_C double hypot(double, double) __SOFTFP; -IMPORT_C int ilogb(double) __pure2; +IMPORT_C int ilogb(double) __SOFTFP __pure2; /* -int (isinf)(double) __pure2; -int (isnan)(double) __pure2; +int (isinf)(double) __pure2; +int (isnan)(double) __pure2; */ -IMPORT_C double lgamma(double); -IMPORT_C long long llrint(double); -IMPORT_C long long llround(double); -IMPORT_C double log1p(double); -IMPORT_C double logb(double); -IMPORT_C long lrint(double); -IMPORT_C long lround(double); -IMPORT_C double nextafter(double, double); -IMPORT_C double remainder(double, double); -IMPORT_C double remquo(double, double, int *); -IMPORT_C double rint(double); +IMPORT_C double lgamma(double) __SOFTFP; +IMPORT_C long long llrint(double) __SOFTFP; +IMPORT_C long long llround(double) __SOFTFP; +IMPORT_C double log1p(double) __SOFTFP; +IMPORT_C double logb(double) __SOFTFP; +IMPORT_C long lrint(double) __SOFTFP; +IMPORT_C long lround(double) __SOFTFP; +IMPORT_C double nextafter(double, double) __SOFTFP; +IMPORT_C double remainder(double, double) __SOFTFP; +IMPORT_C double remquo(double, double, int *) __SOFTFP; +IMPORT_C double rint(double) __SOFTFP; #endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */ #if __BSD_VISIBLE || __XSI_VISIBLE -IMPORT_C double j0(double); -IMPORT_C double j1(double); -IMPORT_C double jn(int, double); -IMPORT_C double scalb(double, double); -IMPORT_C double y0(double); -IMPORT_C double y1(double); -IMPORT_C double yn(int, double); +IMPORT_C double j0(double) __SOFTFP; +IMPORT_C double j1(double) __SOFTFP; +IMPORT_C double jn(int, double) __SOFTFP; +IMPORT_C double scalb(double, double) __SOFTFP; +IMPORT_C double y0(double) __SOFTFP; +IMPORT_C double y1(double) __SOFTFP; +IMPORT_C double yn(int, double) __SOFTFP; #if __XSI_VISIBLE <= 500 || __BSD_VISIBLE -IMPORT_C double gamma(double); +IMPORT_C double gamma(double) __SOFTFP; #endif #endif /* __BSD_VISIBLE || __XSI_VISIBLE */ #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 -IMPORT_C double copysign(double, double) __pure2; -IMPORT_C double fdim(double, double); -IMPORT_C double fmax(double, double) __pure2; -IMPORT_C double fmin(double, double) __pure2; -IMPORT_C double nearbyint(double); -IMPORT_C double round(double); -IMPORT_C double scalbln(double, long); -IMPORT_C double scalbn(double, int); -IMPORT_C double trunc(double); +IMPORT_C double copysign(double, double) __SOFTFP __pure2; +IMPORT_C double fdim(double, double) __SOFTFP; +IMPORT_C double fmax(double, double) __SOFTFP __pure2; +IMPORT_C double fmin(double, double) __SOFTFP __pure2; +IMPORT_C double nearbyint(double) __SOFTFP; +IMPORT_C double round(double) __SOFTFP; +IMPORT_C double scalbln(double, long) __SOFTFP; +IMPORT_C double scalbn(double, int) __SOFTFP; +IMPORT_C double trunc(double) __SOFTFP; #endif /* * BSD math library entry points */ #if __BSD_VISIBLE -IMPORT_C double drem(double, double); -IMPORT_C int finite(double) __pure2; -IMPORT_C int isnanf(float) __pure2; +IMPORT_C double drem(double, double) __SOFTFP; +IMPORT_C int finite(double) __SOFTFP __pure2; +IMPORT_C int isnanf(float) __SOFTFP __pure2; /* * Reentrant version of gamma & lgamma; passes signgam back by reference * as the second argument; user must allocate space for signgam. */ -IMPORT_C double lgamma_r(double, int *); +IMPORT_C double lgamma_r(double, int *) __SOFTFP; /* * IEEE Test Vector */ -IMPORT_C double significand(double); +IMPORT_C double significand(double) __SOFTFP; #endif /* __BSD_VISIBLE */ /* float versions of ANSI/POSIX functions */ #if __ISO_C_VISIBLE >= 1999 -IMPORT_C float acosf(float); +IMPORT_C float acosf(float) __SOFTFP; -IMPORT_C float acosf(float); -IMPORT_C float asinf(float); -IMPORT_C float atanf(float); -IMPORT_C float atan2f(float, float); -IMPORT_C float cosf(float); -IMPORT_C float sinf(float); -IMPORT_C float tanf(float); +IMPORT_C float acosf(float) __SOFTFP; +IMPORT_C float asinf(float) __SOFTFP; +IMPORT_C float atanf(float) __SOFTFP; +IMPORT_C float atan2f(float, float) __SOFTFP; +IMPORT_C float cosf(float) __SOFTFP; +IMPORT_C float sinf(float) __SOFTFP; +IMPORT_C float tanf(float) __SOFTFP; -IMPORT_C float coshf(float); -IMPORT_C float sinhf(float); -IMPORT_C float tanhf(float); -IMPORT_C float exp2f(float); -IMPORT_C float expf(float); -IMPORT_C float expm1f(float); -IMPORT_C float frexpf(float, int *); /* fundamentally !__pure2 */ -IMPORT_C int ilogbf(float) __pure2; +IMPORT_C float coshf(float) __SOFTFP; +IMPORT_C float sinhf(float) __SOFTFP; +IMPORT_C float tanhf(float) __SOFTFP; +IMPORT_C float exp2f(float) __SOFTFP; +IMPORT_C float expf(float) __SOFTFP; +IMPORT_C float expm1f(float) __SOFTFP; +IMPORT_C float frexpf(float, int *) __SOFTFP; /* fundamentally !__pure2 */ +IMPORT_C int ilogbf(float) __SOFTFP __pure2; #ifndef __SYMBIAN32__ -float ldexpf(float, int); +float ldexpf(float, int); #endif //__SYMBIAN32__ -IMPORT_C float log10f(float); -IMPORT_C float log1pf(float); -IMPORT_C float logf(float); -IMPORT_C float modff(float, float *); /* fundamentally !__pure2 */ +IMPORT_C float log10f(float) __SOFTFP; +IMPORT_C float log1pf(float) __SOFTFP; +IMPORT_C float logf(float) __SOFTFP; +IMPORT_C float modff(float, float *) __SOFTFP; /* fundamentally !__pure2 */ -IMPORT_C float powf(float, float); -IMPORT_C float sqrtf(float); +IMPORT_C float powf(float, float) __SOFTFP; +IMPORT_C float sqrtf(float) __SOFTFP; -IMPORT_C float ceilf(float); -IMPORT_C float fabsf(float) __pure2; -IMPORT_C float floorf(float); -IMPORT_C float fmodf(float, float); -IMPORT_C float roundf(float); +IMPORT_C float ceilf(float) __SOFTFP; +IMPORT_C float fabsf(float) __SOFTFP __pure2; +IMPORT_C float floorf(float) __SOFTFP; +IMPORT_C float fmodf(float, float) __SOFTFP; +IMPORT_C float roundf(float) __SOFTFP; -IMPORT_C float erff(float); -IMPORT_C float erfcf(float); -IMPORT_C float hypotf(float, float); -IMPORT_C float lgammaf(float); +IMPORT_C float erff(float) __SOFTFP; +IMPORT_C float erfcf(float) __SOFTFP; +IMPORT_C float hypotf(float, float) __SOFTFP; +IMPORT_C float lgammaf(float) __SOFTFP; -IMPORT_C float acoshf(float); -IMPORT_C float asinhf(float); -IMPORT_C float atanhf(float); -IMPORT_C float cbrtf(float); -IMPORT_C float logbf(float); -IMPORT_C float copysignf(float, float) __pure2; -IMPORT_C long long llrintf(float); -IMPORT_C long long llroundf(float); -IMPORT_C long lrintf(float); -IMPORT_C long lroundf(float); -IMPORT_C float nearbyintf(float); -IMPORT_C float nextafterf(float, float); -IMPORT_C float remainderf(float, float); -IMPORT_C float remquof(float, float, int *); -IMPORT_C float rintf(float); -IMPORT_C float scalblnf(float, long); -IMPORT_C float scalbnf(float, int); -IMPORT_C float truncf(float); +IMPORT_C float acoshf(float) __SOFTFP; +IMPORT_C float asinhf(float) __SOFTFP; +IMPORT_C float atanhf(float) __SOFTFP; +IMPORT_C float cbrtf(float) __SOFTFP; +IMPORT_C float logbf(float) __SOFTFP; +IMPORT_C float copysignf(float, float) __SOFTFP __pure2; +IMPORT_C long long llrintf(float) __SOFTFP; +IMPORT_C long long llroundf(float) __SOFTFP; +IMPORT_C long lrintf(float) __SOFTFP; +IMPORT_C long lroundf(float) __SOFTFP; +IMPORT_C float nearbyintf(float) __SOFTFP; +IMPORT_C float nextafterf(float, float) __SOFTFP; +IMPORT_C float remainderf(float, float) __SOFTFP; +IMPORT_C float remquof(float, float, int *) __SOFTFP; +IMPORT_C float rintf(float) __SOFTFP; +IMPORT_C float scalblnf(float, long) __SOFTFP; +IMPORT_C float scalbnf(float, int) __SOFTFP; +IMPORT_C float truncf(float) __SOFTFP; -IMPORT_C float fdimf(float, float); -IMPORT_C float fmaf(float, float, float); -IMPORT_C float fmaxf(float, float) __pure2; -IMPORT_C float fminf(float, float) __pure2; +IMPORT_C float fdimf(float, float) __SOFTFP; +IMPORT_C float fmaf(float, float, float) __SOFTFP; +IMPORT_C float fmaxf(float, float) __SOFTFP __pure2; +IMPORT_C float fminf(float, float) __SOFTFP __pure2; #endif /* @@ -435,134 +440,134 @@ #if __BSD_VISIBLE #ifdef __SYMBIAN_COMPILE_UNUSED__ -float dremf(float, float); +float dremf(float, float); #endif -IMPORT_C int finitef(float) __pure2; -IMPORT_C float gammaf(float); -IMPORT_C float j0f(float); -IMPORT_C float j1f(float); -IMPORT_C float jnf(int, float); -IMPORT_C float scalbf(float, float); -IMPORT_C float y0f(float); -IMPORT_C float y1f(float); -IMPORT_C float ynf(int, float); +IMPORT_C int finitef(float) __SOFTFP __pure2; +IMPORT_C float gammaf(float) __SOFTFP; +IMPORT_C float j0f(float) __SOFTFP; +IMPORT_C float j1f(float) __SOFTFP; +IMPORT_C float jnf(int, float) __SOFTFP; +IMPORT_C float scalbf(float, float) __SOFTFP; +IMPORT_C float y0f(float) __SOFTFP; +IMPORT_C float y1f(float) __SOFTFP; +IMPORT_C float ynf(int, float) __SOFTFP; /* * Float versions of reentrant version of gamma & lgamma; passes * signgam back by reference as the second argument; user must * allocate space for signgam. */ -IMPORT_C float lgammaf_r(float, int *); +IMPORT_C float lgammaf_r(float, int *) __SOFTFP; /* * float version of IEEE Test Vector */ -IMPORT_C float significandf(float); -#endif /* __BSD_VISIBLE */ +IMPORT_C float significandf(float) __SOFTFP; +#endif /* __BSD_VISIBLE */ /* * long double versions of ISO/POSIX math functions */ #if __ISO_C_VISIBLE >= 1999 #if 0 -long double acoshl(long double); -long double acosl(long double); -long double asinhl(long double); -long double asinl(long double); -long double atan2l(long double, long double); -long double atanhl(long double); -long double atanl(long double); -long double cbrtl(long double); +long double acoshl(long double); +long double acosl(long double); +long double asinhl(long double); +long double asinl(long double); +long double atan2l(long double, long double); +long double atanhl(long double); +long double atanl(long double); +long double cbrtl(long double); #endif #ifndef __SYMBIAN32__ -long double ceill(long double); +long double ceill(long double); #endif //__SYMBIAN32__ -IMPORT_C long double copysignl(long double, long double) __pure2; +IMPORT_C long double copysignl(long double, long double) __SOFTFP __pure2; #if 0 -long double coshl(long double); -long double cosl(long double); -long double erfcl(long double); -long double erfl(long double); -long double exp2l(long double); -long double expl(long double); -long double expm1l(long double); +long double coshl(long double); +long double cosl(long double); +long double erfcl(long double); +long double erfl(long double); +long double exp2l(long double); +long double expl(long double); +long double expm1l(long double); #endif -IMPORT_C long double fabsl(long double) __pure2; -IMPORT_C long double fdiml(long double, long double); +IMPORT_C long double fabsl(long double) __SOFTFP __pure2; +IMPORT_C long double fdiml(long double, long double) __SOFTFP; #ifndef __SYMBIAN32__ -long double floorl(long double); -long double fmal(long double, long double, long double); +long double floorl(long double); +long double fmal(long double, long double, long double); #endif //__SYMBIAN32__ -IMPORT_C long double fmaxl(long double, long double) __pure2; +IMPORT_C long double fmaxl(long double, long double) __SOFTFP __pure2; #ifndef __SYMBIAN32__ -long double fminl(long double, long double) __pure2; +long double fminl(long double, long double) __pure2; #endif //__SYMBIAN32__ #if 0 -long double fmodl(long double, long double); +long double fmodl(long double, long double); #endif #ifndef __SYMBIAN32__ -long double frexpl(long double value, int *); /* fundamentally !__pure2 */ +long double frexpl(long double value, int *); /* fundamentally !__pure2 */ #endif //__SYMBIAN32__ #if 0 -long double hypotl(long double, long double); +long double hypotl(long double, long double); #endif -IMPORT_C int ilogbl(long double) __pure2; +IMPORT_C int ilogbl(long double) __SOFTFP __pure2; #ifndef __SYMBIAN32__ -long double ldexpl(long double, int); +long double ldexpl(long double, int); #endif //__SYMBIAN32__ #if 0 -long double lgammal(long double); -long long llrintl(long double); +long double lgammal(long double); +long long llrintl(long double); #endif #ifndef __SYMBIAN32__ -long long llroundl(long double); +long long llroundl(long double); #endif //__SYMBIAN32__ #if 0 -long double log10l(long double); -long double log1pl(long double); -long double log2l(long double); -long double logbl(long double); -long double logl(long double); -long lrintl(long double); +long double log10l(long double); +long double log1pl(long double); +long double log2l(long double); +long double logbl(long double); +long double logl(long double); +long lrintl(long double); #endif #ifndef __SYMBIAN32__ -long lroundl(long double); +long lroundl(long double); #endif //__SYMBIAN32__ #if 0 -long double modfl(long double, long double *); /* fundamentally !__pure2 */ -long double nanl(const char *) __pure2; -long double nearbyintl(long double); +long double modfl(long double, long double *); /* fundamentally !__pure2 */ +long double nanl(const char *) __pure2; +long double nearbyintl(long double); #endif #ifndef __SYMBIAN32__ -long double nextafterl(long double, long double); -double nexttoward(double, long double); +long double nextafterl(long double, long double); +double nexttoward(double, long double); #endif //__SYMBIAN32__ -IMPORT_C float nexttowardf(float, long double); +IMPORT_C float nexttowardf(float, long double) __SOFTFP; #ifndef __SYMBIAN32__ -long double nexttowardl(long double, long double); +long double nexttowardl(long double, long double); #endif //__SYMBIAN32__ #if 0 -long double powl(long double, long double); -long double remainderl(long double, long double); -long double remquol(long double, long double, int *); -long double rintl(long double); +long double powl(long double, long double); +long double remainderl(long double, long double); +long double remquol(long double, long double, int *); +long double rintl(long double); #endif #ifndef __SYMBIAN32__ -long double roundl(long double); +long double roundl(long double); #endif //__SYMBIAN32__ -IMPORT_C long double scalblnl(long double, long); +IMPORT_C long double scalblnl(long double, long) __SOFTFP; #ifndef __SYMBIAN32__ -long double scalbnl(long double, int); +long double scalbnl(long double, int); #endif //__SYMBIAN32__ #if 0 -long double sinhl(long double); -long double sinl(long double); -long double sqrtl(long double); -long double tanhl(long double); -long double tanl(long double); +long double sinhl(long double); +long double sinl(long double); +long double sqrtl(long double); +long double tanhl(long double); +long double tanl(long double); #endif -IMPORT_C long double truncl(long double); +IMPORT_C long double truncl(long double) __SOFTFP; #endif /* __ISO_C_VISIBLE >= 1999 */ __END_DECLS diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/include/stdlib.h --- a/genericopenlibs/openenvcore/include/stdlib.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/include/stdlib.h Wed Aug 18 11:27:44 2010 +0300 @@ -49,6 +49,14 @@ #include <_ansi.h> +#ifdef __SYMBIAN32__ +#ifdef __WINSCW__ +#ifndef __SOFTFP +#define __SOFTFP +#endif /* __SOFTFP */ +#endif//__WINSCW__ +#endif//__SYMBIAN32__ + #if __BSD_VISIBLE #ifndef _RUNE_T_DECLARED typedef __rune_t rune_t; @@ -118,7 +126,7 @@ IMPORT_C void abort(void) __dead2; IMPORT_C int abs(int) __pure2; IMPORT_C int atexit(void (*)(void)); -IMPORT_C double atof(const char *); +IMPORT_C double atof(const char *) __SOFTFP; IMPORT_C int atoi(const char *); IMPORT_C long atol(const char *); IMPORT_C void *bsearch(const void *, const void *, size_t, @@ -139,16 +147,16 @@ IMPORT_C int rand(void); IMPORT_C void *realloc(void *, size_t); IMPORT_C void srand(unsigned); -IMPORT_C double strtod(const char * __restrict, char ** __restrict); +IMPORT_C double strtod(const char * __restrict, char ** __restrict) __SOFTFP; IMPORT_C -float strtof(const char * __restrict, char ** __restrict); +float strtof(const char * __restrict, char ** __restrict) __SOFTFP; IMPORT_C long strtol(const char * __restrict, char ** __restrict, int); IMPORT_C long double - strtold(const char * __restrict, char ** __restrict); + strtold(const char * __restrict, char ** __restrict) __SOFTFP; IMPORT_C unsigned long diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/include/time.h --- a/genericopenlibs/openenvcore/include/time.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/include/time.h Wed Aug 18 11:27:44 2010 +0300 @@ -143,6 +143,11 @@ __BEGIN_DECLS #ifdef __SYMBIAN32__ +#ifdef __WINSCW__ +#ifndef __SOFTFP +#define __SOFTFP +#endif /* __SOFTFP */ +#endif//__WINSCW__ IMPORT_C char*** __tzname(void); #define tzname (*__tzname()) #endif //__SYMBIAN32__ @@ -154,7 +159,7 @@ IMPORT_C char *ctime(const time_t *); IMPORT_C -double difftime(time_t, time_t); +double difftime(time_t, time_t) __SOFTFP; /* XXX missing: getdate() */ IMPORT_C struct tm *gmtime(const time_t *); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/include/wchar.h --- a/genericopenlibs/openenvcore/include/wchar.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/include/wchar.h Wed Aug 18 11:27:44 2010 +0300 @@ -81,6 +81,11 @@ #include #ifdef __SYMBIAN32__ #include +#ifdef __WINSCW__ +#ifndef __SOFTFP +#define __SOFTFP +#endif /* __SOFTFP */ +#endif//__WINSCW__ #endif //__SYMBIAN32__ #ifndef _MBSTATE_T_DECLARED @@ -190,7 +195,7 @@ __pure; IMPORT_C size_t wcsxfrm(wchar_t * __restrict, const wchar_t * __restrict, size_t); IMPORT_C int wctob(wint_t); -IMPORT_C double wcstod(const wchar_t * __restrict, wchar_t ** __restrict); +IMPORT_C double wcstod(const wchar_t * __restrict, wchar_t ** __restrict) __SOFTFP; IMPORT_C wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, wchar_t ** __restrict); IMPORT_C long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); @@ -236,9 +241,9 @@ IMPORT_C int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict, va_list); IMPORT_C int vwscanf(const wchar_t * __restrict, va_list); -IMPORT_C float wcstof(const wchar_t * __restrict, wchar_t ** __restrict); +IMPORT_C float wcstof(const wchar_t * __restrict, wchar_t ** __restrict) __SOFTFP; IMPORT_C long double - wcstold(const wchar_t * __restrict, wchar_t ** __restrict); + wcstold(const wchar_t * __restrict, wchar_t ** __restrict) __SOFTFP; #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ IMPORT_C long long diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/src/libc_init/estlib.cpp --- a/genericopenlibs/openenvcore/libc/src/libc_init/estlib.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/libc_init/estlib.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -111,7 +111,8 @@ // void GetTmpDirName() { - TFileName file; + TFileName file; + TInt r = KErrNone; RFs iTestSession; TBuf8 buf1; TInt len; @@ -124,7 +125,11 @@ { User::Panic(_L("LIBRARY-INIT"), KErrNoMemory); } - iTestSession.Connect(); + r = iTestSession.Connect(); + if (r != KErrNone) + { + User::Panic(_L("Connect failed"), r); + } iTestSession.SessionPath(file); buf1.Copy(file); iTestSession.Close(); diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/src/strcoll.cpp --- a/genericopenlibs/openenvcore/libc/src/strcoll.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/src/strcoll.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -140,8 +140,13 @@ static int DoConvertionToUnicode( const char* s1, TUint16* aUnicodeText) { + TInt r = KErrNone; RFs fileSession; - fileSession.Connect(); + r = fileSession.Connect(); + if (r != KErrNone) + { + return r; + } CleanupClosePushL(fileSession); CCnvCharacterSetConverter* conv = CCnvCharacterSetConverter::NewL() ; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testaeselect/src/taeselectserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testaeselect/src/taeselectserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testaeselect/src/taeselectserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -71,7 +71,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testblocksignal/src/tblocksignalserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testblocksignal/src/tblocksignalserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testblocksignal/src/tblocksignalserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -67,7 +67,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapfcntl/src/tfcntlserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapfcntl/src/tfcntlserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapfcntl/src/tfcntlserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -79,7 +79,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapioccom/src/tioccomserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapioccom/src/tioccomserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapioccom/src/tioccomserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -79,7 +79,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapipc/src/tipcserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapipc/src/tipcserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapipc/src/tipcserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -78,7 +78,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapsignal/src/tcapsignalserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapsignal/src/tcapsignalserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapsignal/src/tcapsignalserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -69,7 +69,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapsocket/src/tsocketserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapsocket/src/tsocketserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapsocket/src/tsocketserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -80,7 +80,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapstat/src/tstatserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapstat/src/tstatserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapstat/src/tstatserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -79,7 +79,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapstdio/src/tstdioserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapstdio/src/tstdioserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapstdio/src/tstdioserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -79,7 +79,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapsystime/src/tsystimeserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapsystime/src/tsystimeserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapsystime/src/tsystimeserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -79,7 +79,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapunistd/src/tunistdserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapunistd/src/tunistdserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapunistd/src/tunistdserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -79,7 +79,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcaputime/src/tutimeserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcaputime/src/tutimeserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcaputime/src/tutimeserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -78,7 +78,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcapwchar/src/twcharserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcapwchar/src/twcharserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcapwchar/src/twcharserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -76,7 +76,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcomport/scripts/tcomport.script --- a/genericopenlibs/openenvcore/libc/test/testcomport/scripts/tcomport.script Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcomport/scripts/tcomport.script Wed Aug 18 11:27:44 2010 +0300 @@ -25,10 +25,10 @@ END_TESTCASE OPENENV-LIBC-CIT-TESTCOMPORT-OE-0001 //to be run manually -STARTSTART_TESTCASE OPENENV-LIBC-CIT-TESTCOMPORT-OE-0002 +//STARTSTART_TESTCASE OPENENV-LIBC-CIT-TESTCOMPORT-OE-0002 //! @SYMTestCaseID OPENENV-LIBC-CIT-TESTCOMPORT-OE-0002 //! @SYMTestStatus 3.Released //RUN_TEST_STEP !Result=0 10 tcomport test_scanf_COM -END_TESTCASE OPENENV-LIBC-CIT-TESTCOMPORT-OE-0002 +//END_TESTCASE OPENENV-LIBC-CIT-TESTCOMPORT-OE-0002 diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testcomport/src/tcomportserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testcomport/src/tcomportserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testcomport/src/tcomportserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -76,7 +76,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testctype/src/tctypeserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testctype/src/tctypeserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testctype/src/tctypeserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testdb_blr/src/tdb_blrserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testdb_blr/src/tdb_blrserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testdb_blr/src/tdb_blrserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testftw/src/tftwserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testftw/src/tftwserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testftw/src/tftwserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testglob/src/tglobserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testglob/src/tglobserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testglob/src/tglobserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -75,7 +75,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testifioctls/group/tifioctls.pkg --- a/genericopenlibs/openenvcore/libc/test/testifioctls/group/tifioctls.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/group/tifioctls.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -15,7 +15,8 @@ "\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testifioctls\scripts\tifioctls.script"-"c:\tstdapis\tifioctls.script" "\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testifioctls\scripts\tifioctls_hw.script"-"c:\tstdapis\tifioctls_hw.script" -"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testifioctls\scripts\tifioctls_hw_manual.script"-"c:\tstdapis\tifioctls_hw_manual.script" +; commented it as these are manual test +;"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testifioctls\scripts\tifioctls_hw_manual.script"-"c:\tstdapis\tifioctls_hw_manual.script" "\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testifioctls\data\tifioctls.ini"-"c:\tstdapis\tifioctls.ini" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testifioctls/src/tifioctlsserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testinet/src/tinetserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testinet/src/tinetserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testinet/src/tinetserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testlargefile/src/tlargefileserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testlargefile/src/tlargefileserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlargefile/src/tlargefileserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -66,7 +66,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testlibcwchar/src/tlibcwcharserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testlibcwchar/src/tlibcwcharserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlibcwchar/src/tlibcwcharserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testlink/src/tlinkserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testlink/src/tlinkserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlink/src/tlinkserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -75,7 +75,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testlocale/src/tlocaleserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testlocale/src/tlocaleserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlocale/src/tlocaleserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testlocalsocket/src/tlocalsocketserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testlocalsocket/src/tlocalsocketserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlocalsocket/src/tlocalsocketserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testlocblr/src/tlocblrserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testlocblr/src/tlocblrserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testlocblr/src/tlocblrserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -70,7 +70,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testmisc/src/tmiscserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testmisc/src/tmiscserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testmisc/src/tmiscserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -76,7 +76,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testmiscsignal/src/tmiscsignalserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testmiscsignal/src/tmiscsignalserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testmiscsignal/src/tmiscsignalserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -68,7 +68,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testmkfifo/src/tmkfifoserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testmkfifo/src/tmkfifoserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testmkfifo/src/tmkfifoserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testmmap/src/tmmapserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testmmap/src/tmmapserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testmmap/src/tmmapserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testmsgqueue/src/tmsgqueueserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testmsgqueue/src/tmsgqueueserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testmsgqueue/src/tmsgqueueserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -87,7 +87,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testmulticast/src/tmulticastclienttestserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testmulticast/src/tmulticastclienttestserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testmulticast/src/tmulticastclienttestserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testnetdb/src/tnetdbserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testnetdb/src/tnetdbserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testnetdb/src/tnetdbserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testoffsetof/src/toffsetofserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testoffsetof/src/toffsetofserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testoffsetof/src/toffsetofserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -68,7 +68,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testpipe/src/tpipeserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testpipe/src/tpipeserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testpipe/src/tpipeserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testprogname/src/tprognameserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testprogname/src/tprognameserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testprogname/src/tprognameserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testredirectionserver/src/tredirectionserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testredirectionserver/src/tredirectionserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testredirectionserver/src/tredirectionserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -77,7 +77,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testregex/src/tregexserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testregex/src/tregexserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testregex/src/tregexserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testselect/src/tselectserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testselect/src/tselectserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testselect/src/tselectserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsemaphore/src/tsemaphoreblocks.cpp --- a/genericopenlibs/openenvcore/libc/test/testsemaphore/src/tsemaphoreblocks.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsemaphore/src/tsemaphoreblocks.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -1293,17 +1293,14 @@ int semid; union semun arg; INFO_PRINTF1(_L("IntgTest14")); - char *path; - - #if defined (__EPOC32__) - path = "z:\\tstdapis\\tsemaphore.ini"; - #else - path = "c:\\tstdapis\\tsemaphore.ini"; - #endif - - if ((key = ftok(path, 'P')) == -1) + char *path = NULL; + path = "c:\\tstdapis\\tsemaphore.ini"; + + if ((key = ftok(path, 'P')) == -1) { ERR_PRINTF1(_L("ftok error!")); + _LIT(KFunc, "ftok failed with errno %d\n"); + INFO_PRINTF2(KFunc, errno); return KErrGeneral; } diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsemaphore/src/tsemaphoreserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsemaphore/src/tsemaphoreserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsemaphore/src/tsemaphoreserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsendsignal/src/tsendsignalserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsendsignal/src/tsendsignalserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsendsignal/src/tsendsignalserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsetjmp/src/tsetjmpserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsetjmp/src/tsetjmpserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsetjmp/src/tsetjmpserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testshm/src/tshmserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testshm/src/tshmserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testshm/src/tshmserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsocket/group/tsocket.pkg --- a/genericopenlibs/openenvcore/libc/test/testsocket/group/tsocket.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/group/tsocket.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -13,7 +13,7 @@ ;// Description: ;// -"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsocket\scripts\tsocket.script"-"c:\tstdapis\tsocket.script" +;"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsocket\scripts\tsocket.script"-"c:\tstdapis\tsocket.script" "\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsocket\scripts\tsocket_hw.script"-"c:\tstdapis\tsocket_hw.script" "\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsocket\data\tsocket.ini"-"c:\tstdapis\tsocket.ini" "\epoc32\WINSCW\C\socketmorethan16k.txt"-"C:\tstdapis\socketmorethan16k.txt" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsocket/src/tsocketserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -75,7 +75,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/teststdio/group/tstdio.pkg --- a/genericopenlibs/openenvcore/libc/test/teststdio/group/tstdio.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/teststdio/group/tstdio.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -14,9 +14,6 @@ ;// "\epoc32\winscw\c\tstdapis\tstdio_auto.script"-"c:\tstdapis\tstdio_auto.script" -"\epoc32\winscw\c\tstdapis\tstdio_filemode.script"-"c:\tstdapis\tstdio_filemode.script" -"\epoc32\winscw\c\tstdapis\tstdio_manual.script"-"c:\tstdapis\tstdio_manual.script" -"\epoc32\winscw\c\tstdapis\tstdio_fileop.script"-"c:\tstdapis\tstdio_fileop.script" "\epoc32\winscw\c\tstdapis\tstdio.ini"-"c:\tstdapis\tstdio.ini" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/teststdio/group/tstdio1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libc/test/teststdio/group/tstdio1.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,23 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + +"\epoc32\winscw\c\tstdapis\tstdio_filemode.script"-"c:\tstdapis\tstdio_filemode.script" +"\epoc32\winscw\c\tstdapis\tstdio_fileop.script"-"c:\tstdapis\tstdio_fileop.script" +"\epoc32\winscw\c\tstdapis\tstdio.ini"-"c:\tstdapis\tstdio.ini" + + + + + diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/teststdio/src/tstdioserver.cpp --- a/genericopenlibs/openenvcore/libc/test/teststdio/src/tstdioserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/teststdio/src/tstdioserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlibserver.cpp --- a/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlibserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlibserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -71,7 +71,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/teststring/src/tstringserver.cpp --- a/genericopenlibs/openenvcore/libc/test/teststring/src/tstringserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/teststring/src/tstringserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsyscalls/group/tsyscalls.pkg --- a/genericopenlibs/openenvcore/libc/test/testsyscalls/group/tsyscalls.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsyscalls/group/tsyscalls.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -16,8 +16,5 @@ "\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\scripts\tsyscalls.script"-"c:\tstdapis\tsyscalls.script" -"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\scripts\tsyscallsfcntl.script"-"c:\tstdapis\tsyscallsfcntl.script" -"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\scripts\tsyscalls1.script"-"c:\tstdapis\tsyscalls1.script" -"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\scripts\tsyscalls2.script"-"c:\tstdapis\tsyscalls2.script" "\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\data\tsyscalls.ini"-"c:\tstdapis\tsyscalls.ini" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsyscalls/group/tsyscalls1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libc/test/testsyscalls/group/tsyscalls1.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,20 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + + + +"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\scripts\tsyscalls1.script"-"c:\tstdapis\tsyscalls1.script" +"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\data\tsyscalls.ini"-"c:\tstdapis\tsyscalls.ini" + diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsyscalls/group/tsyscalls2.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libc/test/testsyscalls/group/tsyscalls2.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,20 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + + +"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\scripts\tsyscalls2.script"-"c:\tstdapis\tsyscalls2.script" +"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\scripts\tsyscallsfcntl.script"-"c:\tstdapis\tsyscallsfcntl.script" +"\sf\os\ossrv\genericopenlibs\openenvcore\libc\test\testsyscalls\data\tsyscalls.ini"-"c:\tstdapis\tsyscalls.ini" + diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsyscalls/src/tsyscallsserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsyscalls/src/tsyscallsserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsyscalls/src/tsyscallsserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -75,7 +75,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsyssim/src/tsyssimserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsyssim/src/tsyssimserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsyssim/src/tsyssimserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testsysunistd/src/tsysunistdserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testsysunistd/src/tsysunistdserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testsysunistd/src/tsysunistdserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testtime_blr/src/ttime_blrserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testtime_blr/src/ttime_blrserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testtime_blr/src/ttime_blrserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testtrapsignal/src/ttrapsignalserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testtrapsignal/src/ttrapsignalserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testtrapsignal/src/ttrapsignalserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testwaitsignal/src/twaitsignalserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testwaitsignal/src/twaitsignalserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testwaitsignal/src/twaitsignalserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testwchar/src/twcharserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testwchar/src/twcharserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testwchar/src/twcharserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -81,7 +81,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testwcharapi/src/twcharapiserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testwcharapi/src/twcharapiserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testwcharapi/src/twcharapiserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -81,7 +81,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testwctype/src/twctypeserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testwctype/src/twctypeserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testwctype/src/twctypeserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libc/test/testwideapis/src/twideapisserver.cpp --- a/genericopenlibs/openenvcore/libc/test/testwideapis/src/twideapisserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libc/test/testwideapis/src/twideapisserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -81,7 +81,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/liblogger/inc/liblogger.h --- a/genericopenlibs/openenvcore/liblogger/inc/liblogger.h Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/liblogger/inc/liblogger.h Wed Aug 18 11:27:44 2010 +0300 @@ -133,7 +133,7 @@ #ifdef __cplusplus // C++ source code -class CLogger +class CLogger // codescanner::missingcclass { public: CLogger(char* aFileName, int aLine) : iFileName ( aFileName ), iLine ( aLine) {} diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/liblogger/test/testliblogger/src/tlibloggerserver.cpp --- a/genericopenlibs/openenvcore/liblogger/test/testliblogger/src/tlibloggerserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/liblogger/test/testliblogger/src/tlibloggerserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -79,7 +79,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libm/test/testdouble_blr/group/tdouble_blr.pkg --- a/genericopenlibs/openenvcore/libm/test/testdouble_blr/group/tdouble_blr.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libm/test/testdouble_blr/group/tdouble_blr.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -14,7 +14,5 @@ ;// "\epoc32\winscw\c\tstdapis\tdouble_blr.script"-"C:\tstdapis\tdouble_blr.script" -"\epoc32\winscw\c\tstdapis\tdouble_pow.script"-"C:\tstdapis\tdouble_pow.script" -"\epoc32\winscw\c\tstdapis\tdouble_misc.script"-"C:\tstdapis\tdouble_misc.script" "\epoc32\winscw\c\tstdapis\tdouble_blr.ini"-"C:\tstdapis\tdouble_blr.ini" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libm/test/testdouble_blr/group/tdouble_blr1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libm/test/testdouble_blr/group/tdouble_blr1.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,19 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + +"\epoc32\winscw\c\tstdapis\tdouble_pow.script"-"C:\tstdapis\tdouble_pow.script" +"\epoc32\winscw\c\tstdapis\tdouble_misc.script"-"C:\tstdapis\tdouble_misc.script" +"\epoc32\winscw\c\tstdapis\tdouble_blr.ini"-"C:\tstdapis\tdouble_blr.ini" + diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libm/test/testdouble_blr/src/tdouble_blrserver.cpp --- a/genericopenlibs/openenvcore/libm/test/testdouble_blr/src/tdouble_blrserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libm/test/testdouble_blr/src/tdouble_blrserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -75,7 +75,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libm/test/testfloat_blr/src/tfloat_blrserver.cpp --- a/genericopenlibs/openenvcore/libm/test/testfloat_blr/src/tfloat_blrserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libm/test/testfloat_blr/src/tfloat_blrserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libm/test/testldouble_blr/group/tldouble_blr.pkg --- a/genericopenlibs/openenvcore/libm/test/testldouble_blr/group/tldouble_blr.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libm/test/testldouble_blr/group/tldouble_blr.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -14,7 +14,5 @@ ;// "\epoc32\winscw\c\tstdapis\tldouble_blr.script"-"C:\tstdapis\tldouble_blr.script" -"\epoc32\winscw\c\tstdapis\tldouble_pow.script"-"C:\tstdapis\tldouble_pow.script" -"\epoc32\winscw\c\tstdapis\tldouble_misc.script"-"C:\tstdapis\tldouble_misc.script" "\epoc32\winscw\c\tstdapis\tldouble_blr.ini"-"C:\tstdapis\tldouble_blr.ini" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libm/test/testldouble_blr/group/tldouble_blr1.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/openenvcore/libm/test/testldouble_blr/group/tldouble_blr1.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,19 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + +"\epoc32\winscw\c\tstdapis\tldouble_pow.script"-"C:\tstdapis\tldouble_pow.script" +"\epoc32\winscw\c\tstdapis\tldouble_misc.script"-"C:\tstdapis\tldouble_misc.script" +"\epoc32\winscw\c\tstdapis\tldouble_blr.ini"-"C:\tstdapis\tldouble_blr.ini" + diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libm/test/testldouble_blr/src/tldouble_blrserver.cpp --- a/genericopenlibs/openenvcore/libm/test/testldouble_blr/src/tldouble_blrserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libm/test/testldouble_blr/src/tldouble_blrserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -69,7 +69,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testcondbroadcast/src/tcondbroadcastserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testcondbroadcast/src/tcondbroadcastserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testcondbroadcast/src/tcondbroadcastserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testconddestroy/src/tconddestroyserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testconddestroy/src/tconddestroyserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testconddestroy/src/tconddestroyserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testcondinit/src/tcondinitserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testcondinit/src/tcondinitserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testcondinit/src/tcondinitserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testcondsignal/src/tcondsignalserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testcondsignal/src/tcondsignalserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testcondsignal/src/tcondsignalserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testcondwait/src/tcondwaitserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testcondwait/src/tcondwaitserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testcondwait/src/tcondwaitserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testhybridthreads/src/thybridthreadsserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testhybridthreads/src/thybridthreadsserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testhybridthreads/src/thybridthreadsserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -68,7 +68,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testmutex/src/tmutexserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testmutex/src/tmutexserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testmutex/src/tmutexserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -74,7 +74,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testpthread/src/tpthreadserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testpthread/src/tpthreadserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testpthread/src/tpthreadserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -75,7 +75,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testpthreadonce/src/tpthreadonceserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testpthreadonce/src/tpthreadonceserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testpthreadonce/src/tpthreadonceserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testsemdestroy/src/tsemdestroyserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testsemdestroy/src/tsemdestroyserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testsemdestroy/src/tsemdestroyserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testsemgetvalue/src/tsemgetvalueserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testsemgetvalue/src/tsemgetvalueserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testsemgetvalue/src/tsemgetvalueserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testseminit/src/tseminitserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testseminit/src/tseminitserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testseminit/src/tseminitserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testsemopen/src/tsemopenserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testsemopen/src/tsemopenserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testsemopen/src/tsemopenserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testsempost/src/tsempostserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testsempost/src/tsempostserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testsempost/src/tsempostserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testsemtimedwait/src/tsemtimedwaitserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testsemtimedwait/src/tsemtimedwaitserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testsemtimedwait/src/tsemtimedwaitserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testsemtrywait/src/tsemtrywaitserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testsemtrywait/src/tsemtrywaitserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testsemtrywait/src/tsemtrywaitserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -82,7 +82,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/libpthread/test/testsemwait/src/tsemwaitserver.cpp --- a/genericopenlibs/openenvcore/libpthread/test/testsemwait/src/tsemwaitserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/libpthread/test/testsemwait/src/tsemwaitserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -83,7 +83,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/openenvcore/test/group/OEtests.iby --- a/genericopenlibs/openenvcore/test/group/OEtests.iby Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/openenvcore/test/group/OEtests.iby Wed Aug 18 11:27:44 2010 +0300 @@ -276,15 +276,9 @@ file=ABI_DIR\BUILD_DIR\ttimer.exe sys\bin\ttimer.exe //scripts for librt test cases -data = EPOCROOT##epoc32\WINSCW\c\tstdapis\tsharedmemory.script \tstdapis\tsharedmemory.script -data = EPOCROOT##epoc32\WINSCW\c\tstdapis\tclock.script \tstdapis\tclock.script -data = EPOCROOT##epoc32\WINSCW\c\tstdapis\tclock_captest.script \tstdapis\tclock_captest.script -data = EPOCROOT##epoc32\WINSCW\c\tstdapis\ttimer_hw.script \tstdapis\ttimer_hw.script + //data file for librt test cases -data = EPOCROOT##epoc32\WINSCW\c\tstdapis\tsharedmemory.ini \tstdapis\tsharedmemory.ini -data = EPOCROOT##epoc32\WINSCW\c\tstdapis\tclock.ini \tstdapis\tclock.ini -data = EPOCROOT##epoc32\WINSCW\c\tstdapis\ttimer.ini \tstdapis\ttimer.ini data = EPOCROOT##epoc32\WINSCW\c\tstdapis\oetests_librt_hw.bat \oetests_librt_hw.bat #endif /* SYMBIAN_OE_LIBRT */ diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/src/timerserver.cpp --- a/genericopenlibs/posixrealtimeextensions/src/timerserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/posixrealtimeextensions/src/timerserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -136,10 +136,12 @@ // ------------------------------------------------------------------------------- void CTimerServer::ConstructL() { - iShutdown = new(ELeave) CShutdown; - CleanupStack::PushL(iShutdown); - iShutdown->ConstructL(); + CShutdown* shutdown = new(ELeave) CShutdown; + CleanupStack::PushL(shutdown); + shutdown->ConstructL(); CleanupStack::Pop(); + iShutdown = shutdown; + shutdown = 0; } // ------------------------------------------------------------------------------- diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testcapclock/group/tcapclock.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/posixrealtimeextensions/test/testcapclock/group/tcapclock.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,17 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + + +"\sf\os\ossrv\genericopenlibs\posixrealtimeextensions\test\testcapclock\scripts\tclock_captest.script"-"c:\tstdapis\tclock_captest.script" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testcapclock/src/tcapclockserver.cpp --- a/genericopenlibs/posixrealtimeextensions/test/testcapclock/src/tcapclockserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/posixrealtimeextensions/test/testcapclock/src/tcapclockserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -73,7 +73,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testclock/group/tclock.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/posixrealtimeextensions/test/testclock/group/tclock.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,19 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + + +"\sf\os\ossrv\genericopenlibs\posixrealtimeextensions\test\testclock\scripts\tclock.script"-"c:\tstdapis\tclock.script" + +"\epoc32\WINSCW\c\tstdapis\tclock.ini"-"C:\tstdapis\tclock.ini" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testclock/src/tclockserver.cpp --- a/genericopenlibs/posixrealtimeextensions/test/testclock/src/tclockserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/posixrealtimeextensions/test/testclock/src/tclockserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -67,7 +67,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testsharedmemory/group/tsharedmemory.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/posixrealtimeextensions/test/testsharedmemory/group/tsharedmemory.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,20 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + + + +"\sf\os\ossrv\genericopenlibs\posixrealtimeextensions\test\testsharedmemory\scripts\tsharedmemory.script"-"c:\tstdapis\tsharedmemory.script" + +"\epoc32\WINSCW\c\tstdapis\tsharedmemory.ini"-"C:\tstdapis\tsharedmemory.ini" diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testsharedmemory/src/tsharedmemoryserver.cpp --- a/genericopenlibs/posixrealtimeextensions/test/testsharedmemory/src/tsharedmemoryserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/posixrealtimeextensions/test/testsharedmemory/src/tsharedmemoryserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testtimer/group/ttimer.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericopenlibs/posixrealtimeextensions/test/testtimer/group/ttimer.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,19 @@ +;// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +;// All rights reserved. +;// This component and the accompanying materials are made available +;// under the terms of "Eclipse Public License v1.0" +;// which accompanies this distribution, and is available +;// at the URL "http://www.eclipse.org/legal/epl-v10.html". +;// +;// Initial Contributors: +;// Nokia Corporation - initial contribution. +;// +;// Contributors: +;// +;// Description: +;// + + +"\sf\os\ossrv\genericopenlibs\posixrealtimeextensions\test\testtimer\scripts\ttimer_hw.script"-"c:\tstdapis\ttimer_hw.script" + +"\epoc32\WINSCW\c\tstdapis\ttimer.ini"-"C:\tstdapis\ttimer.ini" \ No newline at end of file diff -r 5fae379060a7 -r bf6a71c50e42 genericopenlibs/posixrealtimeextensions/test/testtimer/src/ttimerserver.cpp --- a/genericopenlibs/posixrealtimeextensions/test/testtimer/src/ttimerserver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericopenlibs/posixrealtimeextensions/test/testtimer/src/ttimerserver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -72,7 +72,7 @@ RProcess().DataCaging(RProcess::EDataCagingOn); RProcess().SecureApi(RProcess::ESecureApiOn); #endif - InitCommsL(); + //InitCommsL(); CActiveScheduler* sched=NULL; sched=new(ELeave) CActiveScheduler; diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/activebackupclient/src/abachandler.cpp --- a/genericservices/activebackupclient/src/abachandler.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/activebackupclient/src/abachandler.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -62,6 +62,7 @@ // Cancel any outstanding Async requests (i.e. close down the callback interface) Cancel(); delete iTransferBuffer; + iTransferBuffer = 0; } void CActiveBackupCallbackHandler::RunL() diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/httputils/Test/group/Te_authentication_TEFsuite.mmp --- a/genericservices/httputils/Test/group/Te_authentication_TEFsuite.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/httputils/Test/group/Te_authentication_TEFsuite.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -13,7 +13,7 @@ // Description: // -TARGET te_authentication_tefsuite.exe +TARGET te_authentication_tefsuite.exe //RTEST TARGETTYPE exe UID 0x1000007A 0x101F7784 diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/httputils/Test/group/t_fileuri.mmp --- a/genericservices/httputils/Test/group/t_fileuri.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/httputils/Test/group/t_fileuri.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -13,7 +13,7 @@ // Description: // -TARGET t_fileuri.exe +TARGET t_fileuri.exe //RTEST TARGETTYPE exe CAPABILITY TrustedUI ProtServ diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/httputils/Test/group/t_unitsipuri.mmp --- a/genericservices/httputils/Test/group/t_unitsipuri.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/httputils/Test/group/t_unitsipuri.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -13,7 +13,7 @@ // Description: // -TARGET t_unitsipuri.exe +TARGET t_unitsipuri.exe //RTEST TARGETTYPE EXE CAPABILITY None diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/httputils/Test/group/t_uriparser.mmp --- a/genericservices/httputils/Test/group/t_uriparser.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/httputils/Test/group/t_uriparser.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -13,7 +13,7 @@ // Description: // -TARGET t_uriparser.exe +TARGET t_uriparser.exe //RTEST TARGETTYPE exe CAPABILITY TrustedUI ProtServ diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/httputils/Test/group/t_wspcodec.mmp --- a/genericservices/httputils/Test/group/t_wspcodec.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/httputils/Test/group/t_wspcodec.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -13,7 +13,7 @@ // Description: // -TARGET t_wspcodec.exe +TARGET t_wspcodec.exe //RTEST TARGETTYPE EXE CAPABILITY TrustedUI ProtServ diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/httputils/group/httputils-RTEST.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericservices/httputils/group/httputils-RTEST.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,36 @@ +; +; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +; All rights reserved. +; This component and the accompanying materials are made available +; under the terms of "Eclipse Public License v1.0" +; which accompanies this distribution, and is available +; at the URL "http://www.eclipse.org/legal/epl-v10.html". +; +; Initial Contributors: +; Nokia Corporation - initial contribution. +; +; Contributors: +; +; Description: +; + +;Languages +&EN + +; Install files:-RTEST +"/epoc32/release/armv5/urel/t_wspcodec.exe"-"C:/sys/bin/t_wspcodec.exe" +"/epoc32/release/armv5/urel/T_URIPARSER.exe"-"C:/sys/bin/T_URIPARSER.exe" +"/epoc32/release/armv5/urel/t_fileuri.exe"-"C:/sys/bin/t_fileuri.exe" +"/epoc32/release/armv5/urel/T_UNITSIPURI.exe"-"C:/sys/bin/T_UNITSIPURI.exe" +"/epoc32/release/armv5/urel/te_authentication_tefsuite.exe"-"C:/sys/bin/te_authentication_tefsuite.exe" + +; Embedded SIS +; None + +; End of Package body + +; PKG dependencies +; None + +; PKG capabilities +; None diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/mimerecognitionfw/tef/T_MimeStep.cpp --- a/genericservices/mimerecognitionfw/tef/T_MimeStep.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/mimerecognitionfw/tef/T_MimeStep.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -486,6 +486,7 @@ CleanupStack::PopAndDestroy(buf); // buf delete iRecognizer; + iRecongnizer = 0; } CT_MimeStep::~CT_MimeStep() diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/mimerecognitionfw/tef/T_MstrStep.cpp --- a/genericservices/mimerecognitionfw/tef/T_MstrStep.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/mimerecognitionfw/tef/T_MstrStep.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -43,7 +43,12 @@ TVerdict CT_MstrStep::doTestStepL() { INFO_PRINTF1(_L("Test Started")); - iFs.Connect(); + TInt r = KErrNone; + r = iFs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } __UHEAP_MARK; TRAPD(ret,doMenuL()); TEST(ret==KErrNone); diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/s60compatibilityheaders/commonengine/src/textresolver.cpp --- a/genericservices/s60compatibilityheaders/commonengine/src/textresolver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/s60compatibilityheaders/commonengine/src/textresolver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -211,8 +211,8 @@ // Nokia-specific version of the errorres.rss file TPtr appTextPtr = iTitleText->Des(); TPtr textPtr = iTextBuffer->Des(); - iCoe->ReadResource(appTextPtr, R_BASE); - iCoe->ReadResource(textPtr, R_ERROR_RES_GENERAL); + iCoe->ReadResourceL(appTextPtr, R_BASE); + iCoe->ReadResourceL(textPtr, R_ERROR_RES_GENERAL); } } else // No CCoeEnv available diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/systemagent/test/rtest/group/bld.inf --- a/genericservices/systemagent/test/rtest/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/systemagent/test/rtest/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -21,4 +21,4 @@ t_sysagt2.mmp t_persisthal.mmp t_initialisehal.mmp -t_haloomtests.mmp \ No newline at end of file +//t_haloomtests.mmp \ No newline at end of file diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/systemagent/test/rtest/group/systemagent-RTEST.pkg --- a/genericservices/systemagent/test/rtest/group/systemagent-RTEST.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/systemagent/test/rtest/group/systemagent-RTEST.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -20,7 +20,7 @@ ; Install files:-RTEST "/epoc32/release/armv5/urel/t_initialisehal.exe"-"C:/sys/bin/t_initialisehal.exe" "/epoc32/release/armv5/urel/t_persisthal.exe"-"C:/sys/bin/t_persisthal.exe" -"/epoc32/release/armv5/urel/t_haloomtests.exe"-"C:/sys/bin/t_haloomtests.exe" +;"/epoc32/release/armv5/urel/t_haloomtests.exe"-"C:/sys/bin/t_haloomtests.exe" "/epoc32/release/armv5/urel/t_sysagt2.exe"-"C:/sys/bin/t_sysagt2.exe" ; Embedded SIS diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/taskscheduler/Test/Testexecute/group/taskscheduler-TEF_SchSvr.pkg --- a/genericservices/taskscheduler/Test/Testexecute/group/taskscheduler-TEF_SchSvr.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/taskscheduler/Test/Testexecute/group/taskscheduler-TEF_SchSvr.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -51,7 +51,7 @@ "/Epoc32/release/winscw/udeb/z/TEF_SchSvr/TEF_SchSvr.script"- "C:/TEF_SchSvr/TEF_SchSvr.script" -"/epoc32/release/winscw/udeb/z/TEF_SchSvr/te_floating_scheduleSuite.script"-"C:/TEF_SchSvr/te_floating_scheduleSuite.Script" +"/epoc32/release/winscw/udeb/z/TEF_SchSvr/te_floating_scheduleSuite.script"-"C:/TEF_SchSvr/te_floating_scheduleSuite.script" diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/taskscheduler/Test/Testexecute/scripts/TEF_SchSvr.script --- a/genericservices/taskscheduler/Test/Testexecute/scripts/TEF_SchSvr.script Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/taskscheduler/Test/Testexecute/scripts/TEF_SchSvr.script Wed Aug 18 11:27:44 2010 +0300 @@ -17,6 +17,6 @@ PRINT SchSvr TEF Tests -RUN_SCRIPT z:\TEF_SchSvr\TEF_SSA_ScheduleSuite.script -RUN_SCRIPT z:\TEF_SchSvr\te_floating_scheduleSuite.script -RUN_SCRIPT z:\TEF_SchSvr\tef_schsvr_bursuite.script +RUN_SCRIPT C:\TEF_SchSvr\TEF_SSA_ScheduleSuite.script +RUN_SCRIPT C:\TEF_SchSvr\te_floating_scheduleSuite.script +RUN_SCRIPT C:\TEF_SchSvr\tef_schsvr_bursuite.script diff -r 5fae379060a7 -r bf6a71c50e42 genericservices/taskscheduler/group/taskscheduler-RTEST.pkg --- a/genericservices/taskscheduler/group/taskscheduler-RTEST.pkg Fri Jun 11 15:26:22 2010 +0300 +++ b/genericservices/taskscheduler/group/taskscheduler-RTEST.pkg Wed Aug 18 11:27:44 2010 +0300 @@ -22,29 +22,29 @@ ; Install files ;tasksheduler-RTESTS -"/epoc32/release/armv5/urel/TC_TSCH_STARTUP_PERF.exe"-"C:/Test/TC_TSCH_STARTUP_PERF.exe" -"/epoc32/release/armv5/urel/TC_TSCH_CONDITION.exe"-"C:/Test/TC_TSCH_CONDITION.exe" -"/epoc32/release/armv5/urel/TC_TSCH_CONDITION_HOMETIME.exe"-"C:/Test/TC_TSCH_CONDITION_HOMETIME.exe" -"/epoc32/release/armv5/urel/TC_TSCH_CONDITION_UTC.exe"-"C:/Test/TC_TSCH_CONDITION_UTC.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING2.exe"-"C:/Test/TC_TSCH_SCHEDULING2.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING2_HOMETIME.exe"-"C:/Test/TC_TSCH_SCHEDULING2_HOMETIME.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING2_UTC.exe"-"C:/Test/TC_TSCH_SCHEDULING2_UTC.exe" -"/epoc32/release/armv5/urel/TU_TSCH_TSTIME.exe"-"C:/Test/TU_TSCH_TSTIME.exe" -"/epoc32/release/armv5/urel/TU_TSCH_SCHEDULEENTRYINFO2.EXE"-"C:/Test/TU_TSCH_SCHEDULEENTRYINFO2.EXE" -"/epoc32/release/armv5/urel/TU_TSCH_SCHEDULESTATE2.EXE"-"C:/Test/TU_TSCH_SCHEDULESTATE2.EXE" -"/epoc32/release/armv5/urel/TU_TSCH_ScheduledTaskTest.exe"-"C:/Test/TU_TSCH_ScheduledTaskTest.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHSVR_OOM.exe"-"C:/Test/TC_TSCH_SCHSVR_OOM.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHSVR_OOM_HOMETIME.exe"-"C:/Test/TC_TSCH_SCHSVR_OOM_HOMETIME.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHSVR_OOM_UTC.exe"-"C:/Test/TC_TSCH_SCHSVR_OOM_UTC.exe" -"/epoc32/release/armv5/urel/TC_TSCH_YEAR2000.exe"-"C:/Test/TC_TSCH_YEAR2000.exe" -"/epoc32/release/armv5/urel/TC_TSCH_YEAR2000_HOMETIME.exe"-"C:/Test/TC_TSCH_YEAR2000_HOMETIME.exe" -"/epoc32/release/armv5/urel/TC_TSCH_YEAR2000_UTC.exe"-"C:/Test/TC_TSCH_YEAR2000_UTC.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING1.exe"-"C:/Test/TC_TSCH_SCHEDULING1.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING1_HOMETIME.exe"-"C:/Test/TC_TSCH_SCHEDULING1_HOMETIME.exe" -"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING1_UTC.exe"-"C:/Test/TC_TSCH_SCHEDULING1_UTC.exe" -"/epoc32/release/armv5/urel/TC_TSCH_PLATSEC.exe"-"C:/Test/TC_TSCH_PLATSEC.exe" -"/epoc32/release/armv5/urel/TC_TSCH_ROBUSTNESS.exe"-"C:/Test/TC_TSCH_ROBUSTNESS.exe" -"/epoc32/release/armv5/urel/TC_TSCH_IPC.exe"-"C:/Test/TC_TSCH_IPC.exe" +"/epoc32/release/armv5/urel/TC_TSCH_STARTUP_PERF.exe"-"C:/sys/bin/TC_TSCH_STARTUP_PERF.exe" +"/epoc32/release/armv5/urel/TC_TSCH_CONDITION.exe"-"C:/sys/bin/TC_TSCH_CONDITION.exe" +"/epoc32/release/armv5/urel/TC_TSCH_CONDITION_HOMETIME.exe"-"C:/sys/bin/TC_TSCH_CONDITION_HOMETIME.exe" +"/epoc32/release/armv5/urel/TC_TSCH_CONDITION_UTC.exe"-"C:/sys/bin/TC_TSCH_CONDITION_UTC.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING2.exe"-"C:/sys/bin/TC_TSCH_SCHEDULING2.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING2_HOMETIME.exe"-"C:/sys/bin/TC_TSCH_SCHEDULING2_HOMETIME.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING2_UTC.exe"-"C:/sys/bin/TC_TSCH_SCHEDULING2_UTC.exe" +"/epoc32/release/armv5/urel/TU_TSCH_TSTIME.exe"-"C:/sys/bin/TU_TSCH_TSTIME.exe" +"/epoc32/release/armv5/urel/TU_TSCH_SCHEDULEENTRYINFO2.EXE"-"C:/sys/bin/TU_TSCH_SCHEDULEENTRYINFO2.exe" +"/epoc32/release/armv5/urel/TU_TSCH_SCHEDULESTATE2.EXE"-"C:/sys/bin/TU_TSCH_SCHEDULESTATE2.exe" +"/epoc32/release/armv5/urel/TU_TSCH_ScheduledTaskTest.exe"-"C:/sys/bin/TU_TSCH_ScheduledTaskTest.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHSVR_OOM.exe"-"C:/sys/bin/TC_TSCH_SCHSVR_OOM.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHSVR_OOM_HOMETIME.exe"-"C:/sys/bin/TC_TSCH_SCHSVR_OOM_HOMETIME.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHSVR_OOM_UTC.exe"-"C:/sys/bin/TC_TSCH_SCHSVR_OOM_UTC.exe" +"/epoc32/release/armv5/urel/TC_TSCH_YEAR2000.exe"-"C:/sys/bin/TC_TSCH_YEAR2000.exe" +"/epoc32/release/armv5/urel/TC_TSCH_YEAR2000_HOMETIME.exe"-"C:/sys/bin/TC_TSCH_YEAR2000_HOMETIME.exe" +"/epoc32/release/armv5/urel/TC_TSCH_YEAR2000_UTC.exe"-"C:/sys/bin/TC_TSCH_YEAR2000_UTC.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING1.exe"-"C:/sys/bin/TC_TSCH_SCHEDULING1.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING1_HOMETIME.exe"-"C:/sys/bin/TC_TSCH_SCHEDULING1_HOMETIME.exe" +"/epoc32/release/armv5/urel/TC_TSCH_SCHEDULING1_UTC.exe"-"C:/sys/bin/TC_TSCH_SCHEDULING1_UTC.exe" +"/epoc32/release/armv5/urel/TC_TSCH_PLATSEC.exe"-"C:/sys/bin/TC_TSCH_PLATSEC.exe" +"/epoc32/release/armv5/urel/TC_TSCH_ROBUSTNESS.exe"-"C:/sys/bin/TC_TSCH_ROBUSTNESS.exe" +"/epoc32/release/armv5/urel/TC_TSCH_IPC.exe"-"C:/sys/bin/TC_TSCH_IPC.exe" diff -r 5fae379060a7 -r bf6a71c50e42 glib/build/symbian/tests/group/bld.inf --- a/glib/build/symbian/tests/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/glib/build/symbian/tests/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -20,6 +20,7 @@ PRJ_TESTEXPORTS glibtests.iby /epoc32/rom/include/glibtests.iby locale.iby /epoc32/rom/include/locale.iby +locale_new.iby /epoc32/rom/include/locale_new.iby ../../../../tests/markups/valid-1.gmarkup /epoc32/winscw/c/valid-1.gmarkup ../../../../tests/iochannel-test-infile /epoc32/winscw/c/iochannel-test-infile ../../../../tests/casemap.txt /epoc32/winscw/c/casemap.txt diff -r 5fae379060a7 -r bf6a71c50e42 glib/build/symbian/tests/group/locale_new.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glib/build/symbian/tests/group/locale_new.iby Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,177 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: IBY file for new locale model +* +*/ + + + + + +#ifndef LOCALE_NEW_IBY +#define LOCALE_NEW_IBY + +file=\epoc32\release\armv5\urel\elocl_col.002 SHARED_LIB_DIR\elocl_col.002 +file=\epoc32\release\armv5\urel\elocl_col.003 SHARED_LIB_DIR\elocl_col.003 +file=\epoc32\release\armv5\urel\elocl_col.004 SHARED_LIB_DIR\elocl_col.004 +file=\epoc32\release\armv5\urel\elocl_col.005 SHARED_LIB_DIR\elocl_col.005 +file=\epoc32\release\armv5\urel\elocl_col.006 SHARED_LIB_DIR\elocl_col.006 +file=\epoc32\release\armv5\urel\elocl_col.007 SHARED_LIB_DIR\elocl_col.007 +file=\epoc32\release\armv5\urel\elocl_col.008 SHARED_LIB_DIR\elocl_col.008 +file=\epoc32\release\armv5\urel\elocl_col.009 SHARED_LIB_DIR\elocl_col.009 +file=\epoc32\release\armv5\urel\elocl_col.010 SHARED_LIB_DIR\elocl_col.010 +file=\epoc32\release\armv5\urel\elocl_col.013 SHARED_LIB_DIR\elocl_col.013 +file=\epoc32\release\armv5\urel\elocl_col.014 SHARED_LIB_DIR\elocl_col.014 +file=\epoc32\release\armv5\urel\elocl_col.015 SHARED_LIB_DIR\elocl_col.015 +file=\epoc32\release\armv5\urel\elocl_col.016 SHARED_LIB_DIR\elocl_col.016 +file=\epoc32\release\armv5\urel\elocl_col.017 SHARED_LIB_DIR\elocl_col.017 +file=\epoc32\release\armv5\urel\elocl_col.018 SHARED_LIB_DIR\elocl_col.018 +file=\epoc32\release\armv5\urel\elocl_col.019 SHARED_LIB_DIR\elocl_col.019 +file=\epoc32\release\armv5\urel\elocl_col.025 SHARED_LIB_DIR\elocl_col.025 +file=\epoc32\release\armv5\urel\elocl_col.026 SHARED_LIB_DIR\elocl_col.026 +file=\epoc32\release\armv5\urel\elocl_col.027 SHARED_LIB_DIR\elocl_col.027 +file=\epoc32\release\armv5\urel\elocl_col.028 SHARED_LIB_DIR\elocl_col.028 +file=\epoc32\release\armv5\urel\elocl_col.029 SHARED_LIB_DIR\elocl_col.029 +file=\epoc32\release\armv5\urel\elocl_col.030 SHARED_LIB_DIR\elocl_col.030 +file=\epoc32\release\armv5\urel\elocl_col.031 SHARED_LIB_DIR\elocl_col.031 +file=\epoc32\release\armv5\urel\elocl_col.032 SHARED_LIB_DIR\elocl_col.032 +file=\epoc32\release\armv5\urel\elocl_col.033 SHARED_LIB_DIR\elocl_col.033 +file=\epoc32\release\armv5\urel\elocl_col.037 SHARED_LIB_DIR\elocl_col.037 +file=\epoc32\release\armv5\urel\elocl_col.039 SHARED_LIB_DIR\elocl_col.039 +file=\epoc32\release\armv5\urel\elocl_col.042 SHARED_LIB_DIR\elocl_col.042 +file=\epoc32\release\armv5\urel\elocl_col.044 SHARED_LIB_DIR\elocl_col.044 +file=\epoc32\release\armv5\urel\elocl_col.045 SHARED_LIB_DIR\elocl_col.045 +file=\epoc32\release\armv5\urel\elocl_col.049 SHARED_LIB_DIR\elocl_col.049 +file=\epoc32\release\armv5\urel\elocl_col.050 SHARED_LIB_DIR\elocl_col.050 +file=\epoc32\release\armv5\urel\elocl_col.051 SHARED_LIB_DIR\elocl_col.051 +file=\epoc32\release\armv5\urel\elocl_col.054 SHARED_LIB_DIR\elocl_col.054 +file=\epoc32\release\armv5\urel\elocl_col.057 SHARED_LIB_DIR\elocl_col.057 +file=\epoc32\release\armv5\urel\elocl_col.058 SHARED_LIB_DIR\elocl_col.058 +file=\epoc32\release\armv5\urel\elocl_col.059 SHARED_LIB_DIR\elocl_col.059 +file=\epoc32\release\armv5\urel\elocl_col.065 SHARED_LIB_DIR\elocl_col.065 +file=\epoc32\release\armv5\urel\elocl_col.067 SHARED_LIB_DIR\elocl_col.067 +file=\epoc32\release\armv5\urel\elocl_col.068 SHARED_LIB_DIR\elocl_col.068 +file=\epoc32\release\armv5\urel\elocl_col.070 SHARED_LIB_DIR\elocl_col.070 +file=\epoc32\release\armv5\urel\elocl_col.076 SHARED_LIB_DIR\elocl_col.076 +file=\epoc32\release\armv5\urel\elocl_col.078 SHARED_LIB_DIR\elocl_col.078 +file=\epoc32\release\armv5\urel\elocl_col.079 SHARED_LIB_DIR\elocl_col.079 +file=\epoc32\release\armv5\urel\elocl_col.083 SHARED_LIB_DIR\elocl_col.083 +file=\epoc32\release\armv5\urel\elocl_col.093 SHARED_LIB_DIR\elocl_col.093 +file=\epoc32\release\armv5\urel\elocl_col.094 SHARED_LIB_DIR\elocl_col.094 +file=\epoc32\release\armv5\urel\elocl_col.096 SHARED_LIB_DIR\elocl_col.096 +file=\epoc32\release\armv5\urel\elocl_col.102 SHARED_LIB_DIR\elocl_col.102 +file=\epoc32\release\armv5\urel\elocl_col.103 SHARED_LIB_DIR\elocl_col.103 +file=\epoc32\release\armv5\urel\elocl_col.1034 SHARED_LIB_DIR\elocl_col.1034 +file=\epoc32\release\armv5\urel\elocl_lan.002 SHARED_LIB_DIR\elocl_lan.002 +file=\epoc32\release\armv5\urel\elocl_lan.003 SHARED_LIB_DIR\elocl_lan.003 +file=\epoc32\release\armv5\urel\elocl_lan.004 SHARED_LIB_DIR\elocl_lan.004 +file=\epoc32\release\armv5\urel\elocl_lan.005 SHARED_LIB_DIR\elocl_lan.005 +file=\epoc32\release\armv5\urel\elocl_lan.006 SHARED_LIB_DIR\elocl_lan.006 +file=\epoc32\release\armv5\urel\elocl_lan.007 SHARED_LIB_DIR\elocl_lan.007 +file=\epoc32\release\armv5\urel\elocl_lan.008 SHARED_LIB_DIR\elocl_lan.008 +file=\epoc32\release\armv5\urel\elocl_lan.009 SHARED_LIB_DIR\elocl_lan.009 +file=\epoc32\release\armv5\urel\elocl_lan.010 SHARED_LIB_DIR\elocl_lan.010 +file=\epoc32\release\armv5\urel\elocl_lan.013 SHARED_LIB_DIR\elocl_lan.013 +file=\epoc32\release\armv5\urel\elocl_lan.014 SHARED_LIB_DIR\elocl_lan.014 +file=\epoc32\release\armv5\urel\elocl_lan.015 SHARED_LIB_DIR\elocl_lan.015 +file=\epoc32\release\armv5\urel\elocl_lan.016 SHARED_LIB_DIR\elocl_lan.016 +file=\epoc32\release\armv5\urel\elocl_lan.017 SHARED_LIB_DIR\elocl_lan.017 +file=\epoc32\release\armv5\urel\elocl_lan.018 SHARED_LIB_DIR\elocl_lan.018 +file=\epoc32\release\armv5\urel\elocl_lan.019 SHARED_LIB_DIR\elocl_lan.019 +file=\epoc32\release\armv5\urel\elocl_lan.025 SHARED_LIB_DIR\elocl_lan.025 +file=\epoc32\release\armv5\urel\elocl_lan.026 SHARED_LIB_DIR\elocl_lan.026 +file=\epoc32\release\armv5\urel\elocl_lan.027 SHARED_LIB_DIR\elocl_lan.027 +file=\epoc32\release\armv5\urel\elocl_lan.028 SHARED_LIB_DIR\elocl_lan.028 +file=\epoc32\release\armv5\urel\elocl_lan.029 SHARED_LIB_DIR\elocl_lan.029 +file=\epoc32\release\armv5\urel\elocl_lan.030 SHARED_LIB_DIR\elocl_lan.030 +file=\epoc32\release\armv5\urel\elocl_lan.031 SHARED_LIB_DIR\elocl_lan.031 +file=\epoc32\release\armv5\urel\elocl_lan.032 SHARED_LIB_DIR\elocl_lan.032 +file=\epoc32\release\armv5\urel\elocl_lan.033 SHARED_LIB_DIR\elocl_lan.033 +file=\epoc32\release\armv5\urel\elocl_lan.037 SHARED_LIB_DIR\elocl_lan.037 +file=\epoc32\release\armv5\urel\elocl_lan.039 SHARED_LIB_DIR\elocl_lan.039 +file=\epoc32\release\armv5\urel\elocl_lan.042 SHARED_LIB_DIR\elocl_lan.042 +file=\epoc32\release\armv5\urel\elocl_lan.044 SHARED_LIB_DIR\elocl_lan.044 +file=\epoc32\release\armv5\urel\elocl_lan.045 SHARED_LIB_DIR\elocl_lan.045 +file=\epoc32\release\armv5\urel\elocl_lan.049 SHARED_LIB_DIR\elocl_lan.049 +file=\epoc32\release\armv5\urel\elocl_lan.050 SHARED_LIB_DIR\elocl_lan.050 +file=\epoc32\release\armv5\urel\elocl_lan.051 SHARED_LIB_DIR\elocl_lan.051 +file=\epoc32\release\armv5\urel\elocl_lan.054 SHARED_LIB_DIR\elocl_lan.054 +file=\epoc32\release\armv5\urel\elocl_lan.057 SHARED_LIB_DIR\elocl_lan.057 +file=\epoc32\release\armv5\urel\elocl_lan.058 SHARED_LIB_DIR\elocl_lan.058 +file=\epoc32\release\armv5\urel\elocl_lan.059 SHARED_LIB_DIR\elocl_lan.059 +file=\epoc32\release\armv5\urel\elocl_lan.065 SHARED_LIB_DIR\elocl_lan.065 +file=\epoc32\release\armv5\urel\elocl_lan.067 SHARED_LIB_DIR\elocl_lan.067 +file=\epoc32\release\armv5\urel\elocl_lan.068 SHARED_LIB_DIR\elocl_lan.068 +file=\epoc32\release\armv5\urel\elocl_lan.070 SHARED_LIB_DIR\elocl_lan.070 +file=\epoc32\release\armv5\urel\elocl_lan.076 SHARED_LIB_DIR\elocl_lan.076 +file=\epoc32\release\armv5\urel\elocl_lan.078 SHARED_LIB_DIR\elocl_lan.078 +file=\epoc32\release\armv5\urel\elocl_lan.079 SHARED_LIB_DIR\elocl_lan.079 +file=\epoc32\release\armv5\urel\elocl_lan.083 SHARED_LIB_DIR\elocl_lan.083 +file=\epoc32\release\armv5\urel\elocl_lan.093 SHARED_LIB_DIR\elocl_lan.093 +file=\epoc32\release\armv5\urel\elocl_lan.094 SHARED_LIB_DIR\elocl_lan.094 +file=\epoc32\release\armv5\urel\elocl_lan.095 SHARED_LIB_DIR\elocl_lan.095 +file=\epoc32\release\armv5\urel\elocl_lan.096 SHARED_LIB_DIR\elocl_lan.096 +file=\epoc32\release\armv5\urel\elocl_lan.103 SHARED_LIB_DIR\elocl_lan.103 +file=\epoc32\release\armv5\urel\elocl_lan.1034 SHARED_LIB_DIR\elocl_lan.1034 +file=\epoc32\release\armv5\urel\elocl_lan.401 SHARED_LIB_DIR\elocl_lan.401 +file=\epoc32\release\armv5\urel\elocl_reg.056 SHARED_LIB_DIR\elocl_reg.056 +file=\epoc32\release\armv5\urel\elocl_reg.076 SHARED_LIB_DIR\elocl_reg.076 +file=\epoc32\release\armv5\urel\elocl_reg.100 SHARED_LIB_DIR\elocl_reg.100 +file=\epoc32\release\armv5\urel\elocl_reg.124 SHARED_LIB_DIR\elocl_reg.124 +file=\epoc32\release\armv5\urel\elocl_reg.156 SHARED_LIB_DIR\elocl_reg.156 +file=\epoc32\release\armv5\urel\elocl_reg.158 SHARED_LIB_DIR\elocl_reg.158 +file=\epoc32\release\armv5\urel\elocl_reg.191 SHARED_LIB_DIR\elocl_reg.191 +file=\epoc32\release\armv5\urel\elocl_reg.203 SHARED_LIB_DIR\elocl_reg.203 +file=\epoc32\release\armv5\urel\elocl_reg.208 SHARED_LIB_DIR\elocl_reg.208 +file=\epoc32\release\armv5\urel\elocl_reg.233 SHARED_LIB_DIR\elocl_reg.233 +file=\epoc32\release\armv5\urel\elocl_reg.246 SHARED_LIB_DIR\elocl_reg.246 +file=\epoc32\release\armv5\urel\elocl_reg.250 SHARED_LIB_DIR\elocl_reg.250 +file=\epoc32\release\armv5\urel\elocl_reg.276 SHARED_LIB_DIR\elocl_reg.276 +file=\epoc32\release\armv5\urel\elocl_reg.300 SHARED_LIB_DIR\elocl_reg.300 +file=\epoc32\release\armv5\urel\elocl_reg.344 SHARED_LIB_DIR\elocl_reg.344 +file=\epoc32\release\armv5\urel\elocl_reg.348 SHARED_LIB_DIR\elocl_reg.348 +file=\epoc32\release\armv5\urel\elocl_reg.352 SHARED_LIB_DIR\elocl_reg.352 +file=\epoc32\release\armv5\urel\elocl_reg.356 SHARED_LIB_DIR\elocl_reg.356 +file=\epoc32\release\armv5\urel\elocl_reg.360 SHARED_LIB_DIR\elocl_reg.360 +file=\epoc32\release\armv5\urel\elocl_reg.364 SHARED_LIB_DIR\elocl_reg.364 +file=\epoc32\release\armv5\urel\elocl_reg.376 SHARED_LIB_DIR\elocl_reg.376 +file=\epoc32\release\armv5\urel\elocl_reg.380 SHARED_LIB_DIR\elocl_reg.380 +file=\epoc32\release\armv5\urel\elocl_reg.392 SHARED_LIB_DIR\elocl_reg.392 +file=\epoc32\release\armv5\urel\elocl_reg.410 SHARED_LIB_DIR\elocl_reg.410 +file=\epoc32\release\armv5\urel\elocl_reg.428 SHARED_LIB_DIR\elocl_reg.428 +file=\epoc32\release\armv5\urel\elocl_reg.440 SHARED_LIB_DIR\elocl_reg.440 +file=\epoc32\release\armv5\urel\elocl_reg.458 SHARED_LIB_DIR\elocl_reg.458 +file=\epoc32\release\armv5\urel\elocl_reg.484 SHARED_LIB_DIR\elocl_reg.484 +file=\epoc32\release\armv5\urel\elocl_reg.528 SHARED_LIB_DIR\elocl_reg.528 +file=\epoc32\release\armv5\urel\elocl_reg.578 SHARED_LIB_DIR\elocl_reg.578 +file=\epoc32\release\armv5\urel\elocl_reg.586 SHARED_LIB_DIR\elocl_reg.586 +file=\epoc32\release\armv5\urel\elocl_reg.608 SHARED_LIB_DIR\elocl_reg.608 +file=\epoc32\release\armv5\urel\elocl_reg.616 SHARED_LIB_DIR\elocl_reg.616 +file=\epoc32\release\armv5\urel\elocl_reg.620 SHARED_LIB_DIR\elocl_reg.620 +file=\epoc32\release\armv5\urel\elocl_reg.642 SHARED_LIB_DIR\elocl_reg.642 +file=\epoc32\release\armv5\urel\elocl_reg.643 SHARED_LIB_DIR\elocl_reg.643 +file=\epoc32\release\armv5\urel\elocl_reg.682 SHARED_LIB_DIR\elocl_reg.682 +file=\epoc32\release\armv5\urel\elocl_reg.703 SHARED_LIB_DIR\elocl_reg.703 +file=\epoc32\release\armv5\urel\elocl_reg.704 SHARED_LIB_DIR\elocl_reg.704 +file=\epoc32\release\armv5\urel\elocl_reg.705 SHARED_LIB_DIR\elocl_reg.705 +file=\epoc32\release\armv5\urel\elocl_reg.724 SHARED_LIB_DIR\elocl_reg.724 +file=\epoc32\release\armv5\urel\elocl_reg.752 SHARED_LIB_DIR\elocl_reg.752 +file=\epoc32\release\armv5\urel\elocl_reg.764 SHARED_LIB_DIR\elocl_reg.764 +file=\epoc32\release\armv5\urel\elocl_reg.792 SHARED_LIB_DIR\elocl_reg.792 +file=\epoc32\release\armv5\urel\elocl_reg.804 SHARED_LIB_DIR\elocl_reg.804 +file=\epoc32\release\armv5\urel\elocl_reg.840 SHARED_LIB_DIR\elocl_reg.840 +file=\epoc32\release\armv5\urel\elocl_reg.891 SHARED_LIB_DIR\elocl_reg.891 + + +#endif \ No newline at end of file diff -r 5fae379060a7 -r bf6a71c50e42 glib/tests/child-test.c --- a/glib/tests/child-test.c Fri Jun 11 15:26:22 2010 +0300 +++ b/glib/tests/child-test.c Wed Aug 18 11:27:44 2010 +0300 @@ -62,12 +62,9 @@ { GPid pid; #ifdef __SYMBIAN32__ - gint retval; -#if 0 //for using g_spawn_async gboolean retval; char **argv = NULL; GError *error = NULL; -#endif//if 0 #endif//__SYMBIAN32__ #ifdef G_OS_WIN32 STARTUPINFO si; @@ -89,18 +86,14 @@ pid = pi.hProcess; return pid; -#endif +#endif //G_OS_WIN32 #ifndef __SYMBIAN32__ pid = fork (); #else - retval = posix_spawn(&pid, "helloworld.exe", NULL,NULL,NULL,NULL); - (void)waitpid(pid,NULL,0); -#if 0 argv = (char **)malloc(3*sizeof(char *)); argv[0] = "Helloworld.exe"; // wrong exe name. Should cause g_spawn_async to fail argv[1] = NULL; retval = g_spawn_async(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, "1234", &pid, &error); -#endif//if 0 if (pid < 0) exit (1); @@ -109,7 +102,7 @@ sleep (ttl); _exit (0); -#endif /* G_OS_WIN32 */ +#endif /*__SYMBIAN32__*/ } gboolean diff -r 5fae379060a7 -r bf6a71c50e42 glib/tests/module-test.c --- a/glib/tests/module-test.c Fri Jun 11 15:26:22 2010 +0300 +++ b/glib/tests/module-test.c Wed Aug 18 11:27:44 2010 +0300 @@ -94,14 +94,10 @@ #ifndef __SYMBIAN32__ dir = g_get_current_dir () -#else - dir = "z:\\sys\\bin"; #endif - plugin_a = g_strconcat (dir, G_DIR_SEPARATOR_S, "libmoduletestplugin_a.dll", - NULL); - plugin_b = g_strconcat (dir, G_DIR_SEPARATOR_S, "libmoduletestplugin_b.dll", - NULL); + plugin_a = "libmoduletestplugin_a.dll"; + plugin_b = "libmoduletestplugin_b.dll"; #ifndef __SYMBIAN32__ g_free (dir); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/bsul/test/t_clientmessage/t_clientmessage.mmp --- a/lowlevellibsandfws/apputils/bsul/test/t_clientmessage/t_clientmessage.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/bsul/test/t_clientmessage/t_clientmessage.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -17,8 +17,8 @@ targettype exe CAPABILITY ReadUserData WriteUserData SECUREID 0x10285B57 - -systeminclude /epoc32/include +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN SOURCEPATH . source t_clientmessage.cpp diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser16.MMP --- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser16.MMP Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser16.MMP Wed Aug 18 11:27:44 2010 +0300 @@ -19,7 +19,8 @@ VENDORID 0x70000001 SOURCEPATH ../t_iniparser -systeminclude /epoc32/include +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN source T_IniParser16.CPP diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser8.MMP --- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser8.MMP Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser8.MMP Wed Aug 18 11:27:44 2010 +0300 @@ -19,7 +19,8 @@ VENDORID 0x70000001 SOURCEPATH ../t_iniparser -systeminclude /epoc32/include +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN source T_IniParser8.CPP diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserPerformance.MMP --- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserPerformance.MMP Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserPerformance.MMP Wed Aug 18 11:27:44 2010 +0300 @@ -22,7 +22,9 @@ VENDORID 0x70000001 SOURCEPATH ../t_iniparser -systeminclude /epoc32/include +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN + userinclude ../t_iniparser source T_IniParserPerformance.CPP diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserUnit.MMP --- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserUnit.MMP Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserUnit.MMP Wed Aug 18 11:27:44 2010 +0300 @@ -17,8 +17,9 @@ targettype EXE UID 0x10000077 VENDORID 0x70000001 +MW_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN -systeminclude /epoc32/include USERINCLUDE ../../src ../../inc SOURCEPATH ../t_iniparser diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/group/BLD.INF --- a/lowlevellibsandfws/apputils/group/BLD.INF Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/group/BLD.INF Wed Aug 18 11:27:44 2010 +0300 @@ -89,6 +89,11 @@ ../conf/apputils.confml OS_LAYER_EXPORTS_CONFML(apputils.confml) ../conf/apputils_100048aa.crml OS_LAYER_EXPORTS_CRML(apputils_100048aa.crml) +//exporting .mk files manually for sirocco //to be removed after tools team make changes +bafl_resource_files.mk /epoc32/tools/makefile_templates/syslibs/test/bafl_resource_files.mk +bafl_copytestfiles.mk /epoc32/tools/makefile_templates/syslibs/test/bafl_copytestfiles.mk + + PRJ_MMPFILES ../group/BAFL.MMP diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/group/bafl_copytestfiles.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lowlevellibsandfws/apputils/group/bafl_copytestfiles.mk Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,73 @@ +# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# Copy test files to test sortbytable functionality. +# +# + +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ +include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk + +ifeq ($(findstring WINS,$(PLATFORM)),WINS) +EPOCDATADIR=$(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH) +else +EPOCDATADIR=$(EPOCROOT)epoc32/data +endif + +TARGETDIR=$(EPOCDATADIR)/z/system/documents/baflsortbytabletest +SOURCEDIR=$(EXTENSION_ROOT)/../tsrc + +COPYFILES : + $(CP) -f $(call slash2generic,$(SOURCEDIR)/ADDCERT.RSC $(TARGETDIR)/addcert.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/HELP.RSC $(TARGETDIR)/help.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/MSGEDITOR.RSC $(TARGETDIR)/msgeditor.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/SMLPROGRESS.RSC $(TARGETDIR)/smlprogress.rsc) + +$(TARGETDIR) : + $(call createdir,"$@") + +DO_NOTHING : + @echo do nothing + +# +# The targets invoked by bld... +# + +BLD : $(TARGETDIR) COPYFILES + +CLEAN : + -$(ERASE) $(call slash2generic,$(TARGETDIR)/addcert.rsc) + -$(ERASE) $(call slash2generic,$(TARGETDIR)/help.rsc) + -$(ERASE) $(call slash2generic,$(TARGETDIR)/msgeditor.rsc) + -$(ERASE) $(call slash2generic,$(TARGETDIR)/smlprogress.rsc) + +RELEASABLES : + @echo $(TARGETDIR)/addcert.rsc + @echo $(TARGETDIR)/help.rsc + @echo $(TARGETDIR)/msgeditor.rsc + @echo $(TARGETDIR)/smlprogress.rsc + +MAKMAKE : DO_NOTHING + +SAVESPACE : DO_NOTHING + +RESOURCE : DO_NOTHING + +FREEZE : DO_NOTHING + +LIB : DO_NOTHING + +CLEANLIB : DO_NOTHING + +FINAL : DO_NOTHING diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/group/bafl_resource_files.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lowlevellibsandfws/apputils/group/bafl_resource_files.mk Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,208 @@ +# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# Copy test files to test sortbytable functionality. +# +# + +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ +TMPHOME:=$(subst \,/,$(SBS_HOME)) +GNUCAT:=$(TMPHOME)/win32/cygwin/bin/cat.exe + +include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk + +ifeq ($(findstring WINS,$(PLATFORM)),WINS) +TARGET_DIRECTORY=$(EPOCROOT)epoc32/release/$(PLATFORM)/$(CFG)/z/system/data +else +TARGET_DIRECTORY=$(EPOCROOT)epoc32/data/z/system/data +endif + +SOURCEDIR=$(EXTENSION_ROOT)/../tsrc + +$(TARGET_DIRECTORY) : + $(call createdir,"$@") + +TARGET_FILES=\ + $(TARGET_DIRECTORY)/t_compressed_unicode_1.rsc $(EPOCROOT)epoc32\include\T_COMPRESSED_UNICODE_1.RSG \ + $(TARGET_DIRECTORY)/t_compressed_unicode_2.rsc $(EPOCROOT)epoc32\include\T_COMPRESSED_UNICODE_2.RSG \ + $(TARGET_DIRECTORY)/t_dictionary_compressed_versio_of_2.rsc \ + $(TARGET_DIRECTORY)/t_calypso_test_resource_file_1.rsc \ + $(TARGET_DIRECTORY)/t_notrscfile.rsc \ + $(TARGET_DIRECTORY)/rscheader.bin \ + $(TARGET_DIRECTORY)/newrscformat.rsc \ + +$(TARGET_DIRECTORY)/t_compressed_unicode_1.rsc : $(SOURCEDIR)/T_COMPRESSED_UNICODE_1.RPP + @RCOMP.EXE -s$? -o$@ -h$(EPOCROOT)epoc32/include/T_COMPRESSED_UNICODE_1.RSG -u -{0x000eb205,*} +$(EPOCROOT)epoc32/include/T_COMPRESSED_UNICODE_1.RSG : $(SOURCEDIR)/T_COMPRESSED_UNICODE_1.RPP + @RCOMP.EXE -s$? -o$(TARGET_DIRECTORY)/t_compressed_unicode_1.rsc -h$@ -u -{0x000eb205,*} + +$(TARGET_DIRECTORY)/t_compressed_unicode_2.rsc : $(SOURCEDIR)/T_COMPRESSED_UNICODE_2.RPP + @RCOMP.EXE -s$? -o$@ -h$(EPOCROOT)epoc32/include/T_COMPRESSED_UNICODE_2.RSG -u +$(EPOCROOT)epoc32/include/T_COMPRESSED_UNICODE_2.RSG : $(SOURCEDIR)/T_COMPRESSED_UNICODE_2.RPP + @RCOMP.EXE -s$? -o$(TARGET_DIRECTORY)/t_compressed_unicode_2.rsc -h$@ -u + +$(TARGET_DIRECTORY)/t_dictionary_compressed_versio_of_2.rsc : $(SOURCEDIR)/T_GENERATE_DICTIONARY_COMPRESSED_VERSION_OF_2.PL + @perl -w $(SOURCEDIR)/T_GENERATE_DICTIONARY_COMPRESSED_VERSION_OF_2.PL $(TARGET_DIRECTORY)/t_dictionary_compressed_versio_of_2.rsc + +$(TARGET_DIRECTORY)/t_calypso_test_resource_file_1.rsc : $(SOURCEDIR)/T_CALYPSO_COMPILED_RESOURCE_FILE_1.RSC + $(CP) $(call slash2generic,$(SOURCEDIR)/T_CALYPSO_COMPILED_RESOURCE_FILE_1.RSC $(TARGET_DIRECTORY)/t_calypso_test_resource_file_1.rsc) + +$(TARGET_DIRECTORY)/t_notrscfile.rsc : $(SOURCEDIR)/T_NotRscFile.RSC + $(CP) $(call slash2generic,$(SOURCEDIR)/T_NotRscFile.RSC $(TARGET_DIRECTORY)/t_notrscfile.rsc) + +$(TARGET_DIRECTORY)/rscheader.bin : + $(CP) $(call slash2generic,$(SOURCEDIR)/RscHeader.Bin $(TARGET_DIRECTORY)/rscheader.bin) + +$(TARGET_DIRECTORY)/newrscformat.rsc : $(SOURCEDIR)/RscHeader.Bin $(SOURCEDIR)/RLETest.BMP $(TARGET_DIRECTORY)/TRSC.rsc + @BMCONV.EXE $(SOURCEDIR)/16RAMC.MBM /c16$(SOURCEDIR)/RLETest.BMP +# $(CP) $(call slash2generic,$(SOURCEDIR)/RscHeader.Bin) + $(call slash2generic,$(TARGET_DIRECTORY)/TRSC.rsc) + $(call slash2generic,$(SOURCEDIR)/16RAMC.MBM) $(call slash2generic,$(TARGET_DIRECTORY)/newrscformat.rsc) + $(GNUCAT) $(call slash2generic,$(SOURCEDIR)/RscHeader.Bin) $(call slash2generic,$(TARGET_DIRECTORY)/TRSC.rsc) $(call slash2generic,$(SOURCEDIR)/16RAMC.MBM) > $(call slash2generic,$(TARGET_DIRECTORY)/newrscformat.rsc) + +COPYFILES : + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv1.RSC $(TARGET_DIRECTORY)/trsc_inv1.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv2.RSC $(TARGET_DIRECTORY)/trsc_inv2.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv3.RSC $(TARGET_DIRECTORY)/trsc_inv3.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv4.RSC $(TARGET_DIRECTORY)/trsc_inv4.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv5.RSC $(TARGET_DIRECTORY)/trsc_inv5.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv6.RSC $(TARGET_DIRECTORY)/trsc_inv6.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv7.RSC $(TARGET_DIRECTORY)/trsc_inv7.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv8.RSC $(TARGET_DIRECTORY)/trsc_inv8.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRSC_Inv9.RSC $(TARGET_DIRECTORY)/trsc_inv9.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscCalypso_Inv10.RSC $(TARGET_DIRECTORY)/trsccalypso_inv10.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscCalypso_Inv11.RSC $(TARGET_DIRECTORY)/trsccalypso_inv11.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscCalypso_Inv12.RSC $(TARGET_DIRECTORY)/trsccalypso_inv12.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscComprU_Inv13.RSC $(TARGET_DIRECTORY)/trsccompru_inv13.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscComprU_Inv14.RSC $(TARGET_DIRECTORY)/trsccompru_inv14.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscComprU_Inv15.RSC $(TARGET_DIRECTORY)/trsccompru_inv15.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscCalypso_Inv16.RSC $(TARGET_DIRECTORY)/trsccalypso_inv16.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/TRscCalypso_Inv17.RSC $(TARGET_DIRECTORY)/trsccalypso_inv17.rsc) + $(GNUCAT) $(call slash2generic,$(SOURCEDIR)/RscHeader.Bin) $(call slash2generic,$(TARGET_DIRECTORY)/t_calypso_test_resource_file_1.rsc) > $(call slash2generic,$(TARGET_DIRECTORY)/trscromcalypsocomprnewfmt.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_ECom.spi $(TARGET_DIRECTORY)/spi_ecom.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_EComRsc1.RSC $(TARGET_DIRECTORY)/spi_ecomrsc1.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_EComRsc2.RSC $(TARGET_DIRECTORY)/spi_ecomrsc2.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_EComRsc3.RSC $(TARGET_DIRECTORY)/spi_ecomrsc3.rsc) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/ECom-1-0.spi $(TARGET_DIRECTORY)/ecom-1-0.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/ECom-1-0.s02 $(TARGET_DIRECTORY)/ecom-1-0.s02) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/ECom-2-0.spi $(TARGET_DIRECTORY)/ecom-2-0.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/ECom-2-0.s02 $(TARGET_DIRECTORY)/ecom-2-0.s02) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_ECom-0-0.spi $(TARGET_DIRECTORY)/spi_ecom-0-0.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_ECom-1-0.spi $(TARGET_DIRECTORY)/spi_ecom-1-0.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/CECom-0-0.spi $(TARGET_DIRECTORY)/cecom-0-0.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/CECom-1-0.spi $(TARGET_DIRECTORY)/cecom-1-0.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_ECom_Case-0-0.spi $(TARGET_DIRECTORY)/spi_ecom_case-0-0.spi) + $(CP) -f $(call slash2generic,$(SOURCEDIR)/Spi_ECom_Case-1-0.spi $(TARGET_DIRECTORY)/spi_ecom_case-1-0.spi) + + +DO_NOTHING : + @echo do nothing + +# the targets below are the public ones + +MAKMAKE : DO_NOTHING + +BLD : DO_NOTHING + +SAVESPACE : BLD + +FREEZE : DO_NOTHING + +LIB : DO_NOTHING + +CLEANLIB : DO_NOTHING + +RESOURCE : $(TARGET_DIRECTORY) $(TARGET_FILES) COPYFILES + +CLEAN : + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/t_compressed_unicode_1.rsc $(EPOCROOT)epoc32/include/t_compressed_unicode_1.rsg) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/t_compressed_unicode_2.rsc $(EPOCROOT)epoc32/include/t_compressed_unicode_2.rsg) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/t_dictionary_compressed_versio_of_2.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/t_calypso_test_resource_file_1.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/t_notrscfile.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/rscheader.bin) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/newrscformat.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv1.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv2.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv3.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv4.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv5.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv6.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv7.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv8.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsc_inv9.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccalypso_inv10.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccalypso_inv11.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccalypso_inv12.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccompru_inv13.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccompru_inv14.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccompru_inv15.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccalypso_inv16.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trsccalypso_inv17.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/trscromcalypsocomprnewfmt.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecom.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecomrsc1.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecomrsc2.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecomrsc3.rsc) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/ecom-1-0.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/ecom-1-0.s02) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/ecom-2-0.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/ecom-2-0.s02) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecom-0-0.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecom-1-0.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/cecom-0-0.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/cecom-1-0.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecom_case-0-0.spi) + -$(ERASE) $(call slash2generic,$(TARGET_DIRECTORY)/spi_ecom_case-1-0.spi) + +RELEASABLES : + @echo $(TARGET_DIRECTORY)/t_compressed_unicode_1.rsc $(EPOCROOT)epoc32/include/t_compressed_unicode_1.rsg + @echo $(TARGET_DIRECTORY)/t_compressed_unicode_2.rsc $(EPOCROOT)epoc32/include/t_compressed_unicode_2.rsg + @echo $(TARGET_DIRECTORY)/t_dictionary_compressed_versio_of_2.rsc + @echo $(TARGET_DIRECTORY)/t_calypso_test_resource_file_1.rsc + @echo $(TARGET_DIRECTORY)/t_notrscfile.rsc + @echo $(TARGET_DIRECTORY)/rscheader.bin + @echo $(TARGET_DIRECTORY)/newrscformat.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv1.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv2.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv3.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv4.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv5.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv6.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv7.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv8.rsc + @echo $(TARGET_DIRECTORY)/trsc_inv9.rsc + @echo $(TARGET_DIRECTORY)/trsccalypso_inv10.rsc + @echo $(TARGET_DIRECTORY)/trsccalypso_inv11.rsc + @echo $(TARGET_DIRECTORY)/trsccalypso_inv12.rsc + @echo $(TARGET_DIRECTORY)/trsccompru_inv13.rsc + @echo $(TARGET_DIRECTORY)/trsccompru_inv14.rsc + @echo $(TARGET_DIRECTORY)/trsccompru_inv15.rsc + @echo $(TARGET_DIRECTORY)/trsccalypso_inv16.rsc + @echo $(TARGET_DIRECTORY)/trsccalypso_inv17.rsc + @echo $(TARGET_DIRECTORY)/trscromcalypsocomprnewfmt.rsc + @echo $(TARGET_DIRECTORY)/spi_ecom.spi + @echo $(TARGET_DIRECTORY)/spi_ecomrsc1.rsc + @echo $(TARGET_DIRECTORY)/spi_ecomrsc2.rsc + @echo $(TARGET_DIRECTORY)/spi_ecomrsc3.rsc + @echo $(TARGET_DIRECTORY)/ecom-1-0.spi + @echo $(TARGET_DIRECTORY)/ecom-1-0.s02 + @echo $(TARGET_DIRECTORY)/ecom-2-0.spi + @echo $(TARGET_DIRECTORY)/ecom-2-0.s02 + @echo $(TARGET_DIRECTORY)/spi_ecom-0-0.spi + @echo $(TARGET_DIRECTORY)/spi_ecom-1-0.spi + @echo $(TARGET_DIRECTORY)/cecom-0-0.spi + @echo $(TARGET_DIRECTORY)/cecom-1-0.spi + @echo $(TARGET_DIRECTORY)/spi_ecom_case-0-0.spi + @echo $(TARGET_DIRECTORY)/spi_ecom_case-1-0.spi + +FINAL : DO_NOTHING diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/src/Baksrv.cpp --- a/lowlevellibsandfws/apputils/src/Baksrv.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/src/Baksrv.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -1027,16 +1027,19 @@ TCompletionType completionType = ECompleteSync; - iClientMessage = BSUL::CClientMessage::NewL(aMessage); + BSUL::CClientMessage* clientMessage = 0; + clientMessage = BSUL::CClientMessage::NewL(aMessage); //Push iClientMessage onto the cleanupstack. Although an instance variable, //the lifetime of the object is contained to this function so it needs to //be pushed and popped here as it is not deleted in the destructor - CleanupStack::PushL(iClientMessage); + CleanupStack::PushL(clientMessage); //Validate the message - TRAPD(error, iClientMessage->ValidateL()); - + TRAPD(error, clientMessage->ValidateL()); + + iClientMessage = clientMessage; + if(error == KErrNone) { TRAP(error, DoServiceL(completionType)); @@ -1055,7 +1058,8 @@ } //Pop and destroy message - CleanupStack::PopAndDestroy(iClientMessage); + CleanupStack::PopAndDestroy(clientMessage); + clientMessage = NULL; iClientMessage = NULL; } diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/apputils/src/StringPoolImplementation.cpp --- a/lowlevellibsandfws/apputils/src/StringPoolImplementation.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/apputils/src/StringPoolImplementation.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -60,7 +60,8 @@ CStringPoolNode* theProblem = reinterpret_cast( iCIHashTable[i]->At(j).iVal & KTokenToNode); - __LOG(theProblem->iDes->Des()); + if(theProblem->iDes) + __LOG(theProblem->iDes->Des()); } } } @@ -80,7 +81,8 @@ CStringPoolNode* theProblem = reinterpret_cast( iCSHashTable[i]->At(j).iVal & KTokenToNode); - __LOG(theProblem->iDes->Des()); + if(theProblem->iDes) + __LOG(theProblem->iDes->Des()); } } } diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/genericusabilitylib/example/src/euserhl_walkthrough.cpp --- a/lowlevellibsandfws/genericusabilitylib/example/src/euserhl_walkthrough.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/genericusabilitylib/example/src/euserhl_walkthrough.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -1217,8 +1217,13 @@ } { + TInt r =KErrNone; LCleanedupHandle managedFs; - managedFs->Connect(); + r = managedFs->Connect(); + if (r != KErrNone) + { + User::Leave(r); + } //default cleanup strategy is to call RFs::Close() on scope exit } diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/DisableDrivesTest/t_disabledrives.cpp --- a/lowlevellibsandfws/pluginfw/Framework/DisableDrivesTest/t_disabledrives.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/DisableDrivesTest/t_disabledrives.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -236,7 +236,7 @@ Stub class(for CEComServer) used for the creation of CRegistrar class object. CEComServer class acts as observer for CRegistrar. */ -class CTestRegistrarObserver : public MRegistrarObserver +class CTestRegistrarObserver : public MRegistrarObserver // codescanner::missingcclass { public: // This function is used by RegistrarObserver (i.e.CEComServer) to notify its diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/EcomTestUtils.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/EcomTestUtils.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/EcomTestUtils.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -208,8 +208,13 @@ } //determine the ROM confguration (NAND or non-NAND) + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + return r; + } TBool nandBuild = (EComTestUtils::RomBuildType(fs)==ENandRomBuild); fs.Close(); @@ -251,8 +256,12 @@ //is also checking the media type of C drive to determine the same. //Currently added this check for WDP enabled in case of H4 'muid == HAL::EMachineUid_OmapH4' only TDriveInfo driveInfo; - - fs.Connect(); + TInt rf = KErrNone; + rf = fs.Connect(); + if (rf != KErrNone) + { + return rf; + } fs.Drive(driveInfo, EDriveC); fs.Close(); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_makefilewriteable.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_makefilewriteable.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_makefilewriteable.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -25,9 +25,13 @@ { // Make sure the file is not read-only RDebug::Print(_L("Open for writing file %S\n"), &aFile); - + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } CFileMan* fileMan = CFileMan::NewL(fs); CleanupStack::PushL(fileMan); TInt err = fileMan->Attribs(aFile, 0, KEntryAttReadOnly, TTime(0), 0); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemancopyfile.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemancopyfile.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemancopyfile.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -26,8 +26,13 @@ // Copy the files specified. void CopyFileL(const TDesC& anOld, const TDesC& aNew) { + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } CleanupClosePushL(fs); CFileMan* fileMan = CFileMan::NewL(fs); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemandeletedir.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemandeletedir.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemandeletedir.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -24,8 +24,13 @@ TInt DoDeleteDirL(const TDesC& aPath) { + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } CFileMan* fileMan = CFileMan::NewL(fs); CleanupStack::PushL(fileMan); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemandeletefile.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemandeletefile.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemandeletefile.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -23,8 +23,13 @@ void DeleteFileL(const TDesC& aFile) { + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } CleanupClosePushL(fs); CFileMan* fileMan = CFileMan::NewL(fs); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemanrename.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemanrename.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processfilemanrename.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -24,8 +24,13 @@ TInt DoRenameFileL(const TDesC& anOld,const TDesC& aNew) { + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } CFileMan* fileMan = CFileMan::NewL(fs); CleanupStack::PushL(fileMan); // Ensure the path exists diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrfsdeletefile.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrfsdeletefile.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrfsdeletefile.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -22,8 +22,13 @@ TInt DoDeleteFileL(const TDesC& aFile) { + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } // Make the file writeable fs.SetAtt(aFile, 0, KEntryAttReadOnly); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrfsreplacefile.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrfsreplacefile.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrfsreplacefile.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -24,8 +24,13 @@ TInt DoReplaceFileL(const TDesC& anOld,const TDesC& aNew) { + TInt r = KErrNone; RFs fs; - fs.Connect(); + r = fs.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } // Ensure the path exists TInt err = fs.MkDirAll(aNew); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrloaderdeletefile.cpp --- a/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrloaderdeletefile.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/EcomTestUtils/t_processrloaderdeletefile.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -23,8 +23,13 @@ void DeleteFileL(const TDesC& aFile) { + TInt r = KErrNone; RLoader rloader; - rloader.Connect(); + r = rloader.Connect(); + if (r != KErrNone) + { + User::Leave(r); + } CleanupClosePushL(rloader); TInt err = rloader.Delete(aFile); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/Example/EComHashExample.h --- a/lowlevellibsandfws/pluginfw/Framework/Example/EComHashExample.h Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComHashExample.h Wed Aug 18 11:27:44 2010 +0300 @@ -18,7 +18,7 @@ // ____________________________________________________________________________ // -class CImplementationHashExample +class CImplementationHashExample // codescanner::missingcclass { public: static CImplementationHashExample* NewL(TAny* aInitParams); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/Example/EComLoadMgrExample1.h --- a/lowlevellibsandfws/pluginfw/Framework/Example/EComLoadMgrExample1.h Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComLoadMgrExample1.h Wed Aug 18 11:27:44 2010 +0300 @@ -18,7 +18,7 @@ // ____________________________________________________________________________ // -class CImplementationLoadMgrExample1 +class CImplementationLoadMgrExample1 // codescanner::missingcclass { public: static CImplementationLoadMgrExample1* NewL(TAny* aInitParams); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/Example/EComLoadMgrExample2.h --- a/lowlevellibsandfws/pluginfw/Framework/Example/EComLoadMgrExample2.h Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComLoadMgrExample2.h Wed Aug 18 11:27:44 2010 +0300 @@ -18,7 +18,7 @@ // ____________________________________________________________________________ // -class CImplementationLoadMgrExample2 +class CImplementationLoadMgrExample2 // codescanner::missingcclass { public: static CImplementationLoadMgrExample2* NewL(TAny* aInitParams); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/FrameTests/MagicUnitTests.cpp --- a/lowlevellibsandfws/pluginfw/Framework/FrameTests/MagicUnitTests.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/FrameTests/MagicUnitTests.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -60,6 +60,8 @@ iStateAccessor = NULL; delete iCtorValidator; delete iDtorValidator; + iCtorValidator = 0; + iDtorValidator = 0; return error; } @@ -273,10 +275,16 @@ TInt error = CUnitTest::RunError(aError); // Chain to base delete iUTContext; delete iStateAccessor; + + iUTContext = 0; + iStateAccessor = 0; delete iCtorValidator; delete iDtorValidator; + iCtorValidator = 0; + iDtorValidator = 0; + return error; } @@ -335,11 +343,17 @@ { // The RunL left so chain to the base first and then cleanup TInt error = CUnitTest::RunError(aError); // Chain to base - delete iUTContext; - delete iStateAccessor; + delete iUTContext; + delete iStateAccessor; + + delete iCtorValidator; + delete iDtorValidator; - delete iCtorValidator; - delete iDtorValidator; + iUTContext = 0; + iStateAccessor = 0; + + iCtorValidator = 0; + iDtorValidator = 0; return error; } @@ -399,12 +413,19 @@ { // The RunL left so chain to the base first and then cleanup TInt error = CUnitTest::RunError(aError); // Chain to base - delete iUTContext; - delete iStateAccessor; + delete iUTContext; + delete iStateAccessor; + + delete iCtorValidator; + delete iDefaultValidator; + delete iDtorValidator; - delete iCtorValidator; - delete iDefaultValidator; - delete iDtorValidator; + iUTContext = 0; + iStateAccessor = 0; + + iCtorValidator = 0; + iDefaultValidator = 0; + iDtorValidator = 0; return error; } @@ -467,12 +488,19 @@ { // The RunL left so chain to the base first and then cleanup TInt error = CUnitTest::RunError(aError); // Chain to base - delete iUTContext; - delete iStateAccessor; + delete iUTContext; + delete iStateAccessor; + + delete iCtorValidator; + delete iDefaultValidator; + delete iDtorValidator; - delete iCtorValidator; - delete iDefaultValidator; - delete iDtorValidator; + iUTContext = 0; + iStateAccessor = 0; + + iCtorValidator = 0; + iDefaultValidator = 0; + iDtorValidator = 0; return error; } diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/NotificationTest/t_ecomcancel.cpp --- a/lowlevellibsandfws/pluginfw/Framework/NotificationTest/t_ecomcancel.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/NotificationTest/t_ecomcancel.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -743,11 +743,16 @@ TheTest.Title(); TheTest.Start(_L("Starting tests...")); TInt err = KErrNone; + TInt r = KErrNone; CTrapCleanup* cleanup = CTrapCleanup::New(); CActiveScheduler* scheduler = new(ELeave)CActiveScheduler; CActiveScheduler::Install(scheduler); - TheFs.Connect(); + r = TheFs.Connect(); + if (r != KErrNone) + { + return r; + } // Reset the test environment under textshell in emulator/ROM TRAP(err, ResetEComEnvironmentL()); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/RegistrarTest/t_registrar.cpp --- a/lowlevellibsandfws/pluginfw/Framework/RegistrarTest/t_registrar.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/RegistrarTest/t_registrar.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -326,7 +326,7 @@ Stub class(for CEComServer) used for the creation of CRegistrar class object. CEComServer class acts as observer for CRegistrar. */ -class CTestRegistrarObserver : public MRegistrarObserver +class CTestRegistrarObserver : public MRegistrarObserver // codescanner::missingcclass { public: // This function is used by RegistrarObserver (i.e.CEComServer) to notify its diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/ResolverTest/t_resolver.cpp --- a/lowlevellibsandfws/pluginfw/Framework/ResolverTest/t_resolver.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/ResolverTest/t_resolver.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -148,7 +148,7 @@ Stub class(for CEComServer) used for the creation of CRegistrar class object. CEComServer class acts as observer for CRegistrar. */ -class CTestRegistrarObserver : public MRegistrarObserver +class CTestRegistrarObserver : public MRegistrarObserver // codescanner::missingcclass { public: // This function is used by RegistrarObserver (i.e.CEComServer) to notify its diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/SimpleTests/t_ecomentry.cpp --- a/lowlevellibsandfws/pluginfw/Framework/SimpleTests/t_ecomentry.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/SimpleTests/t_ecomentry.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -49,7 +49,7 @@ #define TEST(arg) ::Check((arg), __LINE__) #define TEST2(aValue, aExpected) ::Check(aValue, aExpected, __LINE__) -class CEComEntryTest +class CEComEntryTest // codescanner::missingcclass { public: static void TestEComEntryL(); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/SuicideTests/SuicideUnitTests.cpp --- a/lowlevellibsandfws/pluginfw/Framework/SuicideTests/SuicideUnitTests.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/SuicideTests/SuicideUnitTests.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -55,6 +55,9 @@ iStateAccessor = NULL; delete iCtorValidator; delete iDtorValidator; + + iCtorValidator = 0; + iDtorValidator = 0; return error; } diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Framework/frame/RegistryData.cpp --- a/lowlevellibsandfws/pluginfw/Framework/frame/RegistryData.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Framework/frame/RegistryData.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -316,10 +316,13 @@ delete iImplInfo; iImplInfo = NULL; } - iImplInfo=CImplementationInformation::NewLC(EFalse,aStore); + CImplementationInformation* implInfo = 0; + implInfo=CImplementationInformation::NewLC(EFalse,aStore); //as we never store the drive name we need to get this from the parent - iImplInfo->SetDrive(iParent->iParent->iParent->iDrive); - CleanupStack::Pop(1); + implInfo->SetDrive(iParent->iParent->iParent->iDrive); + CleanupStack::Pop(1); + iImplInfo = implInfo; + implInfo = 0; } diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Group/bld.inf --- a/lowlevellibsandfws/pluginfw/Group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -71,7 +71,10 @@ ../Test_Bed/inc/UnitTestObserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecom/test_bed/unittestobserver.h) ../Test_Bed/inc/ManagerObserver.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ecom/test_bed/managerobserver.h) - +//exporting .mk files manually for sirocco //to be removed after tools team make changes +ecom3_buildsis.mk /epoc32/tools/makefile_templates/syslibs/test/ecom3_buildsis.mk +ecom3_postbuild.mk /epoc32/tools/makefile_templates/syslibs/test/ecom3_postbuild.mk +ecom3_relocatetarget.mk /epoc32/tools/makefile_templates/syslibs/test/ecom3_relocatetarget.mk PRJ_MMPFILES // Firstly build the plug-in framework library diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Group/ecom3_buildsis.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lowlevellibsandfws/pluginfw/Group/ecom3_buildsis.mk Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,64 @@ +# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# Params: +# SOURCES - list of .pkg files +# TARGET - not used +# OPTION OUTDIR - mandatory, it is tef_ecomswi +# OPTION INDIR - mandatory, path relative to bld.inf containing the +# .pkg files. +# OPTION CERTPEM - mandatory +# OPTION CERTKEY - mandatory +# OPTION STUBLIST - mandatory, identify stubs in $(SOURCES) +# OPTION SCRIPTNAME - mandatory, perl script to build SIS. Must be in +# same dir as .pkg files. +# +# + +.SUFFIXES: .sis .pkg +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ + + +include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk + +CERTPEM := $(subst /,$(/),$(CERTPEM)) +CERTKEY := $(subst /,$(/),$(CERTKEY)) +OUTDIR := $(subst /,$(/),$(OUTDIR)) +INDIR := $(subst /,$(/),$(INDIR)) +BASEDIR := $(EXTENSION_ROOT)/$(INDIR) + +TARGETS := $(shell perl $(BASEDIR)/$(SCRIPTNAME) -platform $(PLATFORM_PATH) -cfg $(CFG_PATH) -outdir $(OUTDIR) -maketrgt RELEASABLES -sources "$(SOURCES)" -stublist "$(STUBLIST)") +EXTRA := $(shell perl $(BASEDIR)/$(SCRIPTNAME) -platform $(PLATFORM_PATH) -cfg $(CFG_PATH) -outdir $(OUTDIR) -maketrgt EXTRATARGET -sources "$(SOURCES)" -stublist "$(STUBLIST)") + +# +# The targets invoked by abld... +# +FINAL : + $(call createdir,$(subst /,$(/),$(EPOCROOT)epoc32/data/z/$(OUTDIR)/$(CFG_PATH))) + @perl $(call slash2generic, $(BASEDIR)/$(SCRIPTNAME)) -basedir $(BASEDIR) -platform $(PLATFORM_PATH) -cfg $(CFG_PATH) -certpem $(CERTPEM) -certkey $(CERTKEY) -maketrgt FINAL cachedresolverstub.sis + $(CP) $(subst /,$(/),$(BASEDIR)/cachedresolverstub.sis) $(subst /,$(/),$(EPOCROOT)epoc32/data/z/$(OUTDIR)/cachedresolverstub.sis) + @perl $(call slash2generic, $(BASEDIR)/$(SCRIPTNAME)) -basedir $(BASEDIR) -platform $(PLATFORM_PATH) -cfg $(CFG_PATH) -certpem $(CERTPEM) -certkey $(CERTKEY) -maketrgt FINAL cachedresolverupg2signed.sis + $(CP) $(subst /,$(/),$(BASEDIR)/cachedresolverupg2signed.sis) $(subst /,$(/),$(EPOCROOT)epoc32/data/z/$(OUTDIR)/$(CFG_PATH)/cachedresolverupg2signed.sis) + @perl $(call slash2generic, $(BASEDIR)/$(SCRIPTNAME)) -basedir $(BASEDIR) -platform $(PLATFORM_PATH) -cfg $(CFG_PATH) -certpem $(CERTPEM) -certkey $(CERTKEY) -maketrgt FINAL cachedresolverupg9signed.sis + $(CP) $(subst /,$(/),$(BASEDIR)/cachedresolverupg9signed.sis) $(subst /,$(/),$(EPOCROOT)epoc32/data/z/$(OUTDIR)/$(CFG_PATH)/cachedresolverupg9signed.sis) + +BLD MAKMAKE SAVESPACE FREEZE LIB CLEANLIB RESOURCE : + @echo do nothing + +CLEAN : + -$(ERASE) $(TARGETS) $(EXTRA) + +RELEASABLES : + @echo $(TARGETS) $(EXTRA) + diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Group/ecom3_postbuild.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lowlevellibsandfws/pluginfw/Group/ecom3_postbuild.mk Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,353 @@ +# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ + +include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk + +ifeq ($(findstring WINS,$(PLATFORM)),WINS) +TARGETDIR=$(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z +RAMONLYTARGETDIR=$(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/ramonly +SOURCEDIR=$(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH) +SOURCEDIR2=$(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/resource/plugins +else +TARGETDIR=$(EPOCROOT)epoc32/data/z +RAMONLYTARGETDIR=$(EPOCROOT)epoc32/data/z/ramonly +SOURCEDIR=$(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH) +SOURCEDIR2=$(EPOCROOT)epoc32/data/z/resource/plugins +endif + +DO_NOTHING: + @echo do_nothing + +$(RAMONLYTARGETDIR) : + $(call createdir,"$@") + +COPYFILES : + $(CP) $(call slash2generic, $(SOURCEDIR)/heaptestimpl.dll $(TARGETDIR)/heaptestimpl.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/heaptestimpl.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample5.dll $(RAMONLYTARGETDIR)/ecomexample5.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample5.dll $(RAMONLYTARGETDIR)/invalidsidplugin.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample5.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample12.dll $(RAMONLYTARGETDIR)/ecomexample12.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample12.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample12Upgraded.dll $(RAMONLYTARGETDIR)/ecomexample12Upgraded.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample12Upgraded.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample12Downgraded.dll $(RAMONLYTARGETDIR)/ecomexample12Downgraded.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample12Downgraded.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample14.dll $(RAMONLYTARGETDIR)/ecomexample14.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample14.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample14Upgraded.dll $(RAMONLYTARGETDIR)/ecomexample14Upgraded.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample14Upgraded.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample15.dll $(RAMONLYTARGETDIR)/ecomexample15.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample15.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExampleBadData.dll $(RAMONLYTARGETDIR)/ecomexamplebaddata.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExampleBadData.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExampleBadData1.dll $(RAMONLYTARGETDIR)/ecomexamplebaddata1.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExampleBadData1.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExampleBadData2.dll $(RAMONLYTARGETDIR)/ecomexamplebaddata2.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExampleBadData2.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample3.dll $(RAMONLYTARGETDIR)/ecomexample3.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample2.dll $(RAMONLYTARGETDIR)/ecomexample2.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample.dll $(RAMONLYTARGETDIR)/ecomexample.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComNullExample.dll $(RAMONLYTARGETDIR)/ecomnullexample.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComRomOnlyExampleOnC.dll $(RAMONLYTARGETDIR)/ecomromonlyexampleonc.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComRomOnlyExampleOnC.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComRomRslvrExampleOnC.dll $(RAMONLYTARGETDIR)/ecomromrslvrexampleonc.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComRomRslvrExampleOnC.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComRomRslvrExampleOnZ.dll $(RAMONLYTARGETDIR)/ecomromrslvrexampleonz.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/T_PlatSecResolverC.dll $(RAMONLYTARGETDIR)/t_platsecresolverc.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/T_PlatSecResolverC.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/T_PlatSecEcom4.dll $(RAMONLYTARGETDIR)/t_platsececom4.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/T_PlatSecEcom4.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeExample1.dll $(RAMONLYTARGETDIR)/ecomupgradeexample1.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeExample1.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeExample2.dll $(RAMONLYTARGETDIR)/ecomupgradeexample2.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeExample3.dll $(RAMONLYTARGETDIR)/ecomupgradeexample3.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeExample3.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeROExample1.dll $(RAMONLYTARGETDIR)/ecomupgraderoexample1.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeROExample1.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeROExample2.dll $(RAMONLYTARGETDIR)/ecomupgraderoexample2.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeROExample3.dll $(RAMONLYTARGETDIR)/ecomupgraderoexample3.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EcomUpgradeROExample3.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/DefectPlugin.dll $(RAMONLYTARGETDIR)/defectplugin.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/DefectPlugin.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample7.dll $(RAMONLYTARGETDIR)/ecomexample7.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample7.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComExample8.dll $(RAMONLYTARGETDIR)/ecomexample8.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComExample8.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComCR629Example1.dll $(RAMONLYTARGETDIR)/ecomcr629example1.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComCR629Example1.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComCR629Example2.dll $(RAMONLYTARGETDIR)/ecomcr629example2.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComCR629Example2.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/LanguagePlugin.dll $(RAMONLYTARGETDIR)/languageplugin.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/LanguagePlugin.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComHashExample.dll $(RAMONLYTARGETDIR)/ecomhashexample.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComHashExample.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/EComSwiExample.dll $(RAMONLYTARGETDIR)/ecomswiexample.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/EComSwiExample.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/exampleNine.dll $(RAMONLYTARGETDIR)/examplenine.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/exampleNine.dll) + $(CP) $(call slash2generic, $(SOURCEDIR)/dummycustomresolver1.dll $(RAMONLYTARGETDIR)/dummycustomresolver1.dll) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/dummycustomresolver1.dll) + $(CP) $(call slash2generic, $(SOURCEDIR2)/HeapTestImpl.rsc $(TARGETDIR)/heaptestimpl.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/HeapTestImpl.rsc $(RAMONLYTARGETDIR)/invalidsidplugin.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/HeapTestImpl.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample5.RSC $(RAMONLYTARGETDIR)/ecomexample5.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExample5.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample12.RSC $(RAMONLYTARGETDIR)/ecomexample12.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExample12.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample12Upgraded.RSC $(RAMONLYTARGETDIR)/ecomexample12Upgraded.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExample12Upgraded.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample12Downgraded.RSC $(RAMONLYTARGETDIR)/ecomexample12Downgraded.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExample12Downgraded.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample14.RSC $(RAMONLYTARGETDIR)/ecomexample14.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExample14.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample14Upgraded.RSC $(RAMONLYTARGETDIR)/ecomexample14Upgraded.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExample14Upgraded.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample15.RSC $(RAMONLYTARGETDIR)/ecomexample15.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExample15.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExampleBadData.RSC $(RAMONLYTARGETDIR)/ecomexamplebaddata.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExampleBadData.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExampleBadData1.RSC $(RAMONLYTARGETDIR)/ecomexamplebaddata1.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExampleBadData1.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExampleBadData2.RSC $(RAMONLYTARGETDIR)/ecomexamplebaddata2.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComExampleBadData2.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample3.RSC $(RAMONLYTARGETDIR)/ecomexample3.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample2.RSC $(RAMONLYTARGETDIR)/ecomexample2.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample.RSC $(RAMONLYTARGETDIR)/ecomexample.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComRomOnlyExampleOnC.RSC $(RAMONLYTARGETDIR)/ecomromonlyexampleonc.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComRomOnlyExampleOnC.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComRomRslvrExampleOnC.RSC $(RAMONLYTARGETDIR)/ecomromrslvrexampleonc.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComRomRslvrExampleOnC.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComRomRslvrExampleOnZ.RSC $(RAMONLYTARGETDIR)/ecomromrslvrexampleonz.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/T_PlatSecResolverC.RSC $(RAMONLYTARGETDIR)/t_platsecresolverc.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/T_PlatSecResolverC.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/T_PlatSecEcom4.RSC $(RAMONLYTARGETDIR)/t_platsececom4.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/T_PlatSecEcom4.RSC) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EcomNullExample.RSC $(RAMONLYTARGETDIR)/ecomnullexample.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeExample1.rsc $(RAMONLYTARGETDIR)/ecomupgradeexample1.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeExample1.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeExample2.rsc $(RAMONLYTARGETDIR)/ecomupgradeexample2.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeExample3.rsc $(RAMONLYTARGETDIR)/ecomupgradeexample3.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeExample3.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeROExample1.rsc $(RAMONLYTARGETDIR)/ecomupgraderoexample1.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeROExample1.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeROExample2.rsc $(RAMONLYTARGETDIR)/ecomupgraderoexample2.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeROExample3.rsc $(RAMONLYTARGETDIR)/ecomupgraderoexample3.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EcomUpgradeROExample3.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/DefectPlugin.rsc $(RAMONLYTARGETDIR)/defectplugin.rsc) + -$(ERASE) $(SOURCEDIR2)/DefectPlugin.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample7.rsc $(RAMONLYTARGETDIR)/ecomexample7.rsc) + -$(ERASE) $(SOURCEDIR2)/EComExample7.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComExample8.rsc $(RAMONLYTARGETDIR)/ecomexample8.rsc) + -$(ERASE) $(SOURCEDIR2)/EComExample8.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComCR629Example1.rsc $(RAMONLYTARGETDIR)/ecomcr629example1.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComCR629Example1.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComCR629Example2.rsc $(RAMONLYTARGETDIR)/ecomcr629example2.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComCR629Example2.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.rsc $(RAMONLYTARGETDIR)/languageplugin.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.r01 $(RAMONLYTARGETDIR)/languageplugin.r01) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.r01) + $(CP) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.r02 $(RAMONLYTARGETDIR)/languageplugin.r02) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.r02) + $(CP) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.r03 $(RAMONLYTARGETDIR)/languageplugin.r03) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/LanguagePlugin.r03) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComHashExample.rsc $(RAMONLYTARGETDIR)/ecomhashexample.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComHashExample.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/EComSwiExample.rsc $(RAMONLYTARGETDIR)/ecomswiexample.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/EComSwiExample.rsc) + $(CP) $(call slash2generic, $(SOURCEDIR2)/dummycustomresolver1.rsc $(RAMONLYTARGETDIR)/dummycustomresolver1.rsc) + -$(ERASE) $(call slash2generic, $(SOURCEDIR2)/dummycustomresolver1.rsc) + +# +# The targets invoked by bld... +# + +MAKMAKE : DO_NOTHING + +BLD : $(RAMONLYTARGETDIR) COPYFILES + +CLEAN : + -$(ERASE) $(call slash2generic, $(TARGETDIR)/heaptestimpl.dll) + -$(ERASE) $(call slash2generic, $(TARGETDIR)/heaptestimpl.rsc ) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample5.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample12.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample12Upgraded.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample12Downgraded.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample14.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample14Upgraded.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample15.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexamplebaddata.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexamplebaddata1.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexamplebaddata2.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample3.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample2.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample.rsc ) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomromonlyexampleonc.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomromrslvrexampleonc.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomromrslvrexampleonz.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample5.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample12.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample12Upgraded.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample12Downgraded.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample14.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample14Upgraded.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample15.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexamplebaddata.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexamplebaddata1.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexamplebaddata2.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample3.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample2.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomromonlyexampleonc.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomromrslvrexampleonc.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomromrslvrexampleonz.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/invalidsidplugin.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/invalidsidplugin.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/t_platsecresolverc.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/t_platsecresolverc.rsc ) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/t_platsececom4.dll ) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/t_platsececom4.rsc) + + + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomnullexample.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomnullexample.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgradeexample1.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgradeexample1.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgradeexample2.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgradeexample2.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgradeexample3.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgradeexample3.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgraderoexample1.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgraderoexample1.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgraderoexample2.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgraderoexample2.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgraderoexample3.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomupgraderoexample3.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/defectplugin.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/defectplugin.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample7.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample7.rsc ) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample8.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomexample8.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomcr629example1.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomcr629example1.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomcr629example2.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomcr629example2.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/languageplugin.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/languageplugin.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/languageplugin.r01) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/languageplugin.r02) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/languageplugin.r03) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomhashexample.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomhashexample.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomswiexample.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/ecomswiexample.rsc) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/examplenine.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/dummycustomresolver1.dll) + -$(ERASE) $(call slash2generic, $(RAMONLYTARGETDIR)/dummycustomresolver1.rsc) + +SAVESPACE : DO_NOTHING + +RESOURCE : DO_NOTHING + +FREEZE : DO_NOTHING + +LIB : DO_NOTHING + +CLEANLIB : DO_NOTHING + +FINAL : DO_NOTHING + +RELEASABLES : + @echo $(TARGETDIR)/heaptestimpl.dll + @echo $(TARGETDIR)/heaptestimpl.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample5.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample12.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample12Upgraded.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample12Downgraded.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample14.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample14Upgraded.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample15.rsc + @echo $(RAMONLYTARGETDIR)/ecomexamplebaddata.rsc + @echo $(RAMONLYTARGETDIR)/ecomexamplebaddata1.rsc + @echo $(RAMONLYTARGETDIR)/ecomexamplebaddata2.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample3.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample2.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample.rsc + @echo $(RAMONLYTARGETDIR)/ecomromonlyexampleonc.rsc + @echo $(RAMONLYTARGETDIR)/ecomromrslvrexampleonc.rsc + @echo $(RAMONLYTARGETDIR)/ecomromrslvrexampleonz.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample5.dll + @echo $(RAMONLYTARGETDIR)/ecomexample12.dll + @echo $(RAMONLYTARGETDIR)/ecomexample12Upgraded.dll + @echo $(RAMONLYTARGETDIR)/ecomexample12Downgraded.dll + @echo $(RAMONLYTARGETDIR)/ecomexample14.dll + @echo $(RAMONLYTARGETDIR)/ecomexample14Upgraded.dll + @echo $(RAMONLYTARGETDIR)/ecomexample15.dll + @echo $(RAMONLYTARGETDIR)/ecomexamplebaddata.dll + @echo $(RAMONLYTARGETDIR)/ecomexamplebaddata1.dll + @echo $(RAMONLYTARGETDIR)/ecomexamplebaddata2.dll + @echo $(RAMONLYTARGETDIR)/ecomexample3.dll + @echo $(RAMONLYTARGETDIR)/ecomexample2.dll + @echo $(RAMONLYTARGETDIR)/ecomexample.dll + @echo $(RAMONLYTARGETDIR)/ecomromonlyexampleonc.dll + @echo $(RAMONLYTARGETDIR)/ecomromrslvrexampleonc.dll + @echo $(RAMONLYTARGETDIR)/ecomromrslvrexampleonz.dll + @echo $(RAMONLYTARGETDIR)/invalidsidplugin.rsc + @echo $(RAMONLYTARGETDIR)/invalidsidplugin.dll + @echo $(RAMONLYTARGETDIR)/t_platsecresolverc.dll + @echo $(RAMONLYTARGETDIR)/t_platsecresolverc.rsc + @echo $(RAMONLYTARGETDIR)/t_platsececom4.dll + @echo $(RAMONLYTARGETDIR)/t_platsececom4.rsc + @echo $(RAMONLYTARGETDIR)/ecomnullexample.dll + @echo $(RAMONLYTARGETDIR)/ecomnullexample.rsc + @echo $(RAMONLYTARGETDIR)/ecomupgradeexample1.dll + @echo $(RAMONLYTARGETDIR)/ecomupgradeexample1.rsc + @echo $(RAMONLYTARGETDIR)/ecomupgradeexample2.dll + @echo $(RAMONLYTARGETDIR)/ecomupgradeexample2.rsc + @echo $(RAMONLYTARGETDIR)/ecomupgradeexample3.dll + @echo $(RAMONLYTARGETDIR)/ecomupgradeexample3.rsc + @echo $(RAMONLYTARGETDIR)/ecomupgraderoexample1.dll + @echo $(RAMONLYTARGETDIR)/ecomupgraderoexample1.rsc + @echo $(RAMONLYTARGETDIR)/ecomupgraderoexample2.dll + @echo $(RAMONLYTARGETDIR)/ecomupgraderoexample2.rsc + @echo $(RAMONLYTARGETDIR)/ecomupgraderoexample3.dll + @echo $(RAMONLYTARGETDIR)/ecomupgraderoexample3.rsc + @echo $(RAMONLYTARGETDIR)/defectplugin.dll + @echo $(RAMONLYTARGETDIR)/defectplugin.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample7.dll + @echo $(RAMONLYTARGETDIR)/ecomexample7.rsc + @echo $(RAMONLYTARGETDIR)/ecomexample8.dll + @echo $(RAMONLYTARGETDIR)/ecomexample8.rsc + @echo $(RAMONLYTARGETDIR)/ecomcr629example1.dll + @echo $(RAMONLYTARGETDIR)/ecomcr629example1.rsc + @echo $(RAMONLYTARGETDIR)/ecomcr629example2.dll + @echo $(RAMONLYTARGETDIR)/ecomcr629example2.rsc + @echo $(RAMONLYTARGETDIR)/languageplugin.dll + @echo $(RAMONLYTARGETDIR)/languageplugin.rsc + @echo $(RAMONLYTARGETDIR)/languageplugin.r01 + @echo $(RAMONLYTARGETDIR)/languageplugin.r02 + @echo $(RAMONLYTARGETDIR)/languageplugin.r03 + @echo $(RAMONLYTARGETDIR)/ecomhashexample.dll + @echo $(RAMONLYTARGETDIR)/ecomhashexample.rsc + @echo $(RAMONLYTARGETDIR)/ecomswiexample.dll + @echo $(RAMONLYTARGETDIR)/ecomswiexample.rsc + @echo $(RAMONLYTARGETDIR)/examplenine.dll + @echo $(RAMONLYTARGETDIR)/dummycustomresolver1.dll + @echo $(RAMONLYTARGETDIR)/dummycustomresolver1.rsc diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Group/ecom3_relocatetarget.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lowlevellibsandfws/pluginfw/Group/ecom3_relocatetarget.mk Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,74 @@ +# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# Different from ecom3_postbuild.mk in that on armv5 the RAMONLYTARGETDIR +# is not \epoc32\data\z\ramonly. It is \epoc32\release\armv5\\z\ramonly. +# This template has to preserve the udeb/urel targets. +# Params: +# SOURCES - list of .exe and .dll files to relocate +# TARGET - not used +# OPTION TARGETDIR - mandatory, it is "ramonly" for ecom testing. +# OPTION TARGETBASE - optional, overrides \epoc32\release\\\z +# OPTION SOURCEDIR - optional, overrides \epoc32\release\\ +# +# + +TMPROOT:=$(subst \,/,$(EPOCROOT)) +EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/ + +include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk + +# $(/) is actually back slash in Windows environment. Since bld.inf are written +# with forward slashes and $(CP) is "copy", this substitution is important. +TARGETDIR := $(subst /,$(/),$(TARGETDIR)) + +ifdef TARGETBASE +TARGETBASE := $(subst PLATFORM,$(PLATFORM_PATH),$(TARGETBASE)) +TARGETBASE := $(subst CFG,$(CFG_PATH),$(TARGETBASE)) +TARGETBASE := $(subst /,$(/),$(TARGETBASE)) +DESTDIR:=$(TARGETBASE)/$(TARGETDIR) +else +DESTDIR:=$(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/$(TARGETDIR) +endif + +ifdef SOURCEDIR +SOURCEDIR := $(subst PLATFORM,$(PLATFORM_PATH),$(SOURCEDIR)) +SOURCEDIR := $(subst CFG,$(CFG_PATH),$(SOURCEDIR)) +SOURCEDIR := $(subst /,$(/),$(SOURCEDIR)) +else +SOURCEDIR := $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH) +endif + +TARGET_COPY := $(foreach f,$(SOURCES),$(DESTDIR)/$(f) ) + +$(DESTDIR) : + $(call createdir,"$@") + +$(TARGET_COPY) : + $(CP) $(call slash2generic, $(SOURCEDIR)/$(notdir $@) $@) + -$(ERASE) $(call slash2generic, $(SOURCEDIR)/$(notdir $@)) + +# +# The targets invoked by abld... +# +BLD : $(DESTDIR) $(TARGET_COPY) + +MAKMAKE SAVESPACE FREEZE LIB CLEANLIB RESOURCE FINAL : + @echo do nothing + +CLEAN : + -$(ERASE) $(TARGET_COPY) + +RELEASABLES : + @echo $(TARGET_COPY) + diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/EComPerfTestDllOne.h --- a/lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/EComPerfTestDllOne.h Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/EComPerfTestDllOne.h Wed Aug 18 11:27:44 2010 +0300 @@ -20,7 +20,7 @@ // ____________________________________________________________________________ // -class CImplementationClassExampleOne +class CImplementationClassExampleOne // codescanner::missingcclass { public: static CImplementationClassExampleOne* NewL(TAny* aInitParams); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/EComPerfTestDllTwo.h --- a/lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/EComPerfTestDllTwo.h Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/EComPerfTestDllTwo.h Wed Aug 18 11:27:44 2010 +0300 @@ -20,7 +20,7 @@ // ____________________________________________________________________________ // -class CImplementationClassExampleTwo +class CImplementationClassExampleTwo // codescanner::missingcclass { public: static CImplementationClassExampleTwo* NewL(TAny* aInitParams); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/TE_EcomGranularityTestStep.cpp --- a/lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/TE_EcomGranularityTestStep.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/TestExecute/EComPerfTest/src/TE_EcomGranularityTestStep.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -33,7 +33,7 @@ /** Stub class needed to instantiate CRegistrar object. */ -class CTestRegistrarObserver : public MRegistrarObserver +class CTestRegistrarObserver : public MRegistrarObserver // codescanner::missingcclass { public: // This is a stub. Hence do nothing in notification. diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/TestExecute/EComSWITests/src/installStep.h --- a/lowlevellibsandfws/pluginfw/TestExecute/EComSWITests/src/installStep.h Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/TestExecute/EComSWITests/src/installStep.h Wed Aug 18 11:27:44 2010 +0300 @@ -76,7 +76,7 @@ @test @internalComponent */ -class CResolverInstallStep : public CinstallStep +class CResolverInstallStep : public CinstallStep // codescanner::missingcclass { public: CResolverInstallStep(CinstallStep::TInstallType aInstallType); @@ -118,7 +118,7 @@ * @test * @internalComponent */ -class CResolverUninstallStep : public CuninstallStep +class CResolverUninstallStep : public CuninstallStep // codescanner::missingcclass { public: CResolverUninstallStep(CuninstallStep::TUninstallType aType); diff -r 5fae379060a7 -r bf6a71c50e42 lowlevellibsandfws/pluginfw/Test_Bed/test_bed/DataLogger.cpp --- a/lowlevellibsandfws/pluginfw/Test_Bed/test_bed/DataLogger.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/lowlevellibsandfws/pluginfw/Test_Bed/test_bed/DataLogger.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -417,7 +417,9 @@ void CDataLogger::SetupRDebugL(TBool aRequest) { - delete iDebug; + delete iDebug; + iDebug = 0; + if(aRequest) iDebug = new(ELeave) TDebugPrint; // Print to RDebug else diff -r 5fae379060a7 -r bf6a71c50e42 ofdbus/dbus-glib/tsrc/testapps/stif_glib_1/group/bld.inf --- a/ofdbus/dbus-glib/tsrc/testapps/stif_glib_1/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/ofdbus/dbus-glib/tsrc/testapps/stif_glib_1/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -42,8 +42,6 @@ ../data/dbus-glib-server1.service /epoc32/winscw/c/data/dbus/dbus1/services/dbus-glib-server1.service PRJ_TESTMMPFILES - -PRJ_TESTMMPFILES stif_glib_1.mmp // End of File \ No newline at end of file diff -r 5fae379060a7 -r bf6a71c50e42 ofdbus/dbus/group/busdaemon.mmp --- a/ofdbus/dbus/group/busdaemon.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/ofdbus/dbus/group/busdaemon.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -70,7 +70,7 @@ OS_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_DBUS_SYSTEMINCLUDE - +SYSTEMINCLUDE /epoc32/include/stdapis/libxml2 // Library dependencies diff -r 5fae379060a7 -r bf6a71c50e42 ofdbus/dbus/tsrc/testapps/dbus_test_cases/group/dbus_daemon_test_main.mmp --- a/ofdbus/dbus/tsrc/testapps/dbus_test_cases/group/dbus_daemon_test_main.mmp Fri Jun 11 15:26:22 2010 +0300 +++ b/ofdbus/dbus/tsrc/testapps/dbus_test_cases/group/dbus_daemon_test_main.mmp Wed Aug 18 11:27:44 2010 +0300 @@ -77,6 +77,7 @@ OS_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE OS_LAYER_DBUS_SYSTEMINCLUDE +SYSTEMINCLUDE /epoc32/include/stdapis/libxml2 // Library dependencies LIBRARY euser.lib diff -r 5fae379060a7 -r bf6a71c50e42 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Wed Aug 18 11:27:44 2010 +0300 @@ -0,0 +1,2 @@ + + \ No newline at end of file diff -r 5fae379060a7 -r bf6a71c50e42 ssl/libcrypto/inc/include/certretriever/certretriever.h --- a/ssl/libcrypto/inc/include/certretriever/certretriever.h Fri Jun 11 15:26:22 2010 +0300 +++ b/ssl/libcrypto/inc/include/certretriever/certretriever.h Wed Aug 18 11:27:44 2010 +0300 @@ -1,5 +1,5 @@ /* -Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -53,7 +53,7 @@ extern "C" { #endif -int X509_add_symbian_certs(X509_STORE * store); +int X509_add_symbian_certsL(X509_STORE * store); #ifdef __cplusplus } #endif @@ -88,8 +88,8 @@ void OpenUnifiedCertStoreL(); void ListCertsL(); - void AppendCerts(); - void ProcessCerts(); + void AppendCertsL(); + void ProcessCertsL(); private: X509_STORE* iStore; diff -r 5fae379060a7 -r bf6a71c50e42 ssl/libcrypto/inc/include/certretriever/createx509.h --- a/ssl/libcrypto/inc/include/certretriever/createx509.h Fri Jun 11 15:26:22 2010 +0300 +++ b/ssl/libcrypto/inc/include/certretriever/createx509.h Wed Aug 18 11:27:44 2010 +0300 @@ -1,5 +1,5 @@ /* -Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -42,19 +42,19 @@ class CX509_Initializer : CBase { public: - static X509* CreateX509(CX509Certificate* X509Cert); + static X509* CreateX509L(CX509Certificate* X509Cert); private: CX509_Initializer(){} static X509_VAL * CreateX509_VAL(CX509Certificate* X509Cert); static ASN1_STRING* CreateASN1_STRING(int len, int type, unsigned char* data, long flags); - static X509_NAME* CreateX509_NAME(const CX500DistinguishedName& DistName); + static X509_NAME* CreateX509_NAMEL(const CX500DistinguishedName& DistName); static X509_NAME_ENTRY * CreateX509_NAME_ENTRY(char* type, int typeLen, char * value, int valueLen, int stringType); - static X509_ALGOR* CreateX509_ALGOR(const TPtrC8* ptr); - static X509_PUBKEY* CreateX509_PUBKEY(CX509Certificate* X509Cert); - static STACK_OF(X509_EXTENSION) * CreateSTACKOF_X509_EXTENSION(CX509Certificate* X509Cert); - static TInt Fill_X509_NAME_ENTRY(X509_NAME* name, const TDesC8& aBinaryData); + static X509_ALGOR* CreateX509_ALGORL(const TPtrC8* ptr); + static X509_PUBKEY* CreateX509_PUBKEYL(CX509Certificate* X509Cert); + static STACK_OF(X509_EXTENSION) * CreateSTACKOF_X509_EXTENSIONL(CX509Certificate* X509Cert); + static TInt Fill_X509_NAME_ENTRYL(X509_NAME* name, const TDesC8& aBinaryData); }; diff -r 5fae379060a7 -r bf6a71c50e42 ssl/libcrypto/src/crypto/certretriever/certretriever.cpp --- a/ssl/libcrypto/src/crypto/certretriever/certretriever.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/ssl/libcrypto/src/crypto/certretriever/certretriever.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -1,5 +1,5 @@ /* -Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -37,7 +37,7 @@ extern "C" { #endif -int X509_add_symbian_certs(X509_STORE * store) +int X509_add_symbian_certsL(X509_STORE * store) { CActiveScheduler* activeScheduler; CActiveScheduler* CurrentActiveScheduler = CActiveScheduler::Current(); @@ -202,14 +202,14 @@ } else { - AppendCerts(); + AppendCertsL(); break; } case EDone: if (iState != ENoCerts) { - ProcessCerts(); //Process the last certificate + ProcessCertsL(); //Process the last certificate iCertCount = 0; } case ENoCerts: @@ -294,10 +294,10 @@ iState = EAppendCerts; } -void CCertRetriever::AppendCerts() +void CCertRetriever::AppendCertsL() { if(iCertCount>0) - ProcessCerts(); + ProcessCertsL(); CCTCertInfo *cert = iCerts[iCertCount]; @@ -314,7 +314,7 @@ } -void CCertRetriever::ProcessCerts() +void CCertRetriever::ProcessCertsL() { CX509Certificate *X509Cert; TRAPD(error, X509Cert = CX509Certificate::NewL( iCertPtr )); @@ -323,7 +323,7 @@ CleanupStack::PushL(X509Cert); - X509* x509 = CX509_Initializer::CreateX509(X509Cert); + X509* x509 = CX509_Initializer::CreateX509L(X509Cert); if(x509) { diff -r 5fae379060a7 -r bf6a71c50e42 ssl/libcrypto/src/crypto/certretriever/createx509.cpp --- a/ssl/libcrypto/src/crypto/certretriever/createx509.cpp Fri Jun 11 15:26:22 2010 +0300 +++ b/ssl/libcrypto/src/crypto/certretriever/createx509.cpp Wed Aug 18 11:27:44 2010 +0300 @@ -1,5 +1,5 @@ /* -Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -31,7 +31,7 @@ #include "createx509.h" -X509* CX509_Initializer::CreateX509(CX509Certificate* X509Cert) +X509* CX509_Initializer::CreateX509L(CX509Certificate* X509Cert) { X509* ret = X509_new(); TBool serail = ETrue; @@ -46,18 +46,18 @@ //issuer const CX500DistinguishedName& IssName = X509Cert->IssuerName(); X509_NAME_free(ret->cert_info->issuer); - ret->cert_info->issuer = CreateX509_NAME(IssName); + ret->cert_info->issuer = CreateX509_NAMEL(IssName); //subject const CX500DistinguishedName& SubName = X509Cert->SubjectName(); X509_NAME_free(ret->cert_info->subject); - ret->cert_info->subject = CreateX509_NAME(SubName); + ret->cert_info->subject = CreateX509_NAMEL(SubName); // const HBufC * name = SubName.DisplayNameL(); //signature const TPtrC8* sig_alg_ptr = X509Cert->DataElementEncoding(CX509Certificate::EAlgorithmId); X509_ALGOR_free(ret->cert_info->signature); - ret->cert_info->signature = CreateX509_ALGOR(sig_alg_ptr); + ret->cert_info->signature = CreateX509_ALGORL(sig_alg_ptr); //serialnumber const TPtrC8 sernum = X509Cert->SerialNumber(); @@ -88,13 +88,13 @@ //key X509_PUBKEY_free(ret->cert_info->key); - ret->cert_info->key = CreateX509_PUBKEY(X509Cert); + ret->cert_info->key = CreateX509_PUBKEYL(X509Cert); //extension - ret->cert_info->extensions = CreateSTACKOF_X509_EXTENSION(X509Cert); + ret->cert_info->extensions = CreateSTACKOF_X509_EXTENSIONL(X509Cert); //name @@ -102,7 +102,7 @@ //sig_alg X509_ALGOR_free(ret->sig_alg); - ret->sig_alg = CreateX509_ALGOR(sig_alg_ptr); + ret->sig_alg = CreateX509_ALGORL(sig_alg_ptr); //signature const TPtrC8 sig = X509Cert->Signature(); @@ -114,7 +114,7 @@ } -X509_ALGOR* CX509_Initializer::CreateX509_ALGOR(const TPtrC8* ptr) +X509_ALGOR* CX509_Initializer::CreateX509_ALGORL(const TPtrC8* ptr) { X509_ALGOR* ret = X509_ALGOR_new(); @@ -168,7 +168,7 @@ -X509_NAME* CX509_Initializer::CreateX509_NAME(const CX500DistinguishedName& DistName) +X509_NAME* CX509_Initializer::CreateX509_NAMEL(const CX500DistinguishedName& DistName) { X509_NAME* ret = X509_NAME_new(); @@ -181,7 +181,7 @@ TUint writePos = 0; Asn1Seq->WriteDERL(oct, writePos); - TInt len = Fill_X509_NAME_ENTRY(ret, octetData->Des()); + TInt len = Fill_X509_NAME_ENTRYL(ret, octetData->Des()); char *p = (char *)oct.PtrZ(); @@ -202,7 +202,7 @@ // return the length of the encoded sequence -TInt CX509_Initializer::Fill_X509_NAME_ENTRY(X509_NAME * name, const TDesC8& aBinaryData) +TInt CX509_Initializer::Fill_X509_NAME_ENTRYL(X509_NAME * name, const TDesC8& aBinaryData) { TInt aPos = 0; TASN1DecGeneric dec(aBinaryData.Right(aBinaryData.Length() - aPos)); @@ -364,7 +364,7 @@ -X509_PUBKEY* CX509_Initializer::CreateX509_PUBKEY(CX509Certificate* X509Cert) +X509_PUBKEY* CX509_Initializer::CreateX509_PUBKEYL(CX509Certificate* X509Cert) { X509_PUBKEY* ret = X509_PUBKEY_new(); @@ -388,7 +388,7 @@ TPtrC8 newPtr = rdn.Encoding(); X509_ALGOR_free(ret->algor); // free the one allocated by X509_PUBKEY_new - ret->algor = CreateX509_ALGOR(&newPtr); + ret->algor = CreateX509_ALGORL(&newPtr); } //public_key @@ -407,7 +407,7 @@ -STACK_OF(X509_EXTENSION)* CX509_Initializer::CreateSTACKOF_X509_EXTENSION(CX509Certificate* X509Cert) +STACK_OF(X509_EXTENSION)* CX509_Initializer::CreateSTACKOF_X509_EXTENSIONL(CX509Certificate* X509Cert) { //STACK_OF(X509_EXTENSION) * ret = sk_X509_EXTENSION_new_null(); STACK_OF(X509_EXTENSION) * ret = NULL; diff -r 5fae379060a7 -r bf6a71c50e42 ssl/libcrypto/src/crypto/x509/by_file.c --- a/ssl/libcrypto/src/crypto/x509/by_file.c Fri Jun 11 15:26:22 2010 +0300 +++ b/ssl/libcrypto/src/crypto/x509/by_file.c Wed Aug 18 11:27:44 2010 +0300 @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ /* - © Portions copyright (c) 2006 Nokia Corporation. All rights reserved. + © Portions copyright (c) 2006,2010 Nokia Corporation. All rights reserved. */ @@ -133,7 +133,7 @@ { #ifdef SYMBIAN - ok = X509_add_symbian_certs(ctx->store_ctx); + ok = X509_add_symbian_certsL(ctx->store_ctx); #else file = (char *)Getenv(X509_get_default_cert_file_env()); if (file) diff -r 5fae379060a7 -r bf6a71c50e42 stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/group/bld.inf --- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -48,7 +48,6 @@ /agnmodel/inc/AGMCOMON.H */ -PRJ_TESTMMPFILES // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 5fae379060a7 -r bf6a71c50e42 stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/group/bld.inf --- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -40,7 +40,6 @@ /agnmodel/inc/AGMCOMON.H */ -PRJ_TESTMMPFILES // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 5fae379060a7 -r bf6a71c50e42 stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_1/group/bld.inf --- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_1/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_1/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -39,7 +39,6 @@ tstl_1.cfg /epoc32/WINSCW/C/TestFramework/tstl_1.cfg -PRJ_TESTMMPFILES // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 5fae379060a7 -r bf6a71c50e42 stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_2/group/bld.inf --- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_2/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_2/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -39,7 +39,6 @@ /agnmodel/inc/AGMCOMON.H */ -PRJ_TESTMMPFILES // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 5fae379060a7 -r bf6a71c50e42 stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/group/bld.inf --- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -38,7 +38,6 @@ /agnmodel/inc/AGMCOMON.H */ -PRJ_TESTMMPFILES // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 5fae379060a7 -r bf6a71c50e42 stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_4/group/bld.inf --- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_4/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_4/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -40,7 +40,6 @@ /agnmodel/inc/AGMCOMON.H */ -PRJ_TESTMMPFILES // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 5fae379060a7 -r bf6a71c50e42 stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/group/bld.inf --- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/group/bld.inf Fri Jun 11 15:26:22 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/group/bld.inf Wed Aug 18 11:27:44 2010 +0300 @@ -46,7 +46,7 @@ /agnmodel/inc/AGMCOMON.H */ -PRJ_TESTMMPFILES + // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build'