--- a/appinstaller/AppMngr2/GSSettingsPlugin/data/appmngr2gssettingspluginrsc.rss Wed Sep 15 12:20:42 2010 +0300
+++ b/appinstaller/AppMngr2/GSSettingsPlugin/data/appmngr2gssettingspluginrsc.rss Wed Oct 13 14:40:19 2010 +0300
@@ -231,6 +231,6 @@
RESOURCE TBUF r_am_set_ocsp_none
{
- buf = qtn_am_set_ocsp_url_none;
+ buf = qtn_selec_sett_val_field_none;
}
Binary file appinstaller/AppMngr2/help/data/xhtml.zip has changed
--- a/appinstaller/AppMngr2/loc/appmngr2.loc Wed Sep 15 12:20:42 2010 +0300
+++ b/appinstaller/AppMngr2/loc/appmngr2.loc Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2008 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"
@@ -237,8 +237,3 @@
// r: 5.1
#define qtn_swins_lsh2_untrusted "Untrusted"
-// d: Setting field value for OCSP URL when there is no data.
-// l: set_value_pane_t1
-// r: 9.2
-#define qtn_am_set_ocsp_url_none "None"
-
--- a/appinstaller/AppinstUi/Client/Src/SWInstLauncher.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/appinstaller/AppinstUi/Client/Src/SWInstLauncher.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -25,7 +25,6 @@
#include "SWInstDefs.h"
#include "SWInstCommon.h"
-
using namespace SwiUI;
// ================= MEMBER FUNCTIONS =======================
@@ -49,17 +48,16 @@
//
EXPORT_C TInt RSWInstLauncher::Connect()
{
-
TInt result( KErrNone );
if ( !iConnected )
{
if ( CEikonEnv::Static() )
- {
+ {
TRAP( result, ConnectChainedAppL( KUidSWInstSvr ) );
}
else
- {
+ {
TRAP( result, REikAppServiceBase::ConnectNewAppL( KUidSWInstSvr ) );
}
@@ -80,22 +78,12 @@
// -----------------------------------------------------------------------------
//
EXPORT_C void RSWInstLauncher::Close()
- {
+ {
if ( iConnected )
{
- if ( CEikonEnv::Static() )
- {
- // Note this will crash if non ui application like SWI Daemon.
- RAknAppServiceBase::Close();
- }
- else
- {
- // Use EikAppServiceBase if non UI application.
- REikAppServiceBase::Close();
- }
-
+ RAknAppServiceBase::Close();
iConnected = EFalse;
- }
+ }
}
// -----------------------------------------------------------------------------
--- a/appinstaller/AppinstUi/Client/Src/SWInstSilentLauncher.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/appinstaller/AppinstUi/Client/Src/SWInstSilentLauncher.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -56,7 +56,7 @@
// -----------------------------------------------------------------------------
//
EXPORT_C TInt RSWInstSilentLauncher::Connect()
- {
+ {
TInt result( KErrNone );
TUint differentiator = 0;
--- a/iaupdate/IAD/api/client/src/iaupdateclient.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/iaupdate/IAD/api/client/src/iaupdateclient.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -91,10 +91,6 @@
{
TRAP( error, StartNewAppToBackgroundL( ServiceUid(), aStatus ) );
}
- else
- {
- error = KErrAlreadyExists;
- }
IAUPDATE_TRACE_1("[IAUPDATE] RIAUpdateClient::OpenToBackroundAsync() end error code: %d", error );
return error;
}
@@ -108,10 +104,6 @@
{
IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::ConnectToApp() begin");
TInt error( KErrNone );
- if ( iConnected )
- {
- return error;
- }
TName serverName;
ServerName(serverName, ServiceUid(), iDifferentiator);
TRAP( error,ConnectExistingByNameL( serverName ) );
@@ -151,7 +143,7 @@
{
IAUPDATE_TRACE("[IAUPDATE] RIAUpdateClient::Close() begin");
// Let the parent handle closing.
- REikAppServiceBase::Close();
+ RAknAppServiceBase::Close();
iConnected = EFalse;
delete iData;
iData = NULL;
--- a/iaupdate/IAD/api/client/src/iaupdatemanager.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/iaupdate/IAD/api/client/src/iaupdatemanager.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -101,6 +101,15 @@
// If an operation is still active,
// then DoCancel will cancel ongoing request
Cancel();
+
+ // if server is just started then session to be created that closing can be
+ // done normal way
+ if ( UpdateType() == EIAUpdateStartServer )
+ {
+ IAUPDATE_TRACE("[IAUPDATE] CIAUpdateManager::~CIAUpdateManager() server just started");
+ UpdateClient().ConnectToApp();
+ }
+
UpdateClient().Close();
if ( iEikEnv )
{
@@ -387,7 +396,7 @@
switch ( updateType )
{
case EIAUpdateStartServer:
- if ( errorCode == KErrNone || errorCode == KErrAlreadyExists )
+ if ( errorCode == KErrNone )
{
CheckUpdatesContinue();
}
--- a/iaupdate/IAD/engine/controller/src/iaupdateutils.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/iaupdate/IAD/engine/controller/src/iaupdateutils.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -302,7 +302,7 @@
// -----------------------------------------------------------------------------
EXPORT_C TBool IAUpdateUtils::IsWidgetInstalledL(const TDesC& aIdentifier, TIAUpdateVersion& aVersion )
- {
+ {
RWidgetRegistryClientSession widgetRegistry;
User::LeaveIfError( widgetRegistry.Connect() );
@@ -317,29 +317,15 @@
{
CWidgetInfo* widgetInfo( widgetInfoArr[i] );
- CWidgetPropertyValue* BundleId =
- widgetRegistry.GetWidgetPropertyValueL(widgetInfo->iUid, EBundleIdentifier );
+ CWidgetPropertyValue* BundleId = widgetRegistry.GetWidgetPropertyValueL(widgetInfo->iUid, EBundleIdentifier );
CleanupStack::PushL( BundleId );
if( aIdentifier.Compare( *(BundleId->iValue.s) )== 0 )
{
- // Get version
- CWidgetPropertyValue* version =
- widgetRegistry.GetWidgetPropertyValueL(widgetInfo->iUid, EBundleVersion );
+ CWidgetPropertyValue* version = widgetRegistry.GetWidgetPropertyValueL(widgetInfo->iUid, EBundleVersion );
CleanupStack::PushL( version );
- // Convert version
- if (version->iValue.s)
- {
- DesToVersionL(*(version->iValue.s), aVersion.iMajor, aVersion.iMinor, aVersion.iBuild );
- }
- else
- {
- // version does not exist, set default (0.0.1)
- aVersion.iMajor = 0;
- aVersion.iMinor = 0;
- aVersion.iBuild = 1;
- }
+ DesToVersionL(*(version->iValue.s), aVersion.iMajor, aVersion.iMinor, aVersion.iBuild );
CleanupStack::PopAndDestroy( version );
CleanupStack::PopAndDestroy( BundleId );
--- a/iaupdate/IAD/ui/src/iaupdatemainview.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/iaupdate/IAD/ui/src/iaupdatemainview.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -310,7 +310,30 @@
RPointerArray<MIAUpdateAnyNode> selectedNodes;
CleanupClosePushL( selectedNodes );
GetSelectedNodesL( selectedNodes );
-
+
+
+ MIAUpdateAnyNode* currentNode = iContainer->GetCurrentNode( iAllNodes );
+ if( currentNode )
+ {
+ TBool selected = EFalse;
+ for( TInt i = 0; i < selectedNodes.Count() && !selected; ++i )
+ {
+ MIAUpdateAnyNode* node = selectedNodes[i];
+ if( node == currentNode )
+ {
+ selected = ETrue;
+ }
+ }
+ if ( selected )
+ {
+ aMenuPane->SetItemDimmed( EAknCmdMark, ETrue );
+ }
+ else
+ {
+ aMenuPane->SetItemDimmed( EAknCmdUnmark, ETrue );
+ }
+ }
+
if ( selectedNodes.Count() )
{
if ( selectedNodes[0]->NodeType() == MIAUpdateAnyNode::ENodeTypeFw )
--- a/installationservices/swi/inc/sishelper.h Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/swi/inc/sishelper.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -50,7 +50,7 @@
#ifdef __WINS__ // Occassionally, there are transient problems in the emulator that cause the timer to kick in sooner than needed (DEF104102)
enum {KShutdownDelay=5*1000*1000}; // 5 seconds
#else
- enum {KShutdownDelay=2*1000*1000}; // 2 seconds
+ enum {KShutdownDelay=12*1000*1000}; // 12 seconds
#endif
public:
inline CSisHelperShutdown();
--- a/installationservices/swi/inc/switextshell.iby Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/swi/inc/switextshell.iby Wed Oct 13 14:40:19 2010 +0300
@@ -19,7 +19,7 @@
#ifndef SWITEXTSHELL
#define SWITEXTSHELL
-define ROMDRIVE EPOCROOT##epoc32\data\Z
+define ROMDRIVE \epoc32\data\Z
// SWI configuration - already in textshell ROM
#include <swiconfig.iby>
--- a/installationservices/swi/inc/tswitextshell.iby Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/swi/inc/tswitextshell.iby Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -45,7 +45,7 @@
#include "ezlib.iby"
#include "openenv.iby"
-define ZDRIVE EPOCROOT##epoc32\winscw\c
+define ZDRIVE \epoc32\winscw\c
// This the file which used to redirect the request from cam-ocsptest01 to ban-ocsptest01
data = ZDRIVE\autohardware\hosts \hosts
--- a/installationservices/swi/source/sisregistry/common/sisregistryobject.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/swi/source/sisregistry/common/sisregistryobject.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -924,7 +924,11 @@
TUid sid = iFileDescriptions[j]->Sid();
if(sid != KNullUid)
{
- iSids.Remove(iSids.Find(sid));
+ TInt index = iSids.Find(sid);
+ if (KErrNotFound != index)
+ {
+ iSids.Remove(index);
+ }
}
delete iFileDescriptions[j];
iFileDescriptions.Remove(j);
--- a/installationservices/swi/source/swis/server/installmachine.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/swi/source/swis/server/installmachine.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -287,7 +287,10 @@
// Retrieve logo data which may not be present.
const CLogo* logo=iInstallMachine.iController->Logo();
- if (logo)
+
+ // Don't retrieve the logo if the sis file being installed is a stub
+
+ if (logo && !iInstallMachine.iSisHelper.IsStubL() )
{
const CFileDescription& fdesc(logo->FileDescription());
--- a/installationservices/swi/test/testexes/bld.inf Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/swi/test/testexes/bld.inf Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -145,4 +145,3 @@
non_stubbed_exe.mmp
-interpretsis_testcase/interpretsis_testcase_01.mmp
--- a/installationservices/swi/test/testexes/interpretsis_testcase/interpretsis_testcase_01.mmp Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// 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:
-// using relative paths for sourcepath and user includes
-//
-
-TARGET interpretsis_testcase_01.exe
-TARGETTYPE exe
-UID 0x100039CE 0xE800005A
-VENDORID 0x70000001
-SOURCEPATH .
-SOURCE interpretsis_testcase_Main.cpp
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY euser.lib
-
-SMPSAFE
--- a/installationservices/swi/test/testexes/interpretsis_testcase/interpretsis_testcase_Main.cpp Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-// 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:
-// Dummy application to generate exe file for interpretsis install testing.
-//
-
-int E32Main()
- {
- return 0;
- }
--- a/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_rominstall_01.pkg Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-;
-; 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 the License "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:
-;
-; Install file for multi-lingual application
-; supporting two language variants.
-;
-
-; Languages -
-&EN,GE
-
-; List of localised vendor names.
-%{"Nokia Software Ltd", "Nokia Software Ltd"}
-
-; Single, non-localised (global) vendor name.
-:"Nokia Software Ltd"
-
-; Installation header.
-; Two component names as we support English and German
-#{"Interpretsis_RomInstall", "Interpretsis_RomInstall1"}, (0x90000086), 1,0,0, Type=SA
-
-;Ordinary file to selected drive
-"osver.txt"-"!:\Documents\abc1.txt"
\ No newline at end of file
--- a/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_rominstall_02.pkg Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-;
-; 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 the License "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:
-;
-; Install file for multi-lingual application
-; supporting two language variants.
-;
-
-; Languages -
-&EN,GE
-
-; List of localised vendor names.
-%{"Nokia Software Ltd", "Nokia Software Ltd"}
-
-; Single, non-localised (global) vendor name.
-:"Nokia Software Ltd"
-
-; Installation header.
-; Two component names as we support English and German
-#{"Interpretsis_RomInstall", "Interpretsis_RomInstall1"}, (0x80000086), 1,0,0, Type=SA, RU
-
-;Ordinary file to selected drive
-"osver.txt"-"!:\Documents\abc1.txt"
\ No newline at end of file
--- a/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_rominstall_03.pkg Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-;
-; 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 the License "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:
-;
-; Install file for multi-lingual application
-; supporting two language variants.
-;
-
-; Languages -
-&EN,GE
-
-; List of localised vendor names.
-%{"Nokia Software Ltd", "Nokia Software Ltd"}
-
-; Single, non-localised (global) vendor name.
-:"Nokia Software Ltd"
-
-; Installation header.
-; Two component names as we support English and German
-#{"Interpretsis_RomInstall", "Interpretsis_RomInstall1"}, (0x80000086), 1,0,0, Type=SA
-
-;Ordinary file to selected drive
-"osver.txt"-"c:\Documents\abc1.txt"
-
-;Ordinary file to selected drive
-"osver.txt"-"$:\Documents\abc2.txt"
-
-;Ordinary file to selected drive
-"osver.txt"-"e:\Documents\abc3.txt"
-
-;Ordinary file to selected drive
-"osver.txt"-"x:\Documents\abc4.txt"
-
-;Ordinary file to selected drive
-"osver.txt"-"!:\Documents\abc5.txt"
-
-;Ordinary file to selected drive
-"osver.txt"-"z:\Documents\abc6.txt"
\ No newline at end of file
--- a/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_rominstall_04.pkg Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-;
-; 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 the License "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:
-;
-; Install file for multi-lingual application
-; supporting two language variants.
-;
-
-; Languages -
-&EN,GE
-
-; List of localised vendor names.
-%{"Nokia Software Ltd", "Nokia Software Ltd"}
-
-; Single, non-localised (global) vendor name.
-:"Nokia Software Ltd"
-
-; Installation header.
-; Two component names as we support English and German
-#{"Interpretsis_RomInstall", "Interpretsis_RomInstall1"}, (0x90000086), 2,0,1, Type=SA
-
-;Ordinary file to selected drive
-"osver.txt"-"!:\Documents\abc7.txt"
-
-;Ordinary file to selected drive
-"osver.txt"-"c:\Documents\abc8.txt"
\ No newline at end of file
--- a/installationservices/swi/test/testexes/packages_interpretsis_testcase/interpretsis_testcase.pkg Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-;
-; 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 the License "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:
-;
-;
-; Install file for multi-lingual application
-; supporting two language variants.
-;
-
-; Languages -
-&EN,GE
-
-; List of localised vendor names.
-%{"Symbian Software Ltd", "Symbian Software Ltd"}
-
-; Single, non-localised (global) vendor name.
-:"Symbian Software Ltd"
-
-; Installation header.
-; Two component names as we support English and German
-#{"interpretsis_eng_testcase", "interpretsis_german_testcase"}, (0xE8000097), 1,0,0
-
-; Language-neutral files to be installed
-"\epoc32\release\<PLATFORM>\<CONFIGURATION>\interpretsis_testcase_01.exe"-"!:\sys\bin\interpretsis_testcase_01.exe"
-
-; Lists of language-specific resource files, of which only those files will be installed
-; which are supported by the device.
-
--- a/installationservices/swi/test/testexes/prepareexes.pl Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/swi/test/testexes/prepareexes.pl Wed Oct 13 14:40:19 2010 +0300
@@ -801,7 +801,6 @@
SignFileWithSpecifiedCert("int_nr_option_04.sis", "int_nr_option_04_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
SignFileWithSpecifiedCert("int_nr_option_05.sis", "int_nr_option_05_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
SignFileWithSpecifiedCert("sp_int_nr_option_06.sis", "sp_int_nr_option_06_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
-SignFileWithSpecifiedCert("int_rominstall_02.sis", "int_rominstall_02.sisx", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
SignFile("romupgrademorecapsthansucert_sucert.sis", "romupgrademorecapsthansucert_sucert_root5.sis", "root5ca", \*iby);
--- a/installationservices/swi/test/tsisfile/data/test_system_drive.pkg Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; 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 the License "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:
-;
-; This test file tests is files are copied to system and extended drive
-
-;Languages
-&EN
-
-;Header
-#{"testsystemdrive"}, (0x800000FD), 1, 2, 3,TYPE=SA
-
-%{"Vendor"}
-:"Unique Vendor Name"
-
-"files\option1.txt"-"!:\Documents\InstTest\upgrade1.txt";
-"files\option1.txt"-"$:\Documents\InstTest\upgrade2.txt";
-"files\option1.txt"-"!:\Documents\InstTest\upgrade3.txt";
-"files\option1.txt"-"$:\Documents\InstTest\upgrade4.txt";
\ No newline at end of file
--- a/installationservices/switestfw/test/autotesting/testMakesis.pl Wed Sep 15 12:20:42 2010 +0300
+++ b/installationservices/switestfw/test/autotesting/testMakesis.pl Wed Oct 13 14:40:19 2010 +0300
@@ -1779,39 +1779,6 @@
}
#
-# New test code for DEF145101 - MakeSIS cannot handle package files that contain large (>1000) language codes.
-#
-sub TestDEF145101 {
-
- my $path = "/epoc32/winscw/c/tswi";
- my $pkgfile = "$path/largelanguagecodes";
- my $expectedResult = 0;
-
- WriteLog("Test for DEF145101 - MakeSIS cannot handle package files that contain large (>1000) language codes.\n");
-
- # Do MAKESIS test
- @retval = system("$makesisExeLocation $pkgfile.pkg $pkgfile-tmp.sis > $pkgfile.log");
-
- $logMsg = sprintf "Expected code:%5d result Code:%5d\n", $expectedResult, $?;
- WriteLog( $logMsg);
-
- $NumberOfTests++;
-
- if( $? == $expectedResult ) {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink("$pkgfile-tmp.sis");
- unlink("$pkgfile.sis");
- unlink("$pkgfile.log");
-}
-
-#
# Main
#
# Create environment and control test flow to testing MAKESIS.EXE
@@ -2947,11 +2914,6 @@
TestInterpretsisReport();
#
-# Test for DEF145101 - MakeSIS cannot handle package files that contain large (>1000) language codes.
-#
-TestDEF145101();
-
-#
# These tests are very specific to windows OS only
#
#
--- a/ncdengine/engine/transport/inc/catalogshttpstack.h Wed Sep 15 12:20:42 2010 +0300
+++ b/ncdengine/engine/transport/inc/catalogshttpstack.h Wed Oct 13 14:40:19 2010 +0300
@@ -29,7 +29,7 @@
// Constants
-const TInt KRequestTimeoutMicroseconds( 60000000 );
+const TInt KRequestTimeoutMicroseconds( 180000000 );
// Forward declarations
class RHTTPSession;
--- a/ncdengine/provider/deviceinteraction/src/ncdinstallationserviceimpl.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/ncdengine/provider/deviceinteraction/src/ncdinstallationserviceimpl.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -2359,20 +2359,7 @@
CWidgetPropertyValue* version =
iWidgetRegistry.GetWidgetPropertyValueL(aUid, EBundleVersion );
CleanupStack::PushL( version );
-
- // Convert version
- if (version->iValue.s)
- {
- TCatalogsVersion::ConvertL( aVersion, *(version->iValue.s) );
- }
- else
- {
- // version does not exist, set default (0.0.1)
- aVersion.iMajor = 0;
- aVersion.iMinor = 0;
- aVersion.iBuild = 1;
- }
-
+ TCatalogsVersion::ConvertL( aVersion, *(version->iValue.s) );
CleanupStack::PopAndDestroy( version );
return (ETrue);
}
@@ -2416,24 +2403,11 @@
if( aIdentifier.Compare( *(bundleId->iValue.s) )== 0 )
{
- // Get version
CWidgetPropertyValue* version =
iWidgetRegistry.GetWidgetPropertyValueL
(widgetInfo->iUid, EBundleVersion );
CleanupStack::PushL( version );
-
- // Convert version
- if (version->iValue.s)
- {
- TCatalogsVersion::ConvertL( aVersion, *(version->iValue.s) );
- }
- else
- {
- // version does not exist, set default (0.0.1)
- aVersion.iMajor = 0;
- aVersion.iMinor = 0;
- aVersion.iBuild = 1;
- }
+ TCatalogsVersion::ConvertL( aVersion, *(version->iValue.s) );
CleanupStack::PopAndDestroy( version );
CleanupStack::PopAndDestroy( bundleId );
--- a/secureswitools/swianalysistoolkit/source/common/symbiantypes.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swianalysistoolkit/source/common/symbiantypes.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -47,18 +47,14 @@
typedef long int TInt32;
typedef unsigned long int TUint32;
-typedef short int TInt16;
+typedef short int TInt16;
typedef signed char TInt8;
-typedef unsigned short int TUint16;
+typedef unsigned short int TUint16;
typedef unsigned char TUint8;
typedef bool TBool;
-typedef TUint16 TCRC;
-typedef int TInt;
-typedef unsigned int TUint;
-typedef void TAny;
-typedef unsigned short int TText16;
-typedef unsigned char TText8;
+typedef TUint16 TCRC;
+typedef int TInt;
#endif /* __SYMBIAN_TYPES_H__ */
@@ -67,6 +63,3 @@
#else
#define STRING std::string
#endif // _UNICODE
-
-#define ETrue true;
-#define EFalse false;
--- a/secureswitools/swianalysistoolkit/source/common/utf8/utf8.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swianalysistoolkit/source/common/utf8/utf8.h Wed Oct 13 14:40:19 2010 +0300
@@ -79,9 +79,6 @@
------------------------------------------------------------------------ */
-#ifndef __UTF_H__
-#define __UTF_H__
-
/* ---------------------------------------------------------------------
The following 4 definitions are compiler-specific.
The C standard does not guarantee that wchar_t has at least
@@ -168,6 +165,4 @@
}
#endif
-#endif //__UTF_H__
-
/* --------------------------------------------------------------------- */
--- a/secureswitools/swisistools/group/bld.inf Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/group/bld.inf Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -110,9 +110,6 @@
../test/testmakesis/utf8.pkg /epoc32/winscw/c/tswi/utf8.pkg
../test/testmakesis/utf8.txt /epoc32/winscw/c/tswi/utf8.txt
-// file for testMakesis.pl to test
-../test/testmakesis/largelanguagecodes.pkg /epoc32/winscw/c/tswi/largelanguagecodes.pkg
-
// signsis
../test/tsignsis/largefile.zip /epoc32/winscw/c/tswi/tsignsis/largefile.zip
../test/tsignsis/largedata.pkg /epoc32/winscw/c/tswi/tsignsis/largedata.pkg
@@ -1549,8 +1546,6 @@
../test/tinterpretsisinteg/scripts/int_nr_option-37.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-37.script
../test/tinterpretsisinteg/scripts/int_nr_option-38.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-38.script
../test/tinterpretsisinteg/scripts/int_nr_option-39.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-39.script
-../test/tinterpretsisinteg/scripts/int-rominstall-09.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int-rominstall-09.script
-../test/tinterpretsisinteg/scripts/int-rominstall-10.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int-rominstall-10.script
../test/tinterpretsisinteg/preq2525-interpretsis-01/argumentfile.ini /epoc32/winscw/c/tswi/tinterpretsisinteg/preq2525-interpretsis-01/argumentfile.ini
../test/tinterpretsisinteg/preq2525-interpretsis-02/argumentfile.ini /epoc32/winscw/c/tswi/tinterpretsisinteg/preq2525-interpretsis-02/argumentfile.ini
--- a/secureswitools/swisistools/group/dumpsislib.mmp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/group/dumpsislib.mmp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -23,7 +23,6 @@
USERINCLUDE ../source/dumpsislib
USERINCLUDE ../source/sisxlibrary
USERINCLUDE ../../swianalysistoolkit/source/common
-USERINCLUDE ../../swianalysistoolkit/source/common/utf8
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/secureswitools/swisistools/group/interpretsis.mmp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/group/interpretsis.mmp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -26,7 +26,6 @@
USERINCLUDE ../source/sisxlibrary
USERINCLUDE ../source/common
USERINCLUDE ../../swianalysistoolkit/source/common
-USERINCLUDE ../../swianalysistoolkit/source/common/utf8
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE ../../openssllib/import/inc/openssl
@@ -57,8 +56,5 @@
OPTION GCC -w
OPTION GCC -fno-stack-check
OPTION GCC -fpermissive
-#ifdef TOOLS2_LINUX
-OPTION GCC -rdynamic
-#endif // TOOLS2_LINUX
MACRO _UNICODE _CONSOLE _STLP_THREADS UNICODE __GNUG__
--- a/secureswitools/swisistools/group/interpretsislib.mmp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/group/interpretsislib.mmp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -23,8 +23,6 @@
USERINCLUDE ../source/interpretsislib
USERINCLUDE ../source/sisxlibrary
USERINCLUDE ../../swianalysistoolkit/source/common
-USERINCLUDE ../../swianalysistoolkit/source/common/utf8
-USERINCLUDE ../source/common
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
USERINCLUDE ../source/xmlparser
@@ -79,8 +77,6 @@
SOURCE util.cpp
#endif
-SOURCEPATH ../../swianalysistoolkit/source/common/utf8
-SOURCE utf8.cpp
#ifndef TOOLS2_LINUX
MACRO _UNICODE _CONSOLE _STLP_THREADS _WIN32 UNICODE __GNUG__ XML_LIBRARY
--- a/secureswitools/swisistools/group/scrtool.mmp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/group/scrtool.mmp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -27,7 +27,6 @@
USERINCLUDE ../source/xmlparser
USERINCLUDE ../source/dbmanager
USERINCLUDE ../source/dbmanager/sqlite
-USERINCLUDE ../source/sisxlibrary
SYSTEMINCLUDE ../source/xmlparser/xerces/include
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -47,14 +46,7 @@
SOURCE logs.cpp exception.cpp util.cpp
-STATICLIBRARY xerces
-STATICLIBRARY sisx
-#ifndef TOOLS2_LINUX
-STATICLIBRARY eay32
-#else
-STATICLIBRARY crypto dl c
-#endif
-
+STATICLIBRARY eay32 xerces
#ifndef TOOLS2_LINUX
MACRO _UNICODE _CONSOLE _STLP_THREADS _WIN32 UNICODE __GNUG__ XML_LIBRARY
@@ -68,8 +60,5 @@
OPTION GCC -w
OPTION GCC -fno-stack-check
OPTION GCC -fpermissive
-#ifdef TOOLS2_LINUX
-OPTION GCC -rdynamic
-#endif
//OPTION GCC -masm=intel
SMPSAFE
--- a/secureswitools/swisistools/source/common/util.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/common/util.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -24,6 +24,7 @@
#include "util.h"
#include "symbiantypes.h"
+#include <windows.h>
#include <fstream.h>
#include <iostream>
#include <sstream>
@@ -31,10 +32,6 @@
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/buffer.h>
-#ifdef _WIN32
-#include <windows.h>
-#endif // _WIN32
-#include "utf8.h"
static const TUint32 CrcTab32[256] =
{
@@ -103,94 +100,38 @@
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
-
-namespace Util
-{
-/**
- * Converts wide char (unicode) string to multibyte string
- * This interface is provided so that we can have different implementation
- * in windows and linux machine.
- * @param aSource string to be converted
- * @param aSourceLen Source len. If this is -1 then it will calculate the length of the source.
- * @param aTarget target location.
- * @param aTargetLen Space in the target location.
- * @param aCodePage Code page number (currently supported in windows only)
- * @return Number of bytes that make up the converted part of multibyte sequence.
- * If aTarget is NULL then the function will return the size needed to store
- * the complete conversion of the source string.
- */
-int ConvertWideCharToMultiByte(const wchar_t* aSource, int aSourceLen, char* aTarget, int aTargetLen, TUint32 aCodePage = 0);
-/**
- * Converts multibyte string to wide char (unicode)
- * This interface is provided so that we can have different implementation
- * in windows and linux machine.
- * @param aSource string to be converted
- * @param aSourceLen Source len. If this is -1 then it will calculate the length of the source.
- * @param aTarget target location.
- * @param aTargetLen Space in the target location.
- * @param aCodePage Code page number (currently supported in windows only)
- * @return Number of bytes that make up the converted part of widechar sequence.
- * If aTarget is NULL then the function will return the size needed to store
- * the complete conversion of the source string.
- */
-int ConvertMultiByteToWideChar(const char* aSource, int aSourceLen, wchar_t* aTarget, int aTargetLen, TUint32 aCodePage = 0);
-}; // namespace Util
-#ifdef __linux__
-int Util::ConvertWideCharToMultiByte(const wchar_t* aSource, int /*aSourceLen*/, char* aTarget, int aTargetLen, TUint32 /*aCodePage*/)
+DllExport std::string Util::wstring2string (const std::wstring& aWide)
{
- int retValue = wcstombs(aTarget, aSource, aTargetLen);
- if (-1 == retValue)
+ int max = WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),0,0,0,0);
+ std::string reply;
+ if (max > 0 )
{
- return 0;
+ char* buffer = new char [max];
+ try
+ {
+ WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),buffer,max,0,0);
+ reply = std::string (buffer, max);
+ }
+ catch (...)
+ {
+ }
+ delete [] buffer;
}
- return retValue;
- }
-
-int Util::ConvertMultiByteToWideChar(const char* aSource, int /*aSourceLen*/, wchar_t* aTarget, int aTargetLen, TUint32 /*aCodePage*/)
- {
- int retValue = mbstowcs(aTarget, aSource, aTargetLen);
- if (-1 == retValue)
- {
- return 0;
- }
- return retValue;
+ return reply;
}
-#else
-
-int Util::ConvertWideCharToMultiByte(const wchar_t* aSource, int aSourceLen, char* aTarget, int aTargetLen, TUint32 aCodePage)
- {
- if(0 == aCodePage)
- {
- aCodePage = CP_OEMCP;
- }
- return WideCharToMultiByte( aCodePage, 0, aSource, aSourceLen, aTarget, aTargetLen, NULL, NULL);
- }
-
-int Util::ConvertMultiByteToWideChar(const char* aSource, int aSourceLen, wchar_t* aTarget, int aTargetLen, TUint32 aCodePage)
+std::wstring Util::string2wstring (const std::string& aNarrow)
{
- if(0 == aCodePage)
- {
- aCodePage = CP_OEMCP;
- }
- return MultiByteToWideChar( aCodePage, 0, aSource, aSourceLen, aTarget, aTargetLen);
- }
-
-#endif // __linux__
-
-std::wstring Util::string2wstring (const char* aNarrow)
- {
- std::string narrowStr(aNarrow);
- int max = ConvertMultiByteToWideChar(aNarrow, strlen(aNarrow),0,0);
+ int max = MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),0,0);
std::wstring reply;
if (max > 0 )
{
wchar_t* buffer = new wchar_t [max];
try
{
- ConvertMultiByteToWideChar(aNarrow, strlen(aNarrow),buffer,max);
+ MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),buffer,max);
reply = std::wstring (buffer, max);
}
catch (...)
@@ -201,6 +142,26 @@
return reply;
}
+std::wstring Util::string2wstring (const char* aNarrow)
+ {
+ std::string narrowStr(aNarrow);
+ int max = MultiByteToWideChar(CP_OEMCP,0,narrowStr.c_str(),narrowStr.length(),0,0);
+ std::wstring reply;
+ if (max > 0 )
+ {
+ wchar_t* buffer = new wchar_t [max];
+ try
+ {
+ MultiByteToWideChar(CP_OEMCP,0,narrowStr.c_str(),narrowStr.length(),buffer,max);
+ reply = std::wstring (buffer, max);
+ }
+ catch (...)
+ {
+ }
+ delete [] buffer;
+ }
+ return reply;
+ }
DllExport int Util::WideCharToInteger(const wchar_t* aWideChar)
{
@@ -212,7 +173,7 @@
TInt64 Util::WideCharToInt64(const wchar_t* aWideChar)
{
- TInt64 i64 = 0;
+ __int64 i64 = 0;
swscanf(aWideChar, L"%I64d", &i64);
return i64;
}
@@ -269,3 +230,4 @@
crc = (crc >> 8) ^ CrcTab32[(crc ^ *p++) & 0xff];
return crc;
}
+
\ No newline at end of file
--- a/secureswitools/swisistools/source/dumpsis/main.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/dumpsis/main.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -64,7 +64,7 @@
}
else
{
- std::wcout << L":" << str.c_str();
+ std::wcout << L":" << str;
std::vector<std::wstring> capList;
fdesc->GetCapabilityList(capList);
std::wcout << std::endl;
--- a/secureswitools/swisistools/source/dumpsis/options.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/dumpsis/options.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -84,7 +84,7 @@
{
std::cout << "\nDUMPSIS Version " << MajorVersion << '.' << MinorVersion << std::endl;
std::cout << "A utility for decompiling Software Installation (SIS) files" << std::endl;
- std::cout <<"Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\n" << std::flush;
+ std::cout <<"Copyright (c) Symbian Software Limited 2004-2008. All rights reserved.\n\n" << std::flush;
}
Options::Options (int argc, wchar_t** argv)
@@ -99,21 +99,7 @@
while (--argc)
{
argv++;
- // WINDOWS ENVIRONMENT : If the underlying platform is WINDOWS then,
- // cope up with multiple arguments following the '-' or '/'.
- //
- // LINUX ENVIRONMENT : If the underlying platform is LINUX then, cope
- // up with multiple arguments following only the '-'. This restriction
- // of not dealing with arguments following '/' is due to the fact that,
- // the absolute paths in case of LINUX start with a '/'. So, this could
- // be mistaken as an option if we treat anything prefixed by a '/' as
- // an option. Hence, this facility is being removed once for all and
- // only '-' can(should) be used for specifying an option.
- if ( (**argv == '-')
-#ifndef __TOOLS2_LINUX__
- || (**argv == '/')
-#endif
- )
+ if ((**argv == '-') || (**argv == '/'))
{
const wchar_t* optPtr = *argv;
--- a/secureswitools/swisistools/source/dumpsis/options.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/dumpsis/options.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -30,7 +30,7 @@
using std::ostream;
int const MajorVersion=1;
-int const MinorVersion=3;
+int const MinorVersion=2;
int const BuildVersion=0;
/**
Exceptions raised while processing the command line
--- a/secureswitools/swisistools/source/dumpsislib/dumpsis.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/dumpsislib/dumpsis.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -28,10 +28,10 @@
#include <functional>
#include <set>
+
#include "dumpsis.h"
#include "siscontroller.h"
#include "exception.h"
-#include "utf8.h"
CDumpSis::CDumpSis(const std::wstring& aSISFileName, bool aVerbose)
: iController(NULL),
@@ -68,7 +68,6 @@
std::wostream outStream (inStream.rdbuf ());
outStream << wchar_t(0xfeff);
-
if(iIsStub)
{
iController->AddPackageEntry (outStream, iVerbose);
@@ -79,27 +78,7 @@
}
std::wstring str = inStream.str();
-#ifndef __TOOLS2_LINUX__
WriteToFile(aPkgFileName, reinterpret_cast<const TUint8*>(str.c_str()), str.length()*2);
-#else
- TUint32 size = str.size();
- const wchar_t * source = str.c_str();
-
- unsigned short int* buffer = new unsigned short int[size*2];
-
- // Using a temp variable in place of buffer as ConvertUTF32toUTF16 modifies the source pointer passed.
- unsigned short int* temp = buffer;
-
- //Converting to UTF-16 because makesis do not support UTF-32.
- ConvertUTF32toUTF16(&source, source + size, &temp, temp + (size*2), lenientConversion);
-
- TUint32 buflen = temp-buffer;
- // Appending NULL to the converted buffer.
- *temp = NULL;
-
- WriteToFile(aPkgFileName, reinterpret_cast<const TUint8*>(buffer), buflen*2);
- delete[] buffer;
-#endif
}
void CDumpSis::CreatePackage(const CSISController& aSisController, const std::wstring& aPkgFileName)
@@ -110,27 +89,7 @@
outStream << wchar_t(0xfeff);
aSisController.AddPackageEntry (outStream, iVerbose);
std::wstring str = inStream.str();
-#ifndef __TOOLS2_LINUX__
WriteToFile(aPkgFileName, reinterpret_cast<const TUint8*>(str.c_str()), str.length()*2);
-#else
- TUint32 size = str.size();
- const wchar_t * source = str.c_str();
-
- unsigned short int* buffer = new unsigned short int[size*2];
-
- // Using a temp variable in place of buffer as ConvertUTF32toUTF16 modifies the source pointer passed.
- unsigned short int* temp = buffer;
-
- //Converting to UTF-16 because makesis do not support UTF-32.
- ConvertUTF32toUTF16(&source, source + size, &temp, temp + (size*2), lenientConversion);
-
- TUint32 buflen = temp-buffer;
- // Appending NULL to the converted buffer.
- *temp = NULL;
-
- WriteToFile(aPkgFileName, reinterpret_cast<const TUint8*>(buffer), buflen*2);
- delete[] buffer;
-#endif
}
void CDumpSis::ExtractFiles(const std::wstring& aTargetDir, TExtractionLevel aLevel)
--- a/secureswitools/swisistools/source/interpretsis/commandparser.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsis/commandparser.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -170,8 +170,8 @@
void CCommandParser::DisplayVersion()
{
- std::cout << "\nINTERPRETSIS " << " Version 2.2.0 ." << std::endl;
- std::cout << "Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n " << std::endl;
+ std::cout << "\nINTERPRETSIS " << " Version 2.1.3 ." << std::endl;
+ std::cout << "Copyright (c) 2009 Symbian Software Ltd. All rights reserved.\n " << std::endl;
}
@@ -386,7 +386,7 @@
}
default:
{
- LERROR(string2wstring(std::string(optPtr)));
+ LERROR(Utf8ToUcs2(std::string(optPtr)));
throw CCommandParser::ECmdLineUnknownOption;
}
}
@@ -447,7 +447,8 @@
while (currentPos != end)
{
currentPos = std::find(it, end, ',');
- std::wstring x = string2wstring(std::string(it,(currentPos-it)));
+ std::wstring x;
+ Utf8ToUcs2(std::string(it,(currentPos-it)), x);
//aOptionsList.push_back(x);
(aParamList.*aFilePtr)(x);
@@ -474,7 +475,8 @@
while (currentPos != end)
{
currentPos = std::find(it, end, ',');
- std::wstring x = string2wstring(std::string(it,(currentPos-it)));
+ std::wstring x;
+ Utf8ToUcs2(std::string(it,(currentPos-it)), x);
InstallSISFile sisFileName(x, '$', false);
aParamList.AddSISFile(sisFileName);
@@ -492,7 +494,8 @@
// As the sisfile attributes are predetermined input, therefore we can just
// parse according to the predetermined inputs.
- std::wstring fileName = string2wstring(sisFileOption);
+ std::wstring fileName;
+ Utf8ToUcs2(sisFileOption, fileName);
InstallSISFile sisFileName(fileName, '$', false);
@@ -523,19 +526,9 @@
char drive = tolower(*++optPtr);
- if (drive < 'a' || drive > 'z')
+ if (drive < 'a' || drive > 'y')
throw CCommandParser::ECmdLineInvalidSISFileAttribute;
- if(drive == 'z')
- {
- aParamList.SetFlag(CParameterList::EFlagsRomInstallSet);
- sisFileName.iGenerateRomStub = true;
- sisFileName.iNotRegister = true;
- }
- else
- {
- aParamList.SetFlag(CParameterList::EFlagsExtDriveSet);
- }
// Set target drive
sisFileName.iTargetDrive = drive;
--- a/secureswitools/swisistools/source/interpretsis/main.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsis/main.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -29,22 +29,6 @@
#include "logger.h"
#include "../common/exception.h"
-
-#ifndef _WIN32
-#include <ctype.h>
-
-//__ctype_b was removed from glibc. This is a workaround to fix the linking problem
-extern "C"
- {
- const unsigned short int** __ctype_b()
- {
- return __ctype_b_loc();
- }
- }
-
-#endif // _WIN32
-
-
int main(int argc, const char* argv[])
{
bool pauseWhenDone = false;
@@ -64,7 +48,7 @@
if (options.LogFile().size() > 0)
{
- logFile = new std::wofstream(wstring2string(options.LogFile()).c_str(), std::ios::app);
+ logFile = new std::wofstream(Ucs2ToUtf8(options.LogFile()).c_str(), std::ios::app);
Logger::SetStream(*logFile);
}
else
@@ -106,7 +90,7 @@
}
catch (InterpretSisError& e)
{
- LERROR(L"\t" << string2wstring(e.what()));
+ LERROR(L"\t" << Utf8ToUcs2(e.what()));
result = e.GetErrorCode();
}
catch (CSISException e)
@@ -125,7 +109,7 @@
#endif
catch (std::exception &err)
{
- std::wstring emessage = string2wstring( err.what() );
+ std::wstring emessage = Utf8ToUcs2( err.what() );
LERROR( L"Error: " << emessage);
result = STD_EXCEPTION;
}
--- a/secureswitools/swisistools/source/interpretsislib/adornedutilities.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/adornedutilities.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -56,11 +56,7 @@
}
}
-#ifndef __TOOLS2_LINUX__
bool IsAdornedVariationOf(const std::wstring& aFileName1, const std::wstring& aFileName2)
-#else
-bool IsAdornedVariationOf(const std::wstring& aFileName1, const std::wstring& aFileName2, const std::wstring& aDrivePath)
-#endif
{
std::wstring unadornedFileName1;
GetUnadornedFileName(aFileName1,unadornedFileName1);
@@ -68,11 +64,6 @@
std::wstring unadornedFileName2;
GetUnadornedFileName(aFileName2,unadornedFileName2);
- #ifdef __TOOLS2_LINUX__
- ConvertToLocalPath( unadornedFileName1, aDrivePath );
- ConvertToLocalPath( unadornedFileName2, aDrivePath );
- #endif
-
// Check whether filename2 is a variant of filename1
// e.g: d:\sys\bin\DummyDll{000A0001}.dll is considered a variant of c:\sys\bin\DummyDll.dll
// because they both break down to \sys\bin\DummyDll.dll
@@ -82,7 +73,7 @@
std::wstring fileName2Path(StringUtils::Path(unadornedFileName2));
std::wstring fileName2NameAndExt(StringUtils::NameAndExt(unadornedFileName2));
- return ( !wcscmp(fileName1Path.c_str(), fileName2Path.c_str()) && !wcscmp(fileName1NameAndExt.c_str(), fileName2NameAndExt.c_str()) );
+ return ((fileName1Path == fileName2Path) && (fileName1NameAndExt == fileName2NameAndExt));
}
void FindAllAdornedVariants(const std::wstring& aSearchNameWild, const std::wstring& aSearchPath, std::list<std::wstring>& aAdornedFileNamesFound, const DrivesMap& aDriveMap)
--- a/secureswitools/swisistools/source/interpretsislib/adornedutilities.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/adornedutilities.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -45,11 +45,7 @@
@param aFileName1 first name to compare (full path and name)
@param aFileName2 second name to compare (full path and name)
*/
-#ifndef __TOOLS2_LINUX__
bool IsAdornedVariationOf(const std::wstring& aFileName1, const std::wstring& aFileName2);
-#else
-bool IsAdornedVariationOf(const std::wstring& aFileName1, const std::wstring& aFileName2, const std::wstring& aDrivePath);
-#endif
/** Searches through the file system looking for all variants of searchNameWild
@param aSearchNameWild represents the filename pattern that is to be searched for (i.e: afile{????????}.ext)
--- a/secureswitools/swisistools/source/interpretsislib/configmanager.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/configmanager.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -123,7 +123,7 @@
if ( FileExists( fileName ) )
{
std::string fName;
- fName = wstring2string( fileName );
+ fName = Ucs2ToUtf8( fileName );
//
std::ifstream stream;
stream.open( fName.c_str(), std::ios::binary );
@@ -203,27 +203,12 @@
CheckAndAddDrive(aParamList.SystemDriveLetter(), aParamList.SystemDrivePath());
}
- if ((!IsTargetDrivePresent(aParamList.SystemDriveLetter())) && (!aParamList.IsFlagSet(CParameterList::EFlagsRomInstallSet)))
+ if ( !IsTargetDrivePresent(aParamList.SystemDriveLetter()) )
{
std::stringstream err;
err << "The directory representing the system drive is not defined";
throw ConfigManagerException( ConfigManagerException::ETypeDriveError, err.str());
}
-
- if (!((aParamList.IsFlagSet(CParameterList::EFlagsCDriveSet)) ^ (aParamList.IsFlagSet(CParameterList::EFlagsRomInstallSet))))
- {
- std::stringstream err;
- err << "The System Drive should not be defined for Installation to Rom Drive";
- throw ConfigManagerException( ConfigManagerException::ETypeDriveError, err.str());
- }
-
- if ((!aParamList.IsFlagSet(CParameterList::EFlagsCDriveSet)) && (aParamList.IsFlagSet(CParameterList::EFlagsExtDriveSet)))
- {
- std::stringstream err;
- err << "The Extended Drive cannot be specified without -c (System drive) option.";
- throw ConfigManagerException( ConfigManagerException::ETypeDriveError, err.str());
- }
-
}
@@ -397,7 +382,7 @@
std::ostringstream stream;
stream << "Unsupported keyword at line " << aLineNumber << " of ini file [" << aKey << " = " << aValue << "] ";
stream << std::endl;
- std::wstring finalMessage = string2wstring( stream.str() );
+ std::wstring finalMessage = Utf8ToUcs2( stream.str() );
LWARN( finalMessage );
}
}
@@ -413,7 +398,7 @@
if ( KConfigAttributes[i].iId == aId )
{
std::wstring entry( KConfigAttributes[i].iName );
- ret = wstring2string( entry );
+ ret = Ucs2ToUtf8( entry );
}
}
//
@@ -426,7 +411,7 @@
std::string upperCased( aName );
upperCased = StringUtils::ToUpper( upperCased );
std::wstring searchFor;
- searchFor = string2wstring( upperCased );
+ searchFor = Utf8ToUcs2( upperCased );
//
const int attributeCount = sizeof( KConfigAttributes ) / sizeof( ConfigAttribute );
const ConfigAttribute* ret = NULL;
@@ -527,7 +512,7 @@
}
// Set the drive representation location
- aDrive->iDir = string2wstring(std::string(it, (currentPos-it)));
+ Utf8ToUcs2(std::string(it, (currentPos-it)), aDrive->iDir);
temp = StringUtils::TrimWhiteSpace( std::string(currentPos, end) );
@@ -629,7 +614,7 @@
char drive = aDrive;
std::stringstream warn;
warn << "Redefining drive: " << drive;
- std::wstring finalMessage = string2wstring( warn.str() );
+ std::wstring finalMessage = Utf8ToUcs2( warn.str() );
LWARN( finalMessage + L" to " + aDir);
delete it->second;
@@ -702,7 +687,7 @@
stream << "\'" << iValue << "\'" << " directory is not found";
break;
case ETypeDriveError:
- LERROR( string2wstring( iValue ) );
+ LERROR( Utf8ToUcs2( iValue ) );
return;
default:
@@ -711,7 +696,7 @@
}
//
stream << std::endl;
- std::wstring finalMessage = string2wstring( stream.str() );
+ std::wstring finalMessage = Utf8ToUcs2( stream.str() );
//
LERROR( finalMessage );
}
--- a/secureswitools/swisistools/source/interpretsislib/deserialiser.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/deserialiser.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -26,8 +26,6 @@
#include "serialisable.h"
#include "cardinality.h"
#include "ucmp.h"
-#include "utf8.h"
-#include "is_utils.h"
#pragma warning (disable: 4800)
@@ -139,50 +137,6 @@
return *this;
}
-#ifdef __TOOLS2_LINUX__
-
- Deserialiser& operator>>(std::wstring& val)
- {
- Cardinality card;
- *this >> card;
- TUint32 size = card;
-
- TUint32 sizebackup = size;
-
- unsigned short int* buff = 0;
-
- if (size & 0x01)
- {
- throw std::runtime_error("Decoding 8bit text into std::wstring");
- }
- else
- {
- size = size >> 1;
- buff = new unsigned short int[(int)size];
- TUnicodeExpander exp;
- TMemoryUnicodeSink sink((TUint16*)buff);
- exp.ExpandL(sink, *this ,size);
- unsigned short int* source = buff;
- wchar_t buffer[size];
- // Using a temp variable in place of buffer as ConvertUTF16toUTF32 modifies the source pointer passed.
- wchar_t* temp = buffer;
-
- ConvertUTF16toUTF32(&source, source + sizebackup, &temp, temp + size, lenientConversion);
-
- // Appending NUL to the converted buffer.
- *temp = 0;
- val.assign(buffer, size);
-
- }
-
- ConvertToForwardSlash(val);
-
- delete buff;
- return *this;
- }
-
-#else
-
Deserialiser& operator>>(std::wstring& val)
{
@@ -207,7 +161,6 @@
delete buff;
return *this;
}
-#endif
void read(TUint8* aDst, TUint32 aCount)
{
--- a/secureswitools/swisistools/source/interpretsislib/errors.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/errors.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -85,7 +85,7 @@
}
inline InterpretSisError( const std::wstring& aError, ErrorCodes aCode )
- : std::runtime_error( wstring2string(aError) ), iCode( aCode )
+ : std::runtime_error( Ucs2ToUtf8(aError) ), iCode( aCode )
{
}
--- a/secureswitools/swisistools/source/interpretsislib/expressionevaluator.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/expressionevaluator.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -108,9 +108,9 @@
{
iExpressionDepth=0;
std::string error = "SIS File expression too complex\n";
- std::string x = wstring2string(iExpEnv.GetPackageName());
+ std::string x;
//
- throw InvalidSis(x, error, SIS_NOT_SUPPORTED);
+ throw InvalidSis(Ucs2ToUtf8(iExpEnv.GetPackageName(),x), error, SIS_NOT_SUPPORTED);
}
switch (aExpression.Operator())
@@ -248,9 +248,9 @@
{
iExpressionDepth=0;
std::string error = "SIS File contains user options\n";
- std::string x = wstring2string(iExpEnv.GetPackageName());
+ std::string x;
//
- throw InvalidSis(x, error, SIS_NOT_SUPPORTED);
+ throw InvalidSis(Ucs2ToUtf8(iExpEnv.GetPackageName(),x), error, SIS_NOT_SUPPORTED);
}
case CSISExpression::EPrimTypeNumber:
@@ -261,9 +261,9 @@
{
iExpressionDepth=0;
std::string error = "SIS File contains unknown expression\n";
- std::string x = wstring2string(iExpEnv.GetPackageName());
+ std::string x;
//
- throw InvalidSis(x, error, SIS_NOT_SUPPORTED);
+ throw InvalidSis(Ucs2ToUtf8(iExpEnv.GetPackageName(),x), error, SIS_NOT_SUPPORTED);
}
}
@@ -316,7 +316,8 @@
}
// Require for invalid file exception (also helps with debugging)
- std::string narrowFileName = wstring2string( fileName );
+ std::string narrowFileName;
+ narrowFileName = Ucs2ToUtf8( fileName, narrowFileName );
// Now continue with file, assuming we've fixed up the path or then
// have enough characters to process
@@ -344,7 +345,8 @@
ConvertToLocalPath( fileName, iCDrive );
// For debugging
- narrowFileName = wstring2string( fileName );
+ narrowFileName = Ucs2ToUtf8( fileName, narrowFileName );
+
fileExists = FileExists( fileName );
break;
}
@@ -361,7 +363,7 @@
std::ostringstream stream;
stream << "\tIF EXISTS(\'" << narrowFileName << "\') => " << fileExists;
std::string msg = stream.str();
- std::wstring finalMessage = string2wstring( msg );
+ std::wstring finalMessage = Utf8ToUcs2( msg );
LINFO( finalMessage );
}
//
@@ -426,7 +428,7 @@
std::ostringstream stream;
stream << "Input language " << result << " is not supported by SIS file. Using first language " <<firstLanguage;
std::string msg = stream.str();
- std::wstring finalMessage = string2wstring( msg );
+ std::wstring finalMessage = Utf8ToUcs2( msg );
LWARN( finalMessage );
}
result = firstLanguage;
@@ -437,7 +439,7 @@
std::ostringstream stream;
stream << "\tIF " << attributeName << " ... where [" << attributeName << " = " << result << "]";
std::string msg = stream.str();
- std::wstring finalMessage = string2wstring( msg );
+ std::wstring finalMessage = Utf8ToUcs2( msg );
LINFO( finalMessage );
}
}
@@ -451,7 +453,8 @@
}
else
{
- std::string packageName = wstring2string( GetPackageName() );
+ std::string packageName;
+ packageName = Ucs2ToUtf8( GetPackageName(), packageName );
//
std::string error = "SIS File contains HAL attributes\n";
throw InvalidSis( packageName, error, SIS_NOT_SUPPORTED );
--- a/secureswitools/swisistools/source/interpretsislib/filedescription.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/filedescription.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -38,10 +38,6 @@
iIndex(aFile.FileIndex()),
iSid(aSid)
{
- if((L'z'==aTargetDrive) || (L'Z'==aTargetDrive))
- {
- iTarget[0]='z';
- }
const unsigned char* data = aFile.Hash().Blob().Data();
TUint32 len = aFile.Hash().Blob().Size();
--- a/secureswitools/swisistools/source/interpretsislib/installablefile.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/installablefile.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -34,8 +34,7 @@
// SA SIS files
-InstallableFile::InstallableFile(const CSISFileDescription& aFdes, const CSISFileData* aFdata, const std::wstring aDrivePath,
- int aInstallingDrive, const int aSystemdrive, const bool aGenerateRomStub)
+InstallableFile::InstallableFile(const CSISFileDescription& aFdes, const CSISFileData* aFdata, const std::wstring aDrivePath, int aInstallingDrive)
: isExecutable(aFdata->IsExecutable()),
isExe(aFdata->IsExe()),
iSid(aFdata->GetSid()),
@@ -45,22 +44,17 @@
iTargetFile(aFdes.Target().GetString()),
iLocalTargetFile(aFdes.Target().GetString())
{
- // Transforming the file path into lower case to maintain consistency
- // between Windows and Linux as Linux path is case-sensitive.
- std::transform(iTargetFile.begin(), iTargetFile.end(), iTargetFile.begin(), tolower);
- std::transform(iLocalTargetFile.begin(), iLocalTargetFile.end(), iLocalTargetFile.begin(), tolower);
-
// Update the installing file with the actual target drive letter
- ChangeTargetDrive(aDrivePath, aInstallingDrive, aSystemdrive, aGenerateRomStub);
+ ChangeTargetDrive(aDrivePath, aInstallingDrive);
// warn the user if they are using a winscw emulator binary
if (aFdata->IsEmulatorExecutable())
- LWARN(iTargetFile.c_str() << L" is an emulator binary!");
+ LWARN(iTargetFile << L" is an emulator binary!");
}
// PA SIS files
InstallableFile::InstallableFile(const CSISFileDescription& aFdes, const std::wstring aDrivePath,
- int aInstallingDrive, const int aSystemdrive, const bool aGenerateRomStub)
+ int aInstallingDrive)
: isExecutable(false),
isExe(false),
iSid(0),
@@ -70,13 +64,8 @@
iTargetFile(aFdes.Target().GetString()),
iLocalTargetFile(aFdes.Target().GetString())
{
- // Transforming the file path into lower case to maintain consistency
- // between Windows and Linux as Linux path is case-sensitive.
- std::transform(iTargetFile.begin(), iTargetFile.end(), iTargetFile.begin(), tolower);
- std::transform(iLocalTargetFile.begin(), iLocalTargetFile.end(), iLocalTargetFile.begin(), tolower);
-
// Update the installing file with the actual target drive letter
- ChangeTargetDrive(aDrivePath, aInstallingDrive, aSystemdrive, aGenerateRomStub);
+ ChangeTargetDrive(aDrivePath, aInstallingDrive);
// retrieve the file attributes e.g. exe, dll, SID etc.
const bool fileExists = FileExists( iLocalTargetFile );
@@ -97,7 +86,7 @@
iSid = info.iSecureId;
if(fileType & EFileEmulatorExe)
- LWARN(iTargetFile.c_str() << L" is an emulator binary!");
+ LWARN(iTargetFile << L" is an emulator binary!");
}
else if (fileType & EFileDll)
{
@@ -117,19 +106,11 @@
delete iFileData;
}
-void InstallableFile::SetTarget(const std::wstring& aTargetFile)
-{
- iTargetFile = aTargetFile;
-}
-void InstallableFile::ChangeTargetDrive(const std::wstring aDrivePath, int aInstallingDrive,
- const int aSystemdrive, const bool aGenerateRomStub)
+void InstallableFile::ChangeTargetDrive(const std::wstring aDrivePath, int aInstallingDrive)
{
// get the local path
ConvertToLocalPath(iLocalTargetFile,aDrivePath);
-#ifdef __TOOLS2_LINUX__
- ConvertToForwardSlash(iTargetFile);
-#endif
// change the drive letter
if (StringUtils::StartsWithDrive(iTargetFile))
@@ -138,24 +119,9 @@
int targetFileDrive = tolower(target[0]);
if (targetFileDrive != aInstallingDrive)
{
- if((iTargetFile[0] == '$') && !aGenerateRomStub)
- {
- //Creating tmpTarget so that '$' in iTargetFile is retained and
- //can be used as a marker while File Copy to system drive and
- //not to LocalTargetPath
- std::wstring tmpTarget(iTargetFile);
- tmpTarget[0] = aSystemdrive;
-
- LINFO(L"Disregarding drive selection. Installing "
- << target.c_str() << L" to " << tmpTarget.c_str());
- }
- else
- {
- iTargetFile[0] = aInstallingDrive;
-
- LINFO(L"Disregarding drive selection. Installing "
- << target.c_str() << L" to " << iTargetFile.c_str());
- }
+ iTargetFile[0] = aInstallingDrive;
+ LINFO(L"Disregarding drive selection. Installing "
+ + target + L" to " + iTargetFile);
}
}
else
--- a/secureswitools/swisistools/source/interpretsislib/installablefile.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/installablefile.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -39,12 +39,10 @@
public:
// constructor for non stub files
- InstallableFile(const CSISFileDescription&, const CSISFileData*, const std::wstring aDrivePath,
- int aInstallingDrive, const int aSystemdrive, const bool aGenerateRomStub);
+ InstallableFile(const CSISFileDescription&, const CSISFileData*, const std::wstring aDrivePath, int aInstallingDrive);
// constructor for stub files
- InstallableFile(const CSISFileDescription&, const std::wstring aDrivePath, int aInstallingDrive,
- const int aSystemdrive, const bool aGenerateRomStub);
+ InstallableFile(const CSISFileDescription&, const std::wstring aDrivePath, int aInstallingDrive);
~InstallableFile();
public:
@@ -55,12 +53,10 @@
const CSISFileDescription* FileDescription() const{ return iFileDescription;};
const CSISFileData* FileData() const{ return iFileData;};
const std::wstring& GetTarget() const { return iTargetFile; };
- void SetTarget(const std::wstring& aTargetFile);
const std::wstring& GetLocalTarget() const { return iLocalTargetFile; };
private:
- void ChangeTargetDrive(const std::wstring aDrivePath, int aInstallingDrive,
- const int aSystemdrive, const bool aGenerateRomStub);
+ void ChangeTargetDrive(const std::wstring aDrivePath, int aInstallingDrive);
private:
bool isExecutable;
--- a/secureswitools/swisistools/source/interpretsislib/installer.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/installer.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -21,9 +21,7 @@
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#include "dbhelper.h"
-#ifndef __TOOLS2_LINUX__
-#include <windows.h>
-#endif
+
#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#include <exception>
#include <sstream>
@@ -56,11 +54,7 @@
// Constants
const char KRomDriveLetter = 'z';
const TUint32 KSwiDaemonUid = 0x10202DCE;
-#ifndef __TOOLS2_LINUX__
const std::wstring KSysBinPath = L"\\sys\\bin\\";
-#else
-const std::wstring KSysBinPath = L"/sys/bin/";
-#endif
TInt CheckWildCard(TInt aVal, TInt aReplace)
{
@@ -117,11 +111,7 @@
// Ensure formatting is correct
if ( StringUtils::IsLastCharacter( shortName, KDirectorySeparator[ 0 ] ) ||
- #ifndef __TOOLS2_LINUX__
StringUtils::IsLastCharacter( shortName, L'/' ) )
- #else
- StringUtils::IsLastCharacter( shortName, L'\\' ) )
- #endif
{
shortName.erase(shortName.length()-1,1);
}
@@ -138,8 +128,7 @@
{
InstallSISFile sisFileName(shortName + KDirectorySeparator + *currStr,
curr->iTargetDrive, curr->iGenerateStub,
- curr->iNonRemovable, curr->iReadOnly, curr->iNotRegister,
- curr->iSUFlag, curr->iGenerateRomStub);
+ curr->iNonRemovable, curr->iReadOnly, curr->iNotRegister, curr->iSUFlag);
sisFiles.push_back(sisFileName);
}
@@ -154,8 +143,7 @@
|| (shortName.find(L".sis",0) != std::wstring::npos))
{
InstallSISFile sisFileName(shortName, curr->iTargetDrive, curr->iGenerateStub,
- curr->iNonRemovable, curr->iReadOnly, curr->iNotRegister,
- curr->iSUFlag, curr->iGenerateRomStub);
+ curr->iNonRemovable, curr->iReadOnly, curr->iNotRegister, curr->iSUFlag);
sisFiles.push_back(sisFileName);
}
@@ -210,7 +198,7 @@
catch (InterpretSisError& e)
{
LERROR(L"Failed installing " << (curr->iFileName));
- LERROR(L"\t" << string2wstring(e.what()));
+ LERROR(L"\t" << Utf8ToUcs2(e.what()));
curr = sisFiles.erase(curr);
if (result == 0)
@@ -340,21 +328,20 @@
return MISSING_DEPENDENCY;
}
- if (!IsValidUpgrade(file, aInstallSISFile.iSUFlag, aInstallSISFile.iNonRemovable, aInstallSISFile.iGenerateRomStub))
+ if (!IsValidUpgrade(file, aInstallSISFile.iSUFlag, aInstallSISFile.iNonRemovable))
{
return INVALID_UPGRADE;
}
InstallableFiles installable;
- GetInstallableFiles(file, installable, *iExpressionEvaluator, aInstallSISFile.iTargetDrive,
- iParamList.SystemDriveLetter(), aInstallSISFile.iGenerateRomStub);
+ GetInstallableFiles(file, installable, *iExpressionEvaluator, aInstallSISFile.iTargetDrive);
// Uninstall the same package (if found) prior to any installation
- UninstallPkg(file, aInstallSISFile.iGenerateRomStub);
+ UninstallPkg(file);
CheckDestinations(file, installable, aInstallSISFile);
- InstallFiles(installable, iParamList.SystemDriveLetter(), aInstallSISFile.iGenerateRomStub);
+ InstallFiles(installable, iParamList.SystemDriveLetter());
UpdateRegistry(file, installable, aInstallSISFile, aInstallSISFile.iSUFlag);
@@ -363,11 +350,6 @@
CreateStubSisFile(aInstallSISFile, file);
}
- if (aInstallSISFile.iGenerateRomStub)
- {
- CreateRomStubSisFile(aInstallSISFile, file);
- }
-
FreeInstallableFiles(installable);
return SUCCESS;
@@ -466,7 +448,7 @@
return (stubExistsInRom && (romUpgradableSA || puInstall || spInstall));
}
-void Installer::UninstallPkg(const SisFile& aSis, const bool aGenerateRomStub)
+void Installer::UninstallPkg(const SisFile& aSis)
{
TUint32 uid = aSis.GetPackageUid();
TUint32 installType = aSis.GetInstallType();
@@ -474,7 +456,7 @@
// Check to see the SA is installed, otherwise, RemovePkg() will throw an exception
if (iRegistry.IsInstalled(uid) && (installType == CSISInfo::EInstInstallation))
{
- LINFO(L"Removing package \"" << aSis.GetPackageName().c_str() << L"\" prior to re-installation");
+ LINFO(L"Removing package \"" << aSis.GetPackageName() << L"\" prior to re-installation");
// Remove all installed files for this Uid's packages and all the SisRegistry Entries
iRegistry.RemovePkg(uid, true);
@@ -483,35 +465,11 @@
if (installType == CSISInfo::EInstAugmentation)
{
// Clean up the installed files from the specified SP package and the SisRegistry Entry
- iRegistry.RemoveEntry(uid, aSis.GetPackageName().c_str(), aSis.GetVendorName().c_str());
+ iRegistry.RemoveEntry(uid, aSis.GetPackageName(), aSis.GetVendorName());
}
- if(!aGenerateRomStub)
- {
- // Regenerate the ROM stub registry entries for eclipsing check later.
- iRegistry.GenerateStubRegistry();
- }
- else
- {
- std::list<std::wstring> stubFileEntries;
-
- iRegistry.GetStubFileEntries(uid, stubFileEntries);
- if((!stubFileEntries.empty()))
- {
- LINFO(L"Rom Stub Upgrade, removing \"" << iRegistry.GetRomStubFile() << L"\" prior to re-installation");
- RemoveFile(iRegistry.GetRomStubFile());
-
- std::list<std::wstring>::const_iterator end = stubFileEntries.end();
- for (std::list<std::wstring>::const_iterator curr = stubFileEntries.begin() ;
- curr != end; ++curr)
- {
- std::wstring file = *curr;
- file[0]='z';
- ConvertToLocalPath(file, iParamList.RomDrivePath());
- RemoveFile(file);
- }
- }
- }
+ // Regenerate the ROM stub registry entries for eclipsing check later.
+ iRegistry.GenerateStubRegistry();
}
@@ -577,7 +535,7 @@
}
-bool Installer::IsValidUpgrade(const SisFile& aFile, bool aSUFlag, bool aNonRemovable, bool aGenerateRomStub)
+bool Installer::IsValidUpgrade(const SisFile& aFile, bool aSUFlag, bool aNonRemovable)
{
TUint32 pkg = aFile.GetPackageUid();
TUint32 installFlags = aFile.GetInstallFlags();
@@ -614,44 +572,22 @@
if (iRegistry.IsInstalled(pkg))
{
- if (aGenerateRomStub && (installType == CSISInfo::EInstAugmentation || installType == CSISInfo::EInstPartialUpgrade))
- {
- // Installing SP and PU to Rom (z) drive not allowed
- std::stringstream err;
- err << "Could not perform SP or PU upgrade for Rom (z) drive installation";
-
- throw InterpretSisError(err.str(), ATTEMPT_TO_UPGRADE_ROM_PKG);
- }
- else
- {
- ValidateRegistry(aFile,pkg,installFlags,RUFlag,aNonRemovable,aGenerateRomStub);
- }
+ ValidateRegistry(aFile,pkg,installFlags,RUFlag,aNonRemovable);
}
else if (installType == CSISInfo::EInstAugmentation || installType == CSISInfo::EInstPartialUpgrade)
{
- if(iParamList.IsFlagSet(CParameterList::EFlagsRomInstallSet))
- {
- // Installing SP and PU to Rom Drive is not supported.
- std::stringstream err;
- err << "Installing SP and PU to Rom (z) Drive is not supported.";
- throw InterpretSisError(err.str(), ATTEMPT_TO_UPGRADE_ROM_PKG);
- }
- else
- {
- // Installing SP and PU without the base package
- std::stringstream err;
- err << "Could not perform upgrade - the base package 0x" << std::hex
- << pkg << " is missing";
+ // Installing SP and PU without the base package
+ std::stringstream err;
+ err << "Could not perform upgrade - the base package 0x" << std::hex
+ << pkg << " is missing";
- throw InterpretSisError(err.str(), MISSING_BASE_PACKAGE);
- }
+ throw InterpretSisError(err.str(), MISSING_BASE_PACKAGE);
}
return true;
}
-void Installer::ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags,
- bool aRUFlag, bool aNonRemovable, bool aGenerateRomStub)
+void Installer::ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags, bool aRUFlag, bool aNonRemovable)
{
bool isSisNonRemovable = aInstallFlags & CSISInfo::EInstFlagNonRemovable;
bool isBaseRemovable = false;
@@ -667,14 +603,14 @@
if (installType == CSISInfo::EInstInstallation)
{
- if (inRom && !aRUFlag && !aGenerateRomStub)
+ if (inRom && !aRUFlag)
{
std::stringstream err;
err << "Illegal SA upgrade to ROM package 0x" << std::hex << aPckgUid;
throw InterpretSisError(err.str(), ATTEMPT_TO_UPGRADE_ROM_PKG);
}
// This is not a ROM base package, check is there a SIS stub base package present
- else if (iRegistry.IsRomStubPackage(aPckgUid) && !aRUFlag && !aGenerateRomStub)
+ else if (iRegistry.IsRomStubPackage(aPckgUid) && !aRUFlag)
{
std::stringstream err;
err << "Indirect SA upgrade to ROM package 0x" << std::hex << aPckgUid
@@ -765,21 +701,20 @@
}
bool Installer::GetInstallableFiles(const SisFile& aFile, InstallableFiles& aList, ExpressionEvaluator& aEvaluator,
- int aInstallingDrive, const int aSystemDrive, const bool aGenerateRomStub)
+ int aInstallingDrive)
{
return aFile.GetInstallableFiles(aList, aEvaluator,
- iConfigManager.GetLocalDrivePath(aInstallingDrive), aInstallingDrive, aSystemDrive, aGenerateRomStub);
+ iConfigManager.GetLocalDrivePath(aInstallingDrive), aInstallingDrive);
}
struct InstallFile
{
- InstallFile(const std::wstring& aCDrive, const int aSystemDrive, const bool aGenerateRomStub)
- : iSystemDrivePath(aCDrive), iSystemDrive(aSystemDrive), iGenerateRomStub(aGenerateRomStub) {}
+ InstallFile(const std::wstring& aCDrive, const int aSystemDrive)
+ : iSystemDrivePath(aCDrive), iSystemDrive(aSystemDrive) {}
const std::wstring& iSystemDrivePath;
const int iSystemDrive;
- const bool iGenerateRomStub;
void operator()(const InstallableFile* aFile)
{
@@ -796,22 +731,10 @@
else
{
// Unicode characters can not be displayed on DOS prompt
- std::string temporary = wstring2string(target);
- if(temporary[0]=='$')
- {
- temporary[0] = iSystemDrive;
- }
- std::wstring targetDisplay = string2wstring( temporary );
+ std::string temporary = Ucs2ToUtf8(target);
+ std::wstring targetDisplay = Utf8ToUcs2( temporary );
LINFO(L"Installing file: " << targetDisplay);
- if(target[0]==L'$')
- {
- localTarget = target;
- ConvertToLocalPath( localTarget, iSystemDrivePath );
- target[0] = iSystemDrive;
- aFile->SetTarget(target);
- }
-
std::wstring targetDirectory = localTarget.substr( 0, localTarget.rfind( KDirectorySeparator ) );
const unsigned char* buffer = NULL;
TUint32 len;
@@ -829,7 +752,7 @@
// if the FN option specified, leave the file creation
if (fileNullOption)
{
- LINFO(L"File " << target.c_str() << L" contains \"Delete-File-On-Uninstall\" option." );
+ LINFO(L"File " << target << L" contains \"Delete-File-On-Uninstall\" option." );
}
else
{
@@ -856,19 +779,12 @@
}
}
- if (aFile->IsExecutable() && !fileNullOption && !iGenerateRomStub)
+ if (aFile->IsExecutable() && !fileNullOption)
{
// register the hash
std::wstring basename = localTarget.substr( localTarget.rfind( KDirectorySeparator ) + 1 );
- #ifndef __TOOLS2_LINUX__
- // Remove the null character at the end and.
- std::wstring tempStr = iSystemDrivePath.c_str();
- std::wstring hashdir = tempStr + L"\\sys\\hash\\";
+ std::wstring hashdir = iSystemDrivePath + L"\\sys\\hash\\";
std::wstring reghashdir = L"$:\\sys\\hash\\";
- #else
- std::wstring hashdir = iSystemDrivePath + L"/sys/hash/";
- std::wstring reghashdir = L"$:/sys/hash/";
- #endif
if ( !MakeDir( hashdir ) )
{
@@ -879,7 +795,8 @@
// hash file is always created on the system drive
reghashdir[0] = iSystemDrive;
- LINFO(L"\tCreating hash: " << reghashdir << basename.c_str());
+ LINFO(L"\tCreating hash: " << reghashdir << basename);
+
std::wstring hash = hashdir + basename;
HANDLE hFile = MakeSISOpenFile(hash.c_str(), GENERIC_WRITE, CREATE_ALWAYS);
if( INVALID_HANDLE_VALUE == hFile )
@@ -902,16 +819,11 @@
};
-void Installer::InstallFiles(const InstallableFiles& aList, int aInstallDrive, const bool aGenerateRomStub)
+void Installer::InstallFiles(const InstallableFiles& aList, const int aInstallDrive)
{
- if(aGenerateRomStub)
- {
- aInstallDrive = 'z'; //Rom Drive
- }
-
std::wstring localTargetPath = iConfigManager.GetLocalDrivePath(aInstallDrive);
- std::for_each(aList.begin(), aList.end(), InstallFile(localTargetPath, aInstallDrive, aGenerateRomStub));
+ std::for_each(aList.begin(), aList.end(), InstallFile(localTargetPath, aInstallDrive));
}
@@ -958,11 +870,7 @@
// find all adorned variants in the ROM/ROFS logs
if (iParamList.IsFlagSet(CParameterList::EFlagsRomRofsLogFilesSet))
{
- #ifndef __TOOLS2_LINUX__
std::wstring romSearchNameWild = L"z:\\sys\\bin\\";
- #else
- std::wstring romSearchNameWild = L"z:/sys/bin/";
- #endif
romSearchNameWild.append(searchNameWild);
iRomManager.FindAllAdornedVariants(romSearchNameWild, aAdornedFileNamesFound);
}
@@ -1075,11 +983,7 @@
{
// we are eclipsing a ROM file, check if this is authorised:
// see implementation of IsEclipsable()
- #ifndef __TOOLS2_LINUX__
if (!IsEclipsable(searchNameUnadorned, aSUFlag))
- #else
- if (!IsEclipsable(searchNameUnadorned, aSUFlag, localDir))
- #endif
{
result = false;
break;
@@ -1094,7 +998,7 @@
// this drive should be added to iEclipsableOverwriteFiles.
if (processEclipsingSuspectsFoundOnThisDrive && unadornedFound)
{
- iEclipsableOverwriteFiles.push_back(searchNameUnadorned.c_str());
+ iEclipsableOverwriteFiles.push_back(searchNameUnadorned);
}
if (processEclipsingSuspectsFoundOnThisDrive && adornedFound)
@@ -1110,7 +1014,7 @@
int drive = tolower(adornedFile[0]);
if (drive == disk)
{
- iEclipsableOverwriteFiles.push_back(adornedFile.c_str());
+ iEclipsableOverwriteFiles.push_back(adornedFile);
}
}
}
@@ -1183,11 +1087,7 @@
@param aRomFile fully qualified filename in ROM that is to be checked for eclipising (i.e: z:\sys\bin\some.dll)
@param aSUFlag specifies if the installing SIS file has been signed by a SU certificate
*/
-#ifndef __TOOLS2_LINUX__
bool Installer::IsEclipsable(std::wstring& aRomFile, bool aSUFlag)
-#else
-bool Installer::IsEclipsable(std::wstring& aRomFile, bool aSUFlag, const std::wstring& aDrivePath)
-#endif
{
// SA/SP/PU sis + RU flag + signed by SU root cert is allowed
if (aSUFlag)
@@ -1211,11 +1111,7 @@
}
else if (goesToSysBin) // case 2
{
- #ifndef __TOOLS2_LINUX__
if (IsAdornedVariationOf(eclipsableRomFile,aRomFile))
- #else
- if (IsAdornedVariationOf(eclipsableRomFile,aRomFile,aDrivePath))
- #endif
{
isEclipsable = true;
break;
@@ -1226,41 +1122,6 @@
return isEclipsable;
}
-/** This function handles file overwriting scenarios from Stub SIS files only and not from SISregistry.
- (i.e: we are trying to install z:\somedir\somename.ext however it already exists)
- @param aFile the SIS file to be installed
- @param aTarget The fully qualified filename (full path and name)
-*/
-void Installer::HandleRomFileOverwriting(const SisFile& aFile, const std::wstring& aTarget)
-{
- // find out which Rom Stub this file belongs to
- TUint32 owningUid = 0;
- CSISController* sisController = iRegistry.GetStubControllerUid(aTarget);
-
- if(sisController)
- {
- owningUid=sisController->UID1();
- }
-
- // no package owns this file. Always allow orphaned file overwriting!
- if (owningUid == 0)
- {
- LWARN(aTarget << L" overwrites orphaned file");
- }
- else if (aFile.GetPackageUid() != owningUid)
- {
- std::wostringstream os;
- os << aTarget.c_str() << L" overwrites file from package 0x" << std::hex << owningUid << L" \"" << sisController->SISInfo().PackageName(0) << L"\"" << std::endl;
- iProblemFiles.append(os.str());
- iError = ECLIPSING_VIOLATION;
- }
-
- if(sisController)
- {
- delete sisController;
- }
-}
-
/** This function handles overwriting scenarios (i.e: we are trying to install c:\somedir\somename.ext however it already exists)
In this case we have 2 possibilities:
1) We are correctly overwriting the already present file (a PU)
@@ -1284,8 +1145,8 @@
// do not display a warning if the installing file is a PA. The user
// needs to copy the installing files to the installing directory
// prior to installing the SIS file.
- std::string tempTarget = wstring2string(aTarget);
- std::wstring targetDisplay = string2wstring( tempTarget );
+ std::string tempTarget = Ucs2ToUtf8(aTarget);
+ std::wstring targetDisplay = Utf8ToUcs2( tempTarget );
if (aFile.GetInstallType() == CSISInfo::EInstPreInstalledApp)
{
LINFO(targetDisplay << L" found for PA installation");
@@ -1301,7 +1162,7 @@
if (isSp)
{
std::wostringstream os;
- os << aTarget.c_str() << L" overwrites file from base package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName() << L"\"" << std::endl;
+ os << aTarget << L" overwrites file from base package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName() << L"\"" << std::endl;
iProblemFiles.append(os.str());
iError = ECLIPSING_VIOLATION;
}
@@ -1314,13 +1175,13 @@
if (isSp || (!aSUFlag && (isPu || isSa)))
{
std::wostringstream os;
- os << aTarget.c_str() << L" overwrites file from base package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName() << L"\"" << std::endl;
+ os << aTarget << L" overwrites file from base package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName() << L"\"" << std::endl;
iProblemFiles.append(os.str());
iError = ECLIPSING_VIOLATION;
}
else
{
- LWARN(aTarget.c_str() << L" overwrites file from base package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName() << L"\"");
+ LWARN(aTarget << L" overwrites file from base package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName() << L"\"");
}
}
}
@@ -1340,19 +1201,19 @@
std::wstring eclipseFile(*curr);
TUint32 owningUid = 0;
- const SisRegistryObject* owningObj = iRegistry.OwningPackage(eclipseFile.c_str(), owningUid);
+ const SisRegistryObject* owningObj = iRegistry.OwningPackage(eclipseFile, owningUid);
// always allow orphaned file overwriting
if (owningUid == 0)
{
- LWARN(eclipseFile.c_str() << L" eclipses orphaned file.");
+ LWARN(eclipseFile << L" eclipses orphaned file.");
}
else
{
// SP/PU can not overwrite a file belonging to a different base pkg or
// SP/PU can not eclipse a base package which is not in the ROM.
std::wostringstream os;
- os << eclipseFile.c_str() << L" eclipses file from package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName().c_str() << L"\""<< std::endl;
+ os << eclipseFile << L" eclipses file from package 0x" << std::hex << owningUid << L" \"" << owningObj->GetPackageName() << L"\"" << std::endl;
iProblemFiles.append(os.str());
iError = ECLIPSING_VIOLATION;
continue;
@@ -1374,22 +1235,18 @@
Sids sids;
GetSidsFromInstallable(aFiles, sids);
- #ifndef __TOOLS2_LINUX__
const std::wstring privatePath = L":\\private\\";
const std::wstring sysPath = L":\\sys\\";
const std::wstring sysBinPath = L":\\sys\\bin\\";
const std::wstring resourcePath = L":\\resource\\";
- #else
- const std::wstring privatePath = L":/private/";
- const std::wstring sysPath = L":/sys/";
- const std::wstring sysBinPath = L":/sys/bin/";
- const std::wstring resourcePath = L":/resource/";
- #endif
const std::wstring exeType = L".exe";
int num_of_files = aFiles.size();
TUint32 pkgUid = aFile.GetPackageUid();
TUint32 installType = aFile.GetInstallType();
+ std::list<std::wstring> stubFileEntries;
+
+ iRegistry.GetStubFileEntries(pkgUid, stubFileEntries);
// if a base package exists, check to see if it chains back to a ROM stub. If so, populate
// iEclipsableRomFiles with the files owned by the ROM stub. Only ROM files can be eclipsed.
@@ -1408,7 +1265,7 @@
const CSISFileDescription* sisDescription = file->FileDescription();
// file to be installed
- std::wstring target( file->GetTarget().c_str() );
+ std::wstring target( file->GetTarget() );
if (sisDescription->Operation() == CSISFileDescription::EOpText)
break;
@@ -1419,7 +1276,7 @@
{
// eclipsing problem
std::wostringstream os;
- os << L"FN file \"" << target.c_str() << L"\" can not remove a file from \\sys or \\resource" << std::endl;
+ os << L"FN file \"" << target << L"\" can not remove a file from \\sys or \\resource" << std::endl;
iProblemFiles.append(os.str());
iError = DATA_CAGE_VIOLATION;
continue;
@@ -1427,7 +1284,7 @@
}
else
{
- std::wstring realTarget(file->GetLocalTarget().c_str());
+ std::wstring realTarget(file->GetLocalTarget());
std::wstring romTarget(target);
romTarget[0] = KRomDriveLetter;
@@ -1439,22 +1296,12 @@
{
// eclipsing problem
std::wostringstream os;
- os << target.c_str() << L" eclipses file from ROM" << std::endl;
+ os << target << L" eclipses file from ROM" << std::endl;
iProblemFiles.append(os.str());
iError = ECLIPSING_VIOLATION;
continue;
}
}
-
- if(aInstallSISFile.iGenerateRomStub)
- {
- bool isOverwrite = FileExists(file->GetLocalTarget());
- // To check if We are incorrectly overwriting the file present.
- if (isOverwrite)
- {
- HandleRomFileOverwriting(aFile, target);
- }
- }
// additional platsec checks
if (target.find(privatePath) != std::wstring::npos)
@@ -1501,17 +1348,14 @@
const int KUidStringLength = 8;
std::wstring importPath = privatePath;
- #ifndef __TOOLS2_LINUX__
+
importPath.append( uidStr.str() + L"\\import" );
- #else
- importPath.append( uidStr.str() + L"/import" );
- #endif
if ((target.find(importPath,0) == std::wstring::npos) && !suFlag)
{
// only SA with RU + SU and PU with RU + SU flag can override other private directory
std::wostringstream os;
- os << target.c_str() << L" cannot be written to a private directory which "
+ os << target << L" cannot be written to a private directory which "
<< L"does not belong to any exe in this package" << std::endl;
iProblemFiles.append(os.str());
iError = DATA_CAGE_VIOLATION;
@@ -1581,8 +1425,8 @@
{
std::wostringstream os;
- os << L"The existing file " << owningSidFile.c_str() << L" already has the SID 0x" << std::hex << sid
- << std::dec << L", cannot install " << target.c_str() << std::endl;
+ os << L"The existing file " << owningSidFile << L" already has the SID 0x" << std::hex << sid
+ << std::dec << L", cannot install " << target << std::endl;
iProblemFiles.append(os.str());
iError = DUPLICATE_SID;
continue;
@@ -1606,7 +1450,7 @@
{
const CSISFileDescription* fD = *iter;
- std::wstring romStubTarget(fD->Target().GetString().c_str());
+ std::wstring romStubTarget(fD->Target().GetString());
if (StringUtils::WildcardCompare(romStubTarget,romFileWithDuplicateSid))
{
@@ -1627,7 +1471,7 @@
std::wostringstream os;
os << L"A ROM file already has the SID 0x" << std::hex << file->Sid()
- << std::dec << L", cannot install " << target.c_str() << std::endl;
+ << std::dec << L", cannot install " << target << std::endl;
iProblemFiles.append(os.str());
iError = DUPLICATE_SID;
continue;
@@ -1637,7 +1481,7 @@
else if (realTarget.find(sysBinPath) != std::wstring::npos)
{
std::wostringstream os;
- os << target.c_str() << L" cannot be installed to a data caged area" << std::endl;
+ os << target << L" cannot be installed to a data caged area" << std::endl;
iProblemFiles.append(os.str());
iError = DATA_CAGE_VIOLATION;
continue;
@@ -1653,8 +1497,8 @@
if (!iProblemFiles.empty())
{
- std::string x = wstring2string(iProblemFiles);
- throw InvalidSis("", x, iError);
+ std::string x;
+ throw InvalidSis("", Ucs2ToUtf8(iProblemFiles,x), iError);
}
}
@@ -1688,54 +1532,12 @@
}
-void Installer::CreateRomStubSisFile(const InstallSISFile& aInstallSISFile, SisFile& aSis)
-{
-
- int targetDrive = aInstallSISFile.iTargetDrive;
- std::wstring drivePath = iConfigManager.GetLocalDrivePath(targetDrive);
-
- #ifndef __TOOLS2_LINUX__
- drivePath.append(L"\\system\\install\\");
- #else
- drivePath.append(L"/system/install/");
- #endif
-
- // build Rom Stub Pathname
- if ( !MakeDir( drivePath ) )
- {
- throw InterpretSisError(L"Directory Creation Error - "+drivePath, DIRECTORY_CREATION_ERROR);
- }
-
- size_t found;
- found=aInstallSISFile.iFileName.find_last_of(L"/\\");
- std::wstring sisFile = aInstallSISFile.iFileName.substr(found+1);
- std::wstring sisFilename = sisFile.substr(0,sisFile.length()-4);
- drivePath.append(sisFilename);
- drivePath.append(L"_");
- std::wstringstream sUid;
- sUid << std::hex << aSis.GetPackageUid();
- drivePath.append(sUid.str());
- drivePath.append(L".sis");
-
- // Display the target SIS file. Format the stub SIS file string so it displays correctly.
- std::wstring ctrlDrive(L"z:");
- std::wstring ctrlTarget = drivePath.substr(iConfigManager.GetLocalDrivePath(targetDrive).length(),drivePath.length());
- ctrlDrive.append(ctrlTarget);
-
- LINFO(L"\tCreating ROM stub: " << ctrlDrive);
- aSis.MakeSISRomStub(drivePath);
- // If the NR flag is set, change the file attribute to RO
-}
-
void Installer::CreateStubSisFile(const InstallSISFile& aInstallSISFile, SisFile& aSis)
{
int targetDrive = aInstallSISFile.iTargetDrive;
std::wstring drivePath = iConfigManager.GetLocalDrivePath(targetDrive);
- #ifndef __TOOLS2_LINUX__
+
drivePath.append(L"\\private\\");
- #else
- drivePath.append(L"/private/");
- #endif
// build SwiDaemon Pathname
std::wstring ctrl = StringUtils::MakePathFromSID(drivePath, KSwiDaemonUid);
@@ -1750,6 +1552,7 @@
ctrl.append(s.str());
+
switch(aSis.GetInstallType())
{
case CSISInfo::EInstInstallation:
--- a/secureswitools/swisistools/source/interpretsislib/installer.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/installer.h Wed Oct 13 14:40:19 2010 +0300
@@ -66,24 +66,22 @@
void SanitiseSISFileAttributes(const InstallSISFile& aInstallSISFile);
- void UninstallPkg(const SisFile& aSis, const bool aGenerateRomStub); // Uninstall the same package (if found)
+ void UninstallPkg(const SisFile& aSis); // Uninstall the same package (if found)
// prior to installation
bool DependenciesOk(const SisFile& aFile); // Check to see if the sis file
// meets it's dependencies
- bool IsValidUpgrade(const SisFile& aFile, bool aSUFlag, bool aNonRemovable, bool aGenerateRomStub); // Check to see if this is a valid upgrade
+ bool IsValidUpgrade(const SisFile& aFile, bool aSUFlag, bool aNonRemovable); // Check to see if this is a valid upgrade
// to the existing packages
- void ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags,
- bool aRUFlag, bool aNonRemovable, bool aGenerateRomStub);
+ void ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags, bool aRUFlag, bool aNonRemovable);
void InitializeRegistryDetails ( const TUint32 aPckgUid, bool& aIsBaseRemovable, bool& aInRom, bool& aIsPreInstalled, TUint32& aUid, std::wstring& aPackageName );
bool GetInstallableFiles(
- const SisFile& aFile, InstallableFiles& aList, ExpressionEvaluator& aEvaluator,
- int aInstallingDrive, const int aSystemDrive, const bool aGenerateRomStub);
+ const SisFile& aFile, InstallableFiles& aList, ExpressionEvaluator& aEvaluator, int aInstallingDrive);
- void InstallFiles(const InstallableFiles& aList, int aInstallDrive, const bool aGenerateRomStub); // Retrieves the list of files
+ void InstallFiles(const InstallableFiles& aList, const int aInstallDrive); // Retrieves the list of files
// to install from the sis file
static void Install(const InstallableFile& aFile);
@@ -108,19 +106,12 @@
void CreateStubSisFile(const InstallSISFile& aInstallSISFile, SisFile& aSis);
- void CreateRomStubSisFile(const InstallSISFile& aInstallSISFile, SisFile& aSis);
-
// Eclipsing check methods
void PrepareEclipsableFilesList(const SisFile& aSis);
bool IsValidEclipsingUpgrade(const SisFile& aSis, const SisRegistryObject& registryEntry);
bool ValidEclipse(const SisFile& aFile, const std::wstring& target, const InstallableFile& aInstallableFile, bool aSUFlag);
void HandleFileOverwriting(const SisFile& aFile, const std::wstring& target, bool aSUFlag);
- void HandleRomFileOverwriting(const SisFile& aFile, const std::wstring& target);
- #ifndef __TOOLS2_LINUX__
bool IsEclipsable(std::wstring& aRomFile, bool aSUFlag);
- #else
- bool IsEclipsable(std::wstring& aRomFile, bool aSUFlag, const std::wstring& aDrivePath);
- #endif
void FilterNonBlockingFilesOfFilename(const SisFile& aFile, const std::wstring& target);
void WarnEclipseOverWrite(const SisFile& aFile);
--- a/secureswitools/swisistools/source/interpretsislib/interpretsis.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/interpretsis.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -90,7 +90,7 @@
{
if (!dependenciesIt->second.empty())
{
- LERROR(L"Package " << dependenciesIt->first.c_str() << L" requires:");
+ LERROR(L"Package " << dependenciesIt->first << L" requires:");
for (std::vector<SisRegistryDependency>::const_iterator dependantsIt = dependenciesIt->second.begin();
dependantsIt != dependenciesIt->second.end() ;
++dependantsIt)
@@ -114,8 +114,4 @@
}
}
-const SisRegistry* CInterpretSIS::GetSisRegistry() const
- {
- return iSisRegistry;
- }
// End of File
--- a/secureswitools/swisistools/source/interpretsislib/interpretsis.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/interpretsis.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -62,8 +62,6 @@
* Un-install installed applications specified while creating this class.
*/
void Uninstall();
-
- const SisRegistry* GetSisRegistry() const;
private:
void ConstructL();
--- a/secureswitools/swisistools/source/interpretsislib/is_utils.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/is_utils.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -75,63 +75,20 @@
}
-void ConvertToPlatformSpecificPath( TUint16* aIn, TUint32 len )
-{
- while( len-- > 0 )
- {
- if( *aIn == '\\' )
- {
- *aIn = '/';
- }
- aIn++;
- }
-}
-
-#ifdef __TOOLS2_LINUX__
-void ConvertToForwardSlash( std::wstring& aIn)
-{
- std::wstring::size_type idx = 0;
-
- while( (idx = aIn.find(L"\\", idx)) != std::wstring::npos)
- {
- aIn.replace( idx, 1, KDirectorySeparator );
- }
-}
-#endif
-
-
void ConvertToLocalPath( std::wstring& aIn, const std::wstring& aDrivePath )
{
std::wstring::size_type idx = 0;
-
- #ifndef __TOOLS2_LINUX__
- while( (idx = aIn.find(L"//", idx)) != std::wstring::npos)
+ while( (idx = aIn.find(L"\\\\", idx)) != std::wstring::npos)
{
- aIn.replace( idx, 2, KDoubleSlashPathPrefix );
+ aIn.replace( idx, 4, KDirectorySeparator );
}
-
+ //
idx = 0;
-
while( (idx = aIn.find(L"/", idx)) != std::wstring::npos)
{
aIn.replace( idx, 1, KDirectorySeparator );
}
- #else
-
- idx = 0;
-
- while( (idx = aIn.find(L"\\\\", idx)) != std::wstring::npos)
- {
- aIn.replace( idx, 2, KDoubleSlashPathPrefix );
- }
-
- idx = 0;
-
- while( (idx = aIn.find(L"\\", idx)) != std::wstring::npos)
- {
- aIn.replace( idx, 1, KDirectorySeparator );
- }
- #endif
+
// If the first two characters represent a drive specification
// then replace them entirely with the value from the
// PC's path ('aDrivePath').
@@ -141,14 +98,15 @@
const bool startsWithDrive = StringUtils::StartsWithDrive( aIn );
if ( startsWithDrive )
{
- aIn.replace(aIn.begin(), aIn.begin()+2, aDrivePath.c_str());
+ aIn.replace(aIn.begin(), aIn.begin()+2, aDrivePath);
}
else
{
- aIn.insert( 0, aDrivePath.c_str() );
+ aIn.insert( 0, aDrivePath );
}
}
+
struct TPair {
TUint16 first;
TUint16 second;
@@ -1050,22 +1008,10 @@
}
int FoldedCompare(const std::wstring& aLeft, const std::wstring& aRight)
{
- std::wstring iLeft=aLeft.c_str();
- std::wstring iRight=aRight.c_str();
-
-#ifdef __TOOLS2_LINUX__
- std::wstring::size_type idx = 0;
-
- while( (idx = iLeft.find(L"\\", idx)) != std::wstring::npos)
- {
- iLeft.replace( idx, 1, KDirectorySeparator );
- }
-#endif
-
- std::wstring::const_iterator l = iLeft.begin();
- std::wstring::const_iterator r = iRight.begin();
- std::wstring::const_iterator le = iLeft.end();
- std::wstring::const_iterator re = iRight.end();
+ std::wstring::const_iterator l = aLeft.begin();
+ std::wstring::const_iterator r = aRight.begin();
+ std::wstring::const_iterator le = aLeft.end();
+ std::wstring::const_iterator re = aRight.end();
while (l != le && r != re)
{
@@ -1079,7 +1025,7 @@
++r;
}
- return iLeft.size() - iRight.size();
+ return aLeft.size() - aRight.size();
}
int ReadSecurityInfo( SBinarySecurityInfo& aInfo, const std::wstring aFileName )
@@ -1099,12 +1045,7 @@
throw "Failed in redirection operation";
}
-#ifndef __LINUX__
nulStdErr = fopen("NUL:" , "w");
-#else
- nulStdErr = fopen("/dev/null", "w");
-#endif
-
if (!nulStdErr)
{
throw "Failed in redirection operation";
@@ -1146,25 +1087,3 @@
} // end for i
}
-const std::wstring Utils::IntegerToWideString(int aInt)
- {
- std::wstringstream wstream;
- wstream << aInt;
- return wstream.str();
- }
-
-std::wstring Utils::Int64ToWideString(TInt64 aInt)
- {
- std::wstringstream strInt64;
- strInt64 << aInt;
- return strInt64.str();
- }
-
-int Utils::WideStringToInteger(const std::wstring& aWideString)
- {
- unsigned long int value=0;
- std::wstringstream str(aWideString);
- str >> value;
- return value;
- }
-
--- a/secureswitools/swisistools/source/interpretsislib/is_utils.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/is_utils.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -75,10 +75,6 @@
int GetStat(const std::wstring& aFile, struct stat*);
- void ConvertToPlatformSpecificPath( TUint16* aIn, TUint32 len );
- #ifdef __TOOLS2_LINUX__
- void ConvertToForwardSlash( std::wstring& aIn);
- #endif
void ConvertToLocalPath(
std::wstring& aIn,
const std::wstring& aDrivePath);
@@ -144,6 +140,9 @@
dp38, dp39, dp40, dp41, dp42, dp43, dp44, dp45};
void GetEquivalentLanguageList(CSISLanguage::TLanguage aLang, TLanguagePath& aEquivalents);
+ std::string wstring2string (const std::wstring& aWide);
+
+ std::wstring string2wstring (const std::string& aNarrow);
const std::wstring IntegerToWideString(int aInt);
--- a/secureswitools/swisistools/source/interpretsislib/parameterlist.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/parameterlist.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -45,31 +45,27 @@
* Default constructor.
*/
InstallSISFile() : iFileName(L""), iTargetDrive(L'$'), iGenerateStub(false),
- iNonRemovable(false),iReadOnly(false), iNotRegister(false),
- iSUFlag(false), iGenerateRomStub(false) {}
+ iNonRemovable(false),iReadOnly(false), iNotRegister(false), iSUFlag(false) {}
/**
* Constructor
*/
InstallSISFile(std::wstring aName, int aDrive, bool aSUFlag)
: iFileName(aName), iTargetDrive(aDrive), iGenerateStub(false),
- iNonRemovable(false),iReadOnly(false), iNotRegister(false),
- iSUFlag(aSUFlag), iGenerateRomStub(false) {}
+ iNonRemovable(false),iReadOnly(false), iNotRegister(false), iSUFlag(aSUFlag) {}
/**
* Constructor
*/
InstallSISFile(std::wstring aName, int aDrive, bool aGenerateStub, bool aNonRemovable,
- bool aReadOnly, bool aNotRegister, bool aSUFlag, bool aGenerateRomStub)
+ bool aReadOnly, bool aNotRegister, bool aSUFlag)
: iFileName(aName), iTargetDrive(aDrive), iGenerateStub(aGenerateStub),
- iNonRemovable(aNonRemovable), iReadOnly(aReadOnly), iNotRegister(aNotRegister),
- iSUFlag(aSUFlag), iGenerateRomStub(aGenerateRomStub) {}
+ iNonRemovable(aNonRemovable), iReadOnly(aReadOnly), iNotRegister(aNotRegister), iSUFlag(aSUFlag) {}
public:
std::wstring iFileName; // SIS file name
int iTargetDrive; // Target drive
bool iGenerateStub; // Whether to generate stub sis file for this sis or not.
- bool iGenerateRomStub; // Whether to generate stub sis file for ROM Install.
bool iNonRemovable; // Whether this is a non-removable SIS or not.
bool iReadOnly; // Whether this is a Readonly SIS or not.
bool iNotRegister; // Whether to register the sis or not.
@@ -120,9 +116,7 @@
EFlagsSysDriveSet = 0x0010,
EFlagsStubDirectorySet = 0x0020,
EFlagsConfigIniSet = 0x0040,
- EFlagsDisableZDriveChecksSet= 0x0080,
- EFlagsRomInstallSet = 0x0100,
- EFlagsExtDriveSet = 0x0200,
+ EFlagsDisableZDriveChecksSet= 0x0080
};
public: // Constructors & destructor
--- a/secureswitools/swisistools/source/interpretsislib/rommanager.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/rommanager.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -29,13 +29,8 @@
#include "is_utils.h"
// String constants
-#ifndef __TOOLS2_LINUX__
const std::wstring KRomManagerSysBinPath = L"z:\\sys\\bin\\";
const std::string KRomManagerRomDrive = "Z:\\";
-#else
-const std::wstring KRomManagerSysBinPath = L"z:/sys/bin/";
-const std::string KRomManagerRomDrive = "Z:/";
-#endif
const std::string KRomManagerRomLogProcessingFile = "Processing file ";
const std::string KRomManagerRomLogReadingResource = "Reading resource ";
const std::string KRomManagerRomLogReadingResource2 = " to rom linear address";
@@ -151,7 +146,7 @@
{
for( std::list<std::wstring>::const_iterator it = aLogFileNames.begin() ; it != aLogFileNames.end(); it++ )
{
- std::string narrowLogFileName = wstring2string( *it );
+ std::string narrowLogFileName = Ucs2ToUtf8( *it );
std::string narrowUpperCaseLogFileName = StringUtils::ToUpper( narrowLogFileName );
// Get the base name
@@ -193,7 +188,7 @@
// Get filename & convert it to uppercase, since our map key is
// also in upper case form.
- std::string narrowFileName = wstring2string( aFileName );
+ std::string narrowFileName = Ucs2ToUtf8( aFileName );
narrowFileName = StringUtils::ToUpper( narrowFileName );
// Do we have a corresponding entry?
@@ -215,7 +210,7 @@
for ( ; curr != end ; ++curr)
{
- std::wstring romFile = string2wstring(curr->first);
+ std::wstring romFile = Utf8ToUcs2(curr->first);
if (StringUtils::WildcardCompare(searchNameWild,romFile))
{
aAdornedFileNamesFound.push_back(romFile);
@@ -238,7 +233,7 @@
TUint32 romSid = romEntry->SecurityInfo().iSecureId;
if (romSid != 0 && romSid == aSid)
{
- aFile = string2wstring(romEntry->RomFileName());
+ aFile = Utf8ToUcs2(romEntry->RomFileName());
return true;
}
}
@@ -253,7 +248,7 @@
// Get filename & convert it to uppercase, since our map key is
// also in upper case form.
- std::string narrowFileName = wstring2string( aFileName );
+ std::string narrowFileName = Ucs2ToUtf8( aFileName );
narrowFileName = StringUtils::ToUpper( narrowFileName );
// Do we have a corresponding entry?
@@ -274,7 +269,7 @@
void RomManagerLogFiles::ReadObyFile( const std::string& aFileName )
{
- std::wstring fileName = string2wstring( aFileName );
+ std::wstring fileName = Utf8ToUcs2( aFileName );
if ( FileExists( fileName ) )
{
std::ifstream stream;
@@ -575,7 +570,7 @@
}
//
stream << std::endl;
- std::wstring finalMessage = string2wstring( stream.str() );
+ std::wstring finalMessage = Utf8ToUcs2( stream.str() );
//
LERROR( finalMessage );
}
--- a/secureswitools/swisistools/source/interpretsislib/serialiser.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/serialiser.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -26,7 +26,6 @@
#include "serialisable.h"
#include "ucmp.h"
#include "cardinality.h"
-#include "utf8.h"
/**
* @file SERIALISER.H
@@ -82,49 +81,15 @@
Serialiser& operator<<(std::wstring& val)
{
-
- std::wstring tempval = val.c_str();
-
-#ifdef __TOOLS2_LINUX__
- std::wstring::size_type idx = 0;
- while( (idx = tempval.find(L"/", idx)) != std::wstring::npos)
- {
- tempval.replace( idx, 1, L"\\" );
- }
-#endif
-
Cardinality card;
- TUint32 size = tempval.size() << 1;
-
-#ifdef __TOOLS2_LINUX__
- const wchar_t * source = tempval.c_str();
- unsigned short int* buffer = new unsigned short int[size];
-
- // Using a temp variable in place of buffer as ConvertUTF32toUTF16 modifies the source pointer passed.
- unsigned short int* temp = buffer;
-
- ConvertUTF32toUTF16(&source, tempval.c_str() + tempval.size(), &temp, temp + size, lenientConversion);
-
- // Appending NULL to the converted buffer.
- *temp = NULL;
-#endif
-
+ TUint32 size = val.size() << 1;
card.SetSize(size);
*this << card;
TUnicodeCompressor comp;
-
-#ifdef __TOOLS2_LINUX__
- TMemoryUnicodeSource src((TUint16*)buffer);
-#else
- TMemoryUnicodeSource src((TUint16*)tempval.c_str());
-#endif
-
+ TMemoryUnicodeSource src((TUint16*)val.c_str());
//The compressed unicode output could end up larger than the input, thus restricting the output to KMaxTInt.
- comp.CompressL(*this, src, KMaxTInt, tempval.size());
-#ifdef __TOOLS2_LINUX__
- delete[] buffer;
-#endif
+ comp.CompressL(*this, src, KMaxTInt, val.size());
return *this;
}
--- a/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -116,9 +116,7 @@
bool SisFile::GetInstallableFiles(InstallableFiles& aFiles,
ExpressionEvaluator& aEvaluator,
const std::wstring& aDrivePath,
- int aInstallingDrive,
- const int aSystemDrive,
- const bool aGenerateRomStub) const
+ int aInstallingDrive) const
{
bool success = true;
@@ -143,12 +141,12 @@
// aFiles will be filled with only file descriptions of files, empty file data
if (NULL != dataUnit && fileDes.Operation() != CSISFileDescription::EOpNull)
{
- aFiles.push_back(new InstallableFile(fileDes, new CSISFileData(dataUnit->FileData(fileDes.FileIndex())), aDrivePath, aInstallingDrive, aSystemDrive, aGenerateRomStub));
+ aFiles.push_back(new InstallableFile(fileDes, new CSISFileData(dataUnit->FileData(fileDes.FileIndex())), aDrivePath, aInstallingDrive));
}
else
{
// SIS files will not be present in PA stubs
- aFiles.push_back( new InstallableFile(fileDes,aDrivePath,aInstallingDrive, aSystemDrive, aGenerateRomStub));
+ aFiles.push_back( new InstallableFile(fileDes,aDrivePath,aInstallingDrive));
}
}
}
@@ -156,7 +154,7 @@
// process main controller - data unit 0
const CSISInstallBlock& installBlock = iContents.Controller().InstallBlock();
- ProcessInstallBlock(installBlock, aFiles, aEvaluator, aDrivePath, aInstallingDrive, aSystemDrive, aGenerateRomStub);
+ ProcessInstallBlock(installBlock, aFiles, aEvaluator, aDrivePath, aInstallingDrive);
return success;
}
@@ -206,8 +204,9 @@
if (failed)
{
- std::string x = wstring2string(this->GetPackageName());
- throw InvalidSis(x, error, SIS_NOT_SUPPORTED);
+ std::string x;
+ throw InvalidSis(Ucs2ToUtf8(this->GetPackageName(),x),
+ error, SIS_NOT_SUPPORTED);
}
}
@@ -232,39 +231,38 @@
const CSISFileDescription::TSISInstOption operationOptions = fD.OperationOptions();
if(operationOptions & CSISFileDescription::EInstFileRunOptionByMimeType)
{
- LWARN(L"File " << target.c_str() << L" contains \"Run-Using-MIME\" option that will be ignored.");
+ LWARN(L"File " << target << L" contains \"Run-Using-MIME\" option that will be ignored.");
}
if((operationOptions & CSISFileDescription::EInstFileRunOptionInstall) \
&& (operationOptions & CSISFileDescription::EInstFileRunOptionUninstall))
{
- LWARN(L"File " << target.c_str() << L" contains \"RUN-BOTH\" option that will be ignored.");
+ LWARN(L"File " << target << L" contains \"RUN-BOTH\" option that will be ignored.");
}
else if(operationOptions & CSISFileDescription::EInstFileRunOptionInstall)
{
- LWARN(L"File " << target.c_str() << L" contains \"Run-On-Install\" option that will be ignored.");
+ LWARN(L"File " << target << L" contains \"Run-On-Install\" option that will be ignored.");
}
else if(operationOptions & CSISFileDescription::EInstFileRunOptionUninstall)
{
- LWARN(L"File " << target.c_str() << L" contains \"Run-On-Uninstall\" option that will be ignored.");
+ LWARN(L"File " << target << L" contains \"Run-On-Uninstall\" option that will be ignored.");
}
if(operationOptions & CSISFileDescription::EInstFileRunOptionBeforeShutdown)
{
- LWARN(L"File " << target.c_str() << L" contains \"Run-Before-Shutdown\" option that will be ignored.");
+ LWARN(L"File " << target << L" contains \"Run-Before-Shutdown\" option that will be ignored.");
}
if(operationOptions & CSISFileDescription::EInstFileRunOptionAfterInstall)
{
- LWARN(L"File " << target.c_str() << L" contains \"Run-After-Install\" option that will be ignored.");
+ LWARN(L"File " << target << L" contains \"Run-After-Install\" option that will be ignored.");
}
- LWARN(L"File " << target.c_str() << L" contains \"File-Run\" option that will be ignored.");
+ LWARN(L"File " << target << L" contains \"File-Run\" option that will be ignored.");
}
success = true;
break;
case CSISFileDescription::EOpText:
- LWARN(L"File " << target.c_str() << L" contains \"Display Text\" option that will be ignored." );
+ LWARN(L"File " << target << L" contains \"Display Text\" option that will be ignored." );
success = true;
break;
case CSISFileDescription::EOpNull:
- case CSISFileDescription::EOpNone:
success = true;
break;
default:
@@ -278,7 +276,6 @@
break;
}
}
- return success;
}
@@ -373,9 +370,7 @@
void SisFile::GetInstallableFiles( InstallableFiles& aFiles,
const CSISInstallBlock& aInstallBlock,
const std::wstring& aDrivePath,
- int aInstallingDrive,
- const int aSystemDrive,
- const bool aGenerateRomStub) const
+ int aInstallingDrive) const
{
CSISInfo::TSISInstallationType installType = iContents.Controller().SISInfo().InstallationType();
const CSISDataUnit* dataUnit = NULL;
@@ -402,11 +397,11 @@
if (NULL != dataUnit && fileDes.Operation() != CSISFileDescription::EOpNull)
{
const CSISFileData& filedataref = dataUnit->FileData(fileDes.FileIndex());
- aFiles.push_back(new InstallableFile(fileDes, new CSISFileData(dataUnit->FileData(fileDes.FileIndex())), aDrivePath, aInstallingDrive, aSystemDrive, aGenerateRomStub));
+ aFiles.push_back(new InstallableFile(fileDes, new CSISFileData(dataUnit->FileData(fileDes.FileIndex())), aDrivePath, aInstallingDrive));
}
else // for stubs, no file data
{
- aFiles.push_back(new InstallableFile(fileDes, aDrivePath, aInstallingDrive, aSystemDrive, aGenerateRomStub));
+ aFiles.push_back(new InstallableFile(fileDes, aDrivePath, aInstallingDrive));
}
}
}
@@ -415,11 +410,9 @@
InstallableFiles& aFiles,
ExpressionEvaluator& aEvaluator,
const std::wstring& aDrivePath,
- int aInstallingDrive,
- const int aSystemDrive,
- const bool aGenerateRomStub) const
+ int aInstallingDrive) const
{
- GetInstallableFiles(aFiles, aInstallBlock, aDrivePath, aInstallingDrive, aSystemDrive,aGenerateRomStub);
+ GetInstallableFiles(aFiles, aInstallBlock, aDrivePath, aInstallingDrive);
const CSISArray<CSISIf, CSISFieldRoot::ESISIf>& ifs = aInstallBlock.Ifs();
for (int i = 0; i < ifs.size(); ++i)
@@ -428,9 +421,9 @@
if (ifBlock.WasteOfSpace())
{
+ std::string x;
std::string error = "corrupt SIS file";
- std::string x = wstring2string(this->GetPackageName());
- throw InvalidSis(x, error, INVALID_SIS);
+ throw InvalidSis(Ucs2ToUtf8(this->GetPackageName(),x), error, INVALID_SIS);
}
// Main expression
@@ -438,7 +431,7 @@
const bool processBlock = expressionResult.BoolValue();
if ( processBlock )
{
- ProcessInstallBlock(ifBlock.InstallBlock(), aFiles, aEvaluator, aDrivePath, aInstallingDrive, aSystemDrive, aGenerateRomStub);
+ ProcessInstallBlock(ifBlock.InstallBlock(), aFiles, aEvaluator, aDrivePath, aInstallingDrive);
continue;
}
@@ -448,11 +441,11 @@
const CSISElseIf& ifElseBlock = ifBlock.ElseIf(i) ;
if ( aEvaluator.Evaluate(ifElseBlock.Expression()).BoolValue())
{
- ProcessInstallBlock(ifElseBlock.InstallBlock(), aFiles, aEvaluator, aDrivePath, aInstallingDrive, aSystemDrive, aGenerateRomStub);
+ ProcessInstallBlock(ifElseBlock.InstallBlock(), aFiles, aEvaluator, aDrivePath, aInstallingDrive);
break; // Stop processing else if blocks
}
// Process the rest of the files
- GetInstallableFiles(aFiles, ifElseBlock.InstallBlock(), aDrivePath, aInstallingDrive, aSystemDrive, aGenerateRomStub);
+ GetInstallableFiles(aFiles, ifElseBlock.InstallBlock(), aDrivePath, aInstallingDrive);
}
}
}
@@ -507,10 +500,3 @@
contents.WriteSIS(aFileName);
}
-void SisFile::MakeSISRomStub(std::wstring& aFileName)
- {
- CSISContents contents = iContents;
- contents.SetStub(CSISContents::EStubROM);
- contents.WriteSIS(aFileName);
- }
-
--- a/secureswitools/swisistools/source/interpretsislib/sisfile.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisfile.h Wed Oct 13 14:40:19 2010 +0300
@@ -62,9 +62,7 @@
bool GetInstallableFiles(InstallableFiles& aFiles,
ExpressionEvaluator& aEvaluator,
const std::wstring& aCDrivePath,
- int aInstallingDrive,
- const int aSystemDrive,
- const bool aGenerateRomStub) const;
+ int aInstallingDrive) const;
void GetControllerData(const char*& aData, int& aLen) const;
@@ -97,8 +95,6 @@
void MakeSISStub(std::wstring& aFileName);
- void MakeSISRomStub(std::wstring& aFileName);
-
const CSISController& GetController();
void ProcessEmbeddedFileWarning(const CSISInstallBlock& aInstallBlock) const;
@@ -109,17 +105,13 @@
void GetInstallableFiles( InstallableFiles& aFiles,
const CSISInstallBlock& aInstallBlock,
const std::wstring& aDrivePath,
- int aInstallingDrive,
- const int aSystemDrive,
- const bool aGenerateRomStub) const;
+ int aInstallingDrive) const;
void ProcessInstallBlock(const CSISInstallBlock& aInstallBlock,
InstallableFiles& aFiles,
ExpressionEvaluator& aEvaluator,
const std::wstring& aCDrivePath,
- int aInstallingDrive,
- const int aSystemDrive,
- const bool aGenerateRomStub) const;
+ int aInstallingDrive) const;
private:
CSISContents iContents;
--- a/secureswitools/swisistools/source/interpretsislib/sisregistry.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistry.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -51,7 +51,6 @@
// SisX Library Includes
#include "sisfiledescription.h"
#include "sisstring.h"
-#include "utility.h"
// User Includes
#include "sisregistry.h"
@@ -65,15 +64,9 @@
#include "configmanager.h"
// Constants
-#ifndef __TOOLS2_LINUX__
const std::wstring SisRegistry::KPathToRegistry(L"\\sys\\install\\sisregistry/");
const std::wstring SisRegistry::KPathToRomStubs(L"\\system\\install\\");
const std::wstring SisRegistry::KPathToRegistryVersionMarker(L"\\system\\data\\");
-#else
-const std::wstring SisRegistry::KPathToRegistry(L"/sys/install/sisregistry/");
-const std::wstring SisRegistry::KPathToRomStubs(L"/system/install/");
-const std::wstring SisRegistry::KPathToRegistryVersionMarker(L"/system/data/");
-#endif
const std::wstring KRegistryEntry(L"00000000.reg");
const std::wstring KControllerEntry(L"00000000_0000.ctl");
const std::wstring KBackupLst(L"backup.lst");
@@ -88,13 +81,9 @@
const std::wstring SisRegistry::KRegistryV52(L"sisregistry_5.2.txt");
const std::wstring SisRegistry::KRegistryV53(L"sisregistry_5.3.txt");
const std::wstring SisRegistry::KRegistryV54(L"sisregistry_5.4.txt");
-#ifndef __TOOLS2_LINUX__
const std::wstring SisRegistry::KRomStubDir(L"z:\\system\\install\\");
const std::wstring SisRegistry::KRomRegistryVersionMarker(L"z:\\system\\data\\");
-#else
-const std::wstring SisRegistry::KRomStubDir(L"z:/system/install/");
-const std::wstring SisRegistry::KRomRegistryVersionMarker(L"z:/system/data/");
-#endif
+
const std::string SisRegistry::KRegistryV40string("4.0");
const std::string SisRegistry::KRegistryV50string("5.0");
const std::string SisRegistry::KRegistryV51string("5.1");
@@ -223,16 +212,13 @@
if(iParamList.RegistryVersionExists())
{
- if ( !iParamList.IsFlagSet(CParameterList::EFlagsRomInstallSet))
- {
- LINFO(L"Using SIS Registry v" << iParamList.RegistryMajorVersion() << L"." << iParamList.RegistryMinorVersion());
+ LINFO(L"Using SIS Registry v" << iParamList.RegistryMajorVersion() << L"." << iParamList.RegistryMinorVersion());
- std::wstring registryPathDriveC = KPathToRegistry;
+ std::wstring registryPathDriveC = KPathToRegistry;
- ConvertToLocalPath( registryPathDriveC, iParamList.SystemDrivePath() );
+ ConvertToLocalPath( registryPathDriveC, iParamList.SystemDrivePath() );
- ReadRegistry( registryPathDriveC );
- }
+ ReadRegistry( registryPathDriveC );
}
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
// this code is for handling the database registry implementation
@@ -255,10 +241,7 @@
}
#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
- if ( !iParamList.IsFlagSet(CParameterList::EFlagsRomInstallSet))
- {
- GenerateStubRegistry();
- }
+ GenerateStubRegistry();
}
@@ -562,9 +545,11 @@
while(it != iEntries.end())
{
- if (aUid == it->first && !wcscmp(aPackageName.c_str(), it->second->GetPackageName().c_str()) && aVendorName == it->second->GetVendorName() )
+ if (aUid == it->first &&
+ aPackageName == it->second->GetPackageName() &&
+ aVendorName == it->second->GetVendorName())
{
- LINFO(L"Removing package \"" << it->second->GetPackageName().c_str()
+ LINFO(L"Removing package \"" << it->second->GetPackageName()
<< L"\" prior to re-installation");
// Remove .reg file
@@ -602,7 +587,7 @@
return;
}
- LINFO(L"Removing package \"" << aPackageName.c_str() << L"\" prior to re-installation");
+ LINFO(L"Removing package \"" << aPackageName << L"\" prior to re-installation");
// Remove .ctl file
int drive = tolower(iDbHelper->GetSelectedDrive(componentId));
@@ -738,15 +723,8 @@
for ( ; curr != end ; ++curr)
{
std::wstring target((*curr)->GetTarget());
-
- if(target[0]==iParamList.SystemDriveLetter())
- {
- ConvertToLocalPath(target, iParamList.SystemDrivePath());
- }
- else
- {
- ConvertToLocalPath(target, aLocalPath);
- }
+
+ ConvertToLocalPath(target, aLocalPath);
RemoveFile(target);
RemoveHashForFile(target, iParamList.SystemDriveLetter(), iParamList.SystemDrivePath());
}
@@ -926,7 +904,7 @@
throw InterpretSisError(L"Directory Creation Error - "+regPath, DIRECTORY_CREATION_ERROR);
}
- LINFO(L"\tAdding ROM Stub: 0x" << std::hex << aSisRegistryObject->GetUid() << L" \"" << aSisRegistryObject->GetPackageName().c_str() << L"\"");
+ LINFO(L"\tAdding ROM Stub: 0x" << std::hex << aSisRegistryObject->GetUid() << L" \"" << aSisRegistryObject->GetPackageName() << L"\"");
if(iParamList.RegistryVersionExists())
{
@@ -970,11 +948,7 @@
{
return (aFileName.find(L'?') != std::wstring::npos ||
aFileName.find(L'*') != std::wstring::npos ||
- #ifndef __TOOLS2_LINUX__
aFileName[aFileName.length() - 1] == L'\\');
- #else
- aFileName[aFileName.length() - 1] == L'/');
- #endif
}
@@ -1056,11 +1030,7 @@
continue;
std::fstream input;
- #ifndef __TOOLS2_LINUX__
std::wstring filename(aPath + L"\\" + *c);
- #else
- std::wstring filename(aPath + L"/" + *c);
- #endif
OpenFile(filename.c_str(), input, std::fstream::in | std::fstream::binary);
@@ -1071,7 +1041,7 @@
if (!obj)
{
- throw std::runtime_error("Cannot create SisRegistryObject for " + wstring2string(filename));
+ throw std::runtime_error("Cannot create SisRegistryObject for " + Ucs2ToUtf8(filename));
}
Deserialiser des(input);
@@ -1114,6 +1084,7 @@
}
}
+
CSISController* SisRegistry::GetStubController(const TUint32 aUid)
{
if (iParamList.IsFlagSet(CParameterList::EFlagsDisableZDriveChecksSet))
@@ -1165,59 +1136,7 @@
}
-CSISController* SisRegistry::GetStubControllerUid(const std::wstring& aTarget)
- {
- if (iParamList.IsFlagSet(CParameterList::EFlagsDisableZDriveChecksSet))
- {
- return NULL;
- }
- // If the -z option were used to launch the tool, then read any
- // SIS stubs that we have gathered from the emulated Z:\System\Install
- // location.
- if (iParamList.IsFlagSet(CParameterList::EFlagsZDriveSet))
- {
- std::wstring stubPathZ = KPathToRomStubs;
- ConvertToLocalPath( stubPathZ, iParamList.RomDrivePath() );
-
- CSISController* sisController = GetStubControllerInDir( stubPathZ, aTarget );
-
- if (sisController)
- {
- return sisController;
- }
- }
-
- // If an additional SIS stub path were specified, we'll
- // also handle that here too.
- if (iParamList.IsFlagSet(CParameterList::EFlagsStubDirectorySet))
- {
- bool readCustomStubPath = true;
- std::wstring customStubPath = iParamList.SisStubPath();
-
- // But make sure we don't read the same directory twice!
- const bool haveRomDrive = iParamList.IsFlagSet(CParameterList::EFlagsZDriveSet);
- if ( haveRomDrive )
- {
- std::wstring stubPathZ = KPathToRomStubs;
- ConvertToLocalPath( stubPathZ, iParamList.RomDrivePath() );
- readCustomStubPath = ( stubPathZ != customStubPath );
- }
-
- if ( readCustomStubPath )
- {
- CSISController* sisController = GetStubControllerInDir( customStubPath, aTarget );
-
- if (sisController)
- {
- return sisController;
- }
- }
- }
- return NULL;
- }
-
-
-CSISController* SisRegistry::GetStubControllerInDir( const std::wstring& aDirectory, const std::wstring& aTarget)
+CSISController* SisRegistry::GetStubControllerInDir( const std::wstring& aDirectory, const TUint32 aUid)
{
// Make sure the directory name is properly terminated.
std::wstring basePath = StringUtils::EnsureDirectoryTerminated( aDirectory );
@@ -1244,66 +1163,9 @@
if (!sisController)
continue;
- const CSISInstallBlock& installBlock = sisController->InstallBlock();
- int fileCount = installBlock.FileCount();
-
- for (int i = 0; i < fileCount; ++i)
- {
- std::wstring file(installBlock.FileDescription(i).Target().GetString());
- if(file[0]!=L'z')
- {
- file[0]=L'z';
- }
- file = StringUtils::ToLower(file);
- aTarget = StringUtils::ToLower(aTarget);
- #ifdef __TOOLS2_LINUX__
- ConvertToForwardSlash(file);
- #endif
-
- if (!wcscmp(file.c_str(), aTarget.c_str()))
- {
- return sisController;
- }
- }
- delete sisController;
- }
-
- return NULL;
-}
-
-CSISController* SisRegistry::GetStubControllerInDir( const std::wstring& aDirectory, const TUint32 aUid)
-{
- // Make sure the directory name is properly terminated.
- std::wstring basePath = StringUtils::EnsureDirectoryTerminated( aDirectory );
-
- std::list<std::wstring> stubDirs;
- GetDirContents( basePath, stubDirs );
-
- std::list<std::wstring>::iterator curr;
- for (curr = stubDirs.begin(); curr != stubDirs.end() ; ++curr)
- {
- std::wstring stubPath ( basePath + *curr );
-
- int dotIndex = stubPath.rfind(L".");
- if(dotIndex == std::wstring::npos)
- continue;
-
- std::wstring extOfString = stubPath.substr(dotIndex+1);
-
- std::wstring extOfStringUpper = StringUtils::ToUpper(extOfString);
- if (extOfStringUpper != L"SIS" && extOfStringUpper != L"SISX")
- continue;
-
- _TCHAR* fileName = const_cast<_TCHAR *>(stubPath.c_str());
- CSISController* sisController = ReadStubController( fileName );
-
- if (!sisController)
- continue;
-
if (sisController->UID1() == aUid)
{
- SetRomStubFile(fileName);
return sisController;
}
delete sisController;
@@ -1379,7 +1241,7 @@
msg.append(L" does not have any SisRegistry file");
- throw std::runtime_error( wstring2string(msg) );
+ throw std::runtime_error( Ucs2ToUtf8(msg) );
}
aObj.SetIndex( index );
@@ -1391,7 +1253,7 @@
msg.append(L" directory NOT found");
- throw std::runtime_error( wstring2string(msg) );
+ throw std::runtime_error( Ucs2ToUtf8(msg) );
}
}
}
@@ -1414,7 +1276,7 @@
msg.append(L" directory NOT found");
- throw std::runtime_error( wstring2string(msg) );
+ throw std::runtime_error( Ucs2ToUtf8(msg) );
}
}
}
@@ -1467,7 +1329,7 @@
msg.append(L" does not have any Sis Controller file");
- throw std::runtime_error( wstring2string(msg) );
+ throw std::runtime_error( Ucs2ToUtf8(msg) );
}
}
@@ -1546,17 +1408,6 @@
#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
return num;
}
-
-void SisRegistry::SetRomStubFile(const std::wstring& aRomStubFile)
-{
- iRomStubFile = aRomStubFile;
-}
-
-const std::wstring& SisRegistry::GetRomStubFile() const
-{
- return iRomStubFile;
-}
-
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
std::wstring SisRegistry::FormatVersionToString( const Version& aVersion )
@@ -1596,34 +1447,32 @@
void SisRegistry::UpdateInstallationInformation(XmlDetails::TScrPreProvisionDetail aScrPreProvisionDetail)
{
- CXmlGenerator xmlGenerator;
- char* tmpFileName = tmpnam(NULL);
+ CXmlGenerator xmlgenerator;
+ char* tmpFileName = tmpnam(NULL);
std::wstring filename(string2wstring(tmpFileName));
-
- int isRomApplication = 0;
- xmlGenerator.WritePreProvisionDetails(filename , aScrPreProvisionDetail, isRomApplication);
-
- #ifdef __LINUX__
- std::string executable = "scrtool";
- #else
+
+ xmlgenerator.WritePreProvisionDetails(filename , aScrPreProvisionDetail);
+
std::string executable = "scrtool.exe";
- #endif
-
std::string command;
command = executable + " -d " + GetDbPath() + " -p " + tmpFileName;
-
+
int error = system(command.c_str());
-
- int err = remove(tmpFileName);
- if(err != 0)
- LERROR(L"Temporary file removal failed.");
-
+
if(error != 0)
{
std::string err = "Scrtool failed to upload the database registry entry.";
LERROR(L"Scrtool failed to upload the database registry entry.");
throw InterpretSisError(err, DATABASE_UPDATE_FAILED);
}
+
+ error = remove(tmpFileName);
+
+ if(error != 0)
+ {
+ LERROR(L"Temporary file removal failed.");
+ }
+
}
std::string SisRegistry::GetDbPath()
@@ -1633,17 +1482,10 @@
iParamList.IsFlagSet(CParameterList::EFlagsDisableZDriveChecksSet)
)
{
- #ifndef __TOOLS2_LINUX__
return wstring2string(iParamList.SystemDrivePath()) + "\\sys\\install\\scr\\scr.db";
- #else
- return wstring2string(iParamList.SystemDrivePath()) + "/sys/install/scr/scr.db";
- #endif
}
- #ifndef __TOOLS2_LINUX__
+
return wstring2string(iParamList.RomDrivePath()) + "\\sys\\install\\scr\\provisioned\\scr.db";
- #else
- return wstring2string(iParamList.RomDrivePath()) + "/sys/install/scr/provisioned/scr.db";
- #endif
}
@@ -1977,8 +1819,8 @@
// The property is a concatenation of the algorithm id and the hash data
const std::string hashData = aHashContainer.GetData();
- std::string encodedHashData = Util::Base64Encode(hashData);
- std::wstring wideHashData = string2wstring(encodedHashData);
+ std::string encodedHashData = Util::Base64Encode(hashData);
+ std::wstring wideHashData = Utils::string2wstring(encodedHashData);
AddComponentProperty( aComponent, DbConstants::CompControllerHashData, wideHashData, aCount, true);
}
@@ -2172,7 +2014,7 @@
if(!aFileDescription->GetHash().GetData().empty())
{
std::string binHashData = Util::Base64Encode(aFileDescription->GetHash().GetData());
- std::wstring hashData = string2wstring(binHashData);
+ std::wstring hashData = Utils::string2wstring(binHashData);
AddFileProperty( aComponentFile, DbConstants::FileHashData, hashData, true);
}
}
--- a/secureswitools/swisistools/source/interpretsislib/sisregistry.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistry.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -81,8 +81,6 @@
void GenerateStubRegistry();
int GetAugmentationsNumber(TUint32 aUid);
CSISController* GetStubController(const TUint32 aUid);
- CSISController* GetStubControllerUid(const std::wstring& aTarget);
- const std::wstring& GetRomStubFile() const;
static const int KSisRegistryMajorVersion;
static const int KSisRegistryMinorVersion;
@@ -92,13 +90,11 @@
static const std::string KRegistryV52string;
static const std::string KRegistryV53string;
static const std::string KRegistryV54string;
- typedef std::multimap<TUint32, SisRegistryObject*> EntryMap;
private: // Internal methods
void ReadStubs( const std::wstring& aDirectory );
void ReadRegistry( const std::wstring& aRegistryBasePath );
CSISController* GetStubControllerInDir( const std::wstring& aDirectory, const TUint32 aUid);
- CSISController* GetStubControllerInDir( const std::wstring& aDirectory, const std::wstring& aTarget);
CSISController* ReadStubController( const wchar_t* aFilename );
void GenerateRegistryEntry(SisRegistryObject& aObj, const SisFile& aSis);
void ExtractRegistryFiles(const std::wstring& path);
@@ -108,13 +104,11 @@
std::wstring GetRegistryDir( const std::wstring& aDrivePath, TUint32 aUid ) const;
void GenerateRegFile(SisRegistryObject& aObj) const;
void GenerateCtlFile(SisRegistryObject& aObj, const SisFile& aSis) const;
- void SetRomStubFile(const std::wstring& aRomStubFile);
public:
TUint32 GetUid(TUint32 aSid) const;
TUint32 GetUid(const std::wstring& aSidFile) const;
bool GetInRom(TUint32 aUid) const;
- std::string GetDbPath();
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
const DbHelper* GetDbHelper() const;
#endif
@@ -129,6 +123,9 @@
private: // Friends
friend struct Contains;
+private: // Type definitions
+ typedef std::multimap<TUint32, SisRegistryObject*> EntryMap;
+
private: // Constants
static const std::wstring KPathToRegistry;
static const std::wstring KPathToRomStubs;
@@ -148,10 +145,10 @@
std::wstring iCDrive;
TInt iSystemDrive;
CParameterList& iParamList;
- RomManager& iRomManager;
- ConfigManager& iConfigManager;
- EntryMap iEntries;
- std::wstring iRomStubFile;
+ RomManager& iRomManager;
+ ConfigManager& iConfigManager;
+ EntryMap iEntries;
+
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
private:
@@ -263,6 +260,8 @@
void GenerateDbRegistryEntry(const SisRegistryObject& aSisRegistryObject, bool aOriginVerified);
+ std::string GetDbPath();
+
std::wstring GetGlobalId( TUint32 aUid , TInt aInstallType, std::wstring aPackageName);
void SetOriginVerification(XmlDetails::TScrPreProvisionDetail::TComponent& aComponent, bool aOriginVerified);
--- a/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -125,7 +125,8 @@
for( InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr )
{
InstallableFile* installableFile= *curr;
- FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget());
+ TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0);
+ FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, aTargetDrive, installableFile->GetTarget());
iFileDescriptions.push_back(f);
}
@@ -401,9 +402,9 @@
}
else
{
+ std::string x;
std::string error = "can not retrieve localized vendor name";
- std::string x = wstring2string((std::wstring)packageName);
- throw InvalidSis(x, error, INVALID_SIS);
+ throw InvalidSis(Ucs2ToUtf8((std::wstring)packageName,x), error, INVALID_SIS);
}
// Signed by SU cert
@@ -723,7 +724,7 @@
for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr )
{
InstallableFile* installableFile= *curr;
- TUint32 sid = installableFile->Sid();
+ TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0);
FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget());
iFileDescriptions.push_back(f);
@@ -744,7 +745,7 @@
for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr )
{
InstallableFile* installableFile= *curr;
- TUint32 sid = installableFile->Sid();
+ TUint32 sid = ((installableFile->IsExe())?(installableFile->Sid()):0);
FileDescription f = FileDescription(*installableFile->FileDescription(), sid,
iSelectedDrive, installableFile->GetTarget());
--- a/secureswitools/swisistools/source/interpretsislib/stringutils.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/stringutils.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -30,7 +30,6 @@
#include "is_utils.h"
#include "logger.h"
#include "utility_interface.h"
-#include "util.h"
// Constants
const int KInterpretSISExpectedSIDLength = 8;
@@ -52,29 +51,14 @@
// then the function will return 0
int ret = 0;
int pos = 0;
- #ifndef __TOOLS2_LINUX__
- if((pos = aPath.find(L"//", aIndex)) != std::wstring::npos)
+ if((pos = aPath.find(L"/", aIndex)) != std::wstring::npos)
{
- ret = 2;
+ ret = 1;
}
- #else
- if((pos = aPath.find(L"\\\\", aIndex)) != std::wstring::npos)
+ else if((pos = aPath.find(L"\\\\", aIndex)) != std::wstring::npos)
{
ret = 2;
}
- #endif
-
- #ifndef __TOOLS2_LINUX__
- else if((pos = aPath.find(L"/", aIndex)) != std::wstring::npos)
- {
- ret = 1;
- }
- #else
- else if((pos = aPath.find(L"\\", aIndex)) != std::wstring::npos)
- {
- ret = 1;
- }
- #endif
aIndex = pos;
return ret;
}
@@ -89,9 +73,7 @@
int len = ConvertMultiByteToWideChar(src, -1, NULL, 0);
buf = new wchar_t[len+1];
len = ConvertMultiByteToWideChar(src, -1, buf, len);
-
- ret = std::wstring( buf ,len);
-
+ ret = std::wstring( buf );
delete[] buf;
//
std::wstring::size_type idx = 0;
@@ -100,7 +82,7 @@
ret.replace(idx, len, KDirectorySeparator);
}
//
- return ret.c_str();
+ return ret;
}
@@ -162,14 +144,6 @@
return ret;
}
-std::wstring StringUtils::ToLower( const std::wstring& aString )
- {
- std::wstring ret( aString );
- std::transform( ret.begin(), ret.end(), ret.begin(), tolower );
-
- return ret;
- }
-
bool StringUtils::IsLastCharacter( const std::wstring& aString, wchar_t aChar )
{
bool isLast = false;
@@ -190,19 +164,15 @@
//
if ( aText.length() >= 3 )
{
- const std::string prefix = ToUpper( wstring2string( aText.substr( 0, 3 ) ) );
+ const std::string prefix = ToUpper( Ucs2ToUtf8( aText.substr( 0, 3 ) ) );
//
const char drive = prefix[ 0 ];
const char colon = prefix[ 1 ];
const char backslash = prefix[ 2 ];
//
- #ifndef __TOOLS2_LINUX__
if ( colon == ':' && backslash == '\\' )
- #else
- if ( colon == ':' && (backslash == '/' || backslash == '\\'))
- #endif
{
- startsWithDrive = ( drive >= 'A' && drive <= 'Z' ) || (drive == '!') || (drive == '$') ;
+ startsWithDrive = ( drive >= 'A' && drive <= 'Z' ) || (drive == '!') ;
}
}
//
@@ -300,29 +270,6 @@
*/
bool StringUtils::WildcardCompare(const std::wstring& aWildCardFileName, const std::wstring& aFileName)
{
- #ifdef __TOOLS2_LINUX__
- // In case the incoming data is a DB entry then it will be having windows
- // specific paths due to the consistency of DB contents across WINDOWS
- // and LINUX. So, we need to convert them to LINUX paths and then compare.
-
- std::wstring::size_type idx = 0;
-
- while( (idx = aWildCardFileName.find(L"\\", idx)) != std::wstring::npos)
- {
- aWildCardFileName.replace( idx, 1, L"/" );
- }
-
- idx = 0;
-
- while( (idx = aFileName.find(L"\\", idx)) != std::wstring::npos)
- {
- aFileName.replace( idx, 1, L"/" );
- }
- #endif
-
- aWildCardFileName = StringUtils::ToLower(aWildCardFileName);
- aFileName = StringUtils::ToLower(aFileName);
-
std::wstring::const_iterator wildCurr = aWildCardFileName.begin();
std::wstring::const_iterator wildEnd = aWildCardFileName.end();
@@ -410,19 +357,7 @@
*/
std::wstring StringUtils::NameAndExt( const std::wstring& aFile )
{
-#ifndef __TOOLS2_LINUX__
int pos = aFile.find_last_of(L"\\");
-#else
- // We should also check for backward slash since the caller could be
- // passing a string containing a windows-specific paths within LINUX.
- //
- // One instance being - an SCR database entry under LINUX, which has
- // the windows specific paths of the installed files to maintain
- // consistency across WINDOWS and LINUX platforms.
-
- int pos = aFile.find_last_of(L"/");
- pos = pos == std::wstring::npos ? aFile.find_last_of(L"\\") : pos;
-#endif
if (pos == std::wstring::npos)
{
return L"";
@@ -447,11 +382,7 @@
*/
std::wstring StringUtils::DriveAndPath( const std::wstring& aFile )
{
-#ifndef __TOOLS2_LINUX__
- int pos = aFile.find_last_of(L"\\");
-#else
- int pos = aFile.find_last_of(L"/");
-#endif
+ int pos = aFile.find_last_of(L"\\");
if (pos == std::wstring::npos)
{
return L"";
@@ -474,13 +405,8 @@
*/
std::wstring StringUtils::Path( const std::wstring& aFile )
{
-#ifndef __TOOLS2_LINUX__
- int firstPos = aFile.find_first_of(L"\\");
- int lastPos = aFile.find_last_of(L"\\");
-#else
- int firstPos = aFile.find_first_of(L"/");
- int lastPos = aFile.find_last_of(L"/");
-#endif
+ int firstPos = aFile.find_first_of(L"\\");
+ int lastPos = aFile.find_last_of(L"\\");
if (lastPos >= firstPos)
{
@@ -502,12 +428,7 @@
*/
std::wstring StringUtils::Name( const std::wstring& aFile )
{
-#ifndef __TOOLS2_LINUX__
int startPos = aFile.find_last_of(L"\\");
-#else
- int startPos = aFile.find_last_of(L"/");
-#endif
-
int endPos = aFile.find_last_of(L".");
if (endPos > startPos)
--- a/secureswitools/swisistools/source/interpretsislib/stringutils.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/stringutils.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -35,17 +35,7 @@
#include "symbiantypes.h"
// Constants
-#ifndef __TOOLS2_LINUX__
const std::wstring KDirectorySeparator( L"\\" );
-const std::wstring KDoubleSlashPathPrefix( L"\\\\" );
-const std::string KDirectorySeparatorString( "\\" );
-const std::string KDoubleSlashPathPrefixString( "\\\\" );
-#else
-const std::wstring KDirectorySeparator( L"/" );
-const std::wstring KDoubleSlashPathPrefix( L"//" );
-const std::string KDirectorySeparatorString( "/" );
-const std::string KDoubleSlashPathPrefixString( "//" );
-#endif
class StringUtils
{
@@ -57,7 +47,6 @@
static std::string ToUpper( const std::string& aString );
static std::wstring ToUpper( const std::wstring& aString );
static std::string ToLower( const std::string& aString );
- static std::wstring ToLower( const std::wstring& aString );
static bool IsLastCharacter( const std::wstring& aString, wchar_t aChar );
static bool StartsWithDrive( const std::wstring& aText );
static std::wstring MakePathFromSID( const std::wstring& aBasePath, TUint32 aSID );
--- a/secureswitools/swisistools/source/interpretsislib/utils_posix.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/utils_posix.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -22,17 +22,14 @@
#include<sstream>
#include"utility_interface.h"
-#include"util.h"
bool FileExists(const std::wstring& aFile)
{
- struct stat x;
- int err = GetStat(aFile,&x );
- return err == 0;
+ return true;
}
bool RemoveFile(const std::wstring& aFile)
{
- return _wunlink(aFile.c_str()) == 0;
+ return true;
}
bool CreateFile(const std::wstring& aFile)
{
@@ -41,16 +38,16 @@
int GetStat(const std::wstring& aFile, struct stat* s)
{
- std::string str = wstring2string(aFile);
- return stat(str.c_str(), s);
+ std::string str;
+ return stat(Ucs2ToUtf8(aFile, str).c_str(), s);
}
void GetDirContents(const std::wstring& path,
std::list<std::wstring>& contents)
{
- std::string utfString = wstring2string(path);
- DIR* currDir = opendir(utfString.c_str());
+ std::string utfString;
+ DIR* currDir = opendir(Ucs2ToUtf8(path, utfString).c_str());
while (currDir)
{
@@ -62,8 +59,8 @@
}
else
{
- std::wstring ucsString = string2wstring(currElem->d_name);
- contents.push_back(ucsString);
+ std::wstring ucsString;
+ contents.push_back(Utf8ToUcs2(currElem->d_name, ucsString));
}
}
}
@@ -114,22 +111,14 @@
}
else
{// Skip creation of root directory
- #ifndef __TOOLS2_LINUX__
index = aDir.find(L'\\', index);
- #else
- index = aDir.find(L'/', index);
- #endif
}
do
{
index += 1;
// Try to make each directory in the path. If ERR_ALREADY_EXISTS is returned
// then this is okay. Other errors are fatal.
- #ifndef __TOOLS2_LINUX__
index = aDir.find(L'\\', index);
- #else
- index = aDir.find(L'/', index);
- #endif
std::wstring dir = aDir.substr( 0, index );
if(dir == L".")
{
@@ -151,8 +140,8 @@
bool OpenFile(const std::wstring& aFile, std::fstream& aStream,
std::ios_base::open_mode aMode)
{
- std::string s = wstring2string(aFile);
- aStream.open(s.c_str(), aMode);
+ std::string s;
+ aStream.open(Ucs2ToUtf8(aFile, s).c_str(), aMode);
return aStream.good();
}
@@ -187,27 +176,15 @@
void RemoveHashForFile(const std::wstring& aFile, const int aDriveLetter, const std::wstring& aPath)
{
- #ifndef __TOOLS2_LINUX__
std::wstring hashdir = L"$:\\sys\\hash\\";
- #else
- std::wstring hashdir = L"$:/sys/hash/";
- #endif
std::wstring basename = aFile.substr( aFile.rfind( KDirectorySeparator ) + 1) ;
if (basename.size() == 0)
{
- #ifndef __TOOLS2_LINUX__
basename = aFile.substr(aFile.rfind(L"\\"));
- #else
- basename = aFile.substr(aFile.rfind(L"/"));
- #endif
}
hashdir[0] = aDriveLetter;
- #ifndef __TOOLS2_LINUX__
std::wstring hashFile = aPath + L"\\sys\\hash\\" + basename;
- #else
- std::wstring hashFile = aPath + L"/sys/hash/" + basename;
- #endif
if (FileExists(hashFile))
{
RemoveFile(hashFile);
--- a/secureswitools/swisistools/source/interpretsislib/utils_win32.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/utils_win32.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -273,3 +273,71 @@
return 0;
}
+std::string Utils::wstring2string (const std::wstring& aWide)
+ {
+ int max = WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),0,0,0,0);
+ std::string reply;
+ if (max > 0 )
+ {
+ char* buffer = new char [max];
+ try
+ {
+ WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),buffer,max,0,0);
+ reply = std::string (buffer, max);
+ }
+ catch (...)
+ {
+ }
+ delete [] buffer;
+ }
+ return reply;
+ }
+
+std::wstring Utils::string2wstring (const std::string& aNarrow)
+ {
+ int max = MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),0,0);
+ std::wstring reply;
+ if (max > 0 )
+ {
+ wchar_t* buffer = new wchar_t [max];
+ try
+ {
+ MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),buffer,max);
+ reply = std::wstring (buffer, max);
+ }
+ catch (...)
+ {
+ }
+ delete [] buffer;
+ }
+ return reply;
+ }
+
+const std::wstring Utils::IntegerToWideString(int aInt)
+ {
+ std::wstringstream wstream;
+ wstream << aInt;
+ return wstream.str();
+ }
+
+std::wstring Utils::Int64ToWideString(TInt64 aInt)
+ {
+ wchar_t wint[20];
+
+#ifdef _MSC_VER
+ swprintf(wint, L"%I64u", aInt);
+#else
+ swprintf(wint, 20, L"%I64u", aInt);
+#endif // _MSC_VER
+
+ std::wstring strInt64(wint);
+ return strInt64;
+ }
+
+int Utils::WideStringToInteger(const std::wstring& aWideString)
+ {
+ unsigned long int value=0;
+ std::wstringstream str(aWideString);
+ str >> value;
+ return value;
+ }
--- a/secureswitools/swisistools/source/makesis/makesis.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/makesis/makesis.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
@@ -498,7 +498,7 @@
iVerbose(false)
{}
-int CMakeSIS::RunL(int argc, wchar_t* argv[])
+int CMakeSIS::Run(int argc, wchar_t* argv[])
// Inputs : argc, argv, envp - The command line passed to the process
{
int err=1;
@@ -542,7 +542,7 @@
bool isStubFile= (iCmdOptions.Flags() & CParseCmd::EOptMakeStub) != 0;
- pkgParser.MakeSisL(iCmdOptions.SourceFile(), iCmdOptions.TargetFile(), isStubFile, iCmdOptions.InterpretSisReport());
+ pkgParser.MakeSis(iCmdOptions.SourceFile(), iCmdOptions.TargetFile(), isStubFile, iCmdOptions.InterpretSisReport());
err = 0;
if (iCmdOptions.InterpretSisReport())
@@ -599,7 +599,7 @@
*/
wchar_t **argv1 = CommandLineArgs(argc,argv);
CMakeSIS app;
- int reply = app.RunL(argc, argv1);
+ int reply = app.Run(argc, argv1);
cleanup(argc,argv1);
return reply;
}
--- a/secureswitools/swisistools/source/makesis/makesis.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/makesis/makesis.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -51,7 +51,7 @@
public:
CMakeSIS();
- int RunL(int argc, wchar_t* argv[]);
+ int Run(int argc, wchar_t* argv[]);
bool ParseSource();
bool WriteTarget();
--- a/secureswitools/swisistools/source/makesislib/packageparser.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/makesislib/packageparser.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -175,7 +175,7 @@
}
-void CPackageParser::MakeSisL(const wchar_t* aPkgFileName, const wchar_t* aSisFileName, bool aMakeStub, bool aReportInterpretSisError)
+void CPackageParser::MakeSis(const wchar_t* aPkgFileName, const wchar_t* aSisFileName, bool aMakeStub, bool aReportInterpretSisError)
{
iMakeStub = aMakeStub;
iReportInterpretSisError = aReportInterpretSisError;
--- a/secureswitools/swisistools/source/makesislib/packageparser.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/makesislib/packageparser.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -194,7 +194,7 @@
* @param aMakeStub boolean which tells whether to create stub or not.
* @param aReportInterpretSisError whether to report interpretsis failure or not.
*/
- void MakeSisL(const wchar_t* aPkgFileName, const wchar_t* aSisFileName, bool aMakeStub, bool aReportInterpretSisError);
+ void MakeSis(const wchar_t* aPkgFileName, const wchar_t* aSisFileName, bool aMakeStub, bool aReportInterpretSisError);
/**
* This function will parse the package file. In case of any error it will
--- a/secureswitools/swisistools/source/signsis/parameter.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/signsis/parameter.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -58,22 +58,10 @@
for (int index = 1; index < argc; index++)
{
- // WINDOWS ENVIRONMENT : If the underlying platform is WINDOWS then,
- // cope up with multiple arguments following the '-' or '/'.
- //
- // LINUX ENVIRONMENT : If the underlying platform is LINUX then, cope
- // up with multiple arguments following only the '-'. This restriction
- // of not dealing with arguments following '/' is due to the fact that,
- // the absolute paths in case of LINUX start with a '/'. So, this could
- // be mistaken as an option if we treat anything prefixed by a '/' as
- // an option. Hence, this facility is being removed once for all and
- // only '-' can(should) be used for specifying an option.
- if ( (argv [index][0] == '-')
-#ifndef __LINUX__
- || (argv [index][0] == '/')
-#endif
- )
+ if ( (argv [index][0] == '-') ||
+ (argv [index][0] == '/'))
{
+ // cope with multiple arguments following the '-' or '/'
int wCharacter = 1;
while (argv[index][wCharacter] !='\0')
{
@@ -391,7 +379,7 @@
{
std::cout << std::endl << "SIGNSIS " << " Version 5.1" << std::endl;
std::cout << "A utility for signing Software Installation (SIS) files." << std::endl;
- std::cout << "Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved." << std::endl;
+ std::cout << "Copyright (c) 2007 Symbian Software Ltd. All rights reserved. " << std::endl;
#ifdef _DEBUG
std::cout << std::endl << "Development Version" << std::endl;
#endif
--- a/secureswitools/swisistools/source/signsislib/certificateinfo.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/signsislib/certificateinfo.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -410,14 +410,8 @@
}
int len = ConvertMultiByteToWideChar((LPSTR)UTF8Str, strlen((LPSTR)UTF8Str)+1, NULL, 0);
- #ifndef __TOOLS2_LINUX__
*aNameEntry = new wchar_t[len*sizeof(wchar_t)];
ConvertMultiByteToWideChar((LPSTR)UTF8Str, strlen((LPSTR)UTF8Str)+1, *aNameEntry, len);
- #else
- int tmplen = (len*sizeof(wchar_t))/2;
- *aNameEntry = new wchar_t[tmplen];
- ConvertMultiByteToWideChar((LPSTR)UTF8Str, strlen((LPSTR)UTF8Str)+1, *aNameEntry, len*2);
- #endif
return 1;
}
--- a/secureswitools/swisistools/source/signsislib/sissignature.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/signsislib/sissignature.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -427,7 +427,6 @@
std::cout << ERR_error_string (ERR_get_error (), NULL);
}
BIO_free(mem);
- mem = NULL;
RSA_free (rsa);
}
else
@@ -452,7 +451,6 @@
{
std::cout << ERR_error_string (ERR_get_error (), NULL);
BIO_free(mem);
- mem = NULL;
DSA_free (dsa);
}
else
--- a/secureswitools/swisistools/source/sisxlibrary/siscapabilities.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/siscapabilities.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -78,7 +78,7 @@
CSISException::ThrowIf(oldStderr == -1, CSISException::EFileProblem, "Failed in redirection operation");
#ifdef __TOOLS2_LINUX__
- nulStderr = fopen("/dev/null", "w");
+ nulStderr = fopen("NULL", "w");
#else
nulStderr = fopen("NUL:", "w");
#endif
--- a/secureswitools/swisistools/source/sisxlibrary/siscontents.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/siscontents.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -67,11 +67,7 @@
bool CSISContents::IsSisFile(const std::wstring& aFileName)
{
TSISStream input;
- #ifdef __TOOLS2_LINUX__
std::wstring fileName = FixPathDelimiters(aFileName);
- #else
- std::wstring fileName = aFileName;
- #endif
HANDLE file = ::MakeSISOpenFile(fileName.c_str(),GENERIC_READ,OPEN_EXISTING);
CSISException::ThrowIf ((INVALID_HANDLE_VALUE == file),
CSISException::EFileProblem, std::wstring (L"cannot open ") + fileName);
@@ -103,11 +99,7 @@
void CSISContents::Load (const std::wstring& aFileName, TUint64* size)
{
TSISStream input;
- #ifdef __TOOLS2_LINUX__
std::wstring fileName = FixPathDelimiters(aFileName);
- #else
- std::wstring fileName = aFileName;
- #endif
HANDLE file = ::MakeSISOpenFile(fileName.c_str(),GENERIC_READ,OPEN_EXISTING);
if (INVALID_HANDLE_VALUE == file)
{
--- a/secureswitools/swisistools/source/sisxlibrary/sisexpression.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/sisexpression.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -584,7 +584,7 @@
return false;
}
- std::wistringstream wStrStream(aString.c_str());
+ std::wistringstream wStrStream(aString);
if((wStrStream >> std::dec >> aDecimalValue) && wStrStream.eof())
{
--- a/secureswitools/swisistools/source/sisxlibrary/sisinfo.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/sisinfo.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -178,10 +178,6 @@
{
aStream << L", SH";
}
- if (iInstallFlags & EInstFlagNonRemovable)
- {
- aStream << L", NR";
- }
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
if (iInstallFlags & EInstFlagHide)
{
--- a/secureswitools/swisistools/source/sisxlibrary/sisstring.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/sisstring.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -261,7 +261,7 @@
{
return true;
}
- return wcscmp(iData.c_str(), aString) != 0;
+ return iData.compare (aString) != 0;
}
@@ -278,7 +278,7 @@
inline void CSISString::AddPackageEntry(std::wostream& aStream, bool aVerbose) const
{
(void)aVerbose;
- aStream << iData.c_str();
+ aStream << iData;
}
#endif // __SISSTRING_H__
--- a/secureswitools/swisistools/source/sisxlibrary/utility.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/utility.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -48,7 +48,7 @@
}
-DllExport std::string wstring2string (const std::wstring& aWide)
+std::string wstring2string (const std::wstring& aWide)
{
int max = ConvertWideCharToMultiByte(aWide.c_str(),aWide.length(),0,0);
std::string reply;
@@ -84,8 +84,8 @@
{
}
delete [] buffer;
- }
- return reply.c_str();
+ }
+ return reply;
}
void EnsureExtended (std::wstring& aName, const std::wstring& aDefaultExtension)
@@ -374,22 +374,15 @@
std::wstring FixPathDelimiters( const std::wstring& aString )
{
-
std::wstring ret = aString;
+
std::wstring::size_type idx = 0;
int len = 0;
while(len = FirstInvalidDirSeparatorSize(ret, idx))
{
- if(idx == 0 && len == 2)
- {
- ret.replace( idx, len, KSisInitialNetworkPathSlashes );
- }
- else
- {
- ret.replace( idx, len, KSisDirectorySeparator );
- }
+ ret.replace( idx, len, KSisDirectorySeparator );
}
- return ret.c_str();
+ return ret;
}
int GetFileType(std::wstring& aFileName)
--- a/secureswitools/swisistools/source/sisxlibrary/utility.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/utility.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -32,13 +32,11 @@
#include <string>
#include "basetype.h"
#include "fieldroot.h"
-#include "../common/toolsconf.h"
#define FreeMemory(x) {if((x) != NULL) {free(x); (x)=NULL;}}
// Constants
const std::wstring KSisDirectorySeparator( L"/" );
-const std::wstring KSisInitialNetworkPathSlashes( L"//" );
typedef struct {
wchar_t* iName;
@@ -64,7 +62,7 @@
int SearchSortedUCTable (const SIdentifierTable aTable [], const std::wstring& aIdentifier);
TUint32 IdentifyUCKeyword (const SKeyword aKeyword [], std::wstring aIdentifier, const std::wstring& aContext);
-DllExport std::string wstring2string (const std::wstring& aWide);
+std::string wstring2string (const std::wstring& aWide);
std::wstring string2wstring (const std::string& aNarrow);
bool ValidateFileName (std::wstring& aName, const bool aMustExist);
bool ValidateFileName (std::wstring& aName, const bool aMustExist, const std::wstring& aDefaultExtension);
--- a/secureswitools/swisistools/source/sisxlibrary/utility_interface.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/utility_interface.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -99,33 +99,6 @@
*/
int ConvertMultiByteToWideChar(const char* aSource, int aSourceLen, wchar_t* aTarget, int aTargetLen, TUint32 aCodePage = 0);
-/*
-Copies an existing file to a new file.
-@Parameters aSrc : The name of an existing file.
-@Parameters aDest : The name of the new file.
-@Parameters aFlag : (only for windows) If this parameter is TRUE and the new file specified by aDest already exists, the function fails. If this parameter is FALSE and the new file already exists, the function overwrites the existing file and succeeds.
-
-Return Value
-If the function succeeds, the return value is zero.
-If the function fails, the return value is nonzero.
-*/
-
-int FileCopyA(const char* aSrc, const char* aDest, size_t aFlag);
-
-
-/*
-Moves an existing file or a directory, including its children
-@Parameters aSrc : The current name of the file or directory on the local computer.
-@Parameters aDest : The new name for the file or directory. The new name must not already exist. A new file may be on a different file system or drive. A new directory must be on the same drive.
-
-Return Value
-If the function succeeds, the return value is zero.
-If the function fails, the return value is nonzero.
-*/
-
-int FileMoveA(const char* aSrc, const char* aDest);
-
-
// interface for only Linux
#ifdef __TOOLS2_LINUX__
--- a/secureswitools/swisistools/source/sisxlibrary/utility_linux.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/utility_linux.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -175,24 +175,18 @@
int _wunlink(const wchar_t* wc)
{
int ret = 0;
- const int len = wcstombs(0,wc,-1);
-
- char* tmp = new char[len+1];
+ int len = wcstombs(0,wc,-1);
+ char *tmp = new char[len];
ret = wcstombs(tmp, wc, len);
-
if(ret == -1) {
printf("wunlink: wcstombs error\n");
- delete [] tmp;
+ delete[] tmp;
return ret;
}
-
tmp[ret] = '\0';
ret = unlink(tmp);
-
if(ret != 0)
printf("wunlink: %s: %s\n", tmp, strerror(ret));
-
- delete [] tmp;
return ret;
}
@@ -627,35 +621,5 @@
}
-int FileCopyA(const char* aSrc, const char* aDest, size_t aFlag)
- {
- int err= 0;
- const int len = 512;
- // Overwrites the orphaned file(if any).
- char cmd[ len ] = "cp -f ";
- strcat(cmd, aSrc);
- strcat(cmd, " ");
- strcat(cmd, aDest);
- strcat(cmd, " 2> /dev/null");
-
- err = system(cmd);
- return err;
- }
-
-int FileMoveA(const char* aSrc, const char* aDest)
- {
- int err= 0;
- // Overwrites the orphaned file(if any).
- char cmd[ 512 ] = "mv -f ";
- strcat(cmd, aSrc);
- strcat(cmd, " ");
- strcat(cmd, aDest);
- strcat(cmd, " 2> /dev/null");
-
- err = system(cmd);
-
- return err;
- }
-
--- a/secureswitools/swisistools/source/sisxlibrary/utility_windows.cpp Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/utility_windows.cpp Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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 the License "Eclipse Public License v1.0"
@@ -185,15 +185,3 @@
return ::GetLastError();
}
-int FileCopyA(const char* aSrc, const char* aDest, size_t aFlag)
-{
- int err=CopyFileA(aSrc,aDest,aFlag);
- return err;
-}
-
-int FileMoveA(const char* aSrc, const char* aDest)
-{
- int err=MoveFileA(aSrc,aDest);
- return err;
-}
-
--- a/secureswitools/swisistools/test/tdumpsis/testdumpsis.pl Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/test/tdumpsis/testdumpsis.pl Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
@@ -345,22 +345,6 @@
%s
;
";
-
-#
-# Template string to generate PKG file for TestNRFlag.
-#
-$PkgFileWithNRflag = "
-; File to verify NR flag is dumped correctly.
-;
-;Languages
-&EN
-;
-#{\"TestPacakge\"}, (0x80000077), 1, 0, 0, TYPE=SA, RU, NR
-;
-%{\"Vendor\"}
-:\"Vendor\"
-";
-
#
# Do test for each elements of TestItems array
#
@@ -551,9 +535,6 @@
SatisfyCoverage();
VerifyErroneousCommandLineArg();
-
-TestNRFlag();
-
#
# Display the result
#
@@ -1500,53 +1481,3 @@
unlink $TestLogFile;
}
-sub TestNRFlag
- {
- $TestNRflagsis = "test_nr_flag.sis";
- $TestNRflagLog = "test_nr_flag.Log";
- $TestNRflagpkg = "test_nr_flag.pkg";
- $DumpsisGenPkgPath = "\/test_nr_flag";
- $ExpectedStringInDumpedPackage = "NR";
- WriteLog("Test if the NR flag, in the original package file, is present in the dumped package file \n");
-
- CreateFile('test_nr_flag.pkg', $PkgFileWithNRflag);
- # Create a sis file
- my $result = system("/epoc32/tools/MAKESIS -v $TestNRflagpkg $TestNRflagsis > $TestNRflagLog ");
-
- # Execute DumpSIS on the created sis file.
- my $result1 = system("/epoc32/tools/DUMPSIS $TestNRflagsis > $TestNRflagLog");
-
- use Cwd;
- $dir = cwd;
- chdir $dir.$DumpsisGenPkgPath;
-
- open($pkgcontent,$TestNRflagpkg);
- foreach (<$pkgcontent>)
- {
- $_ =~ tr/\000//d;
- if ($_ =~ m/$ExpectedStringInDumpedPackage/)
- {
- $result2 = 1;
- }
- }
- close($pkgcontent);
-
- chdir $dir;
- $NumberOfTests++;
- if ($result == 0 && $result1 == 0 && $result2 == 1)
- {
- $NumberOfPassed++;
- WriteLog("Passed\n\n");
- }
- else
- {
- $NumberOfFailed++;
- WriteLog("Failed\n\n");
- }
-
- unlink $TestNRflagpkg;
- unlink $TestNRflagsis;
- unlink $TestNRflagLog;
- use File::Path;
- rmtree "$dir$DumpsisGenPkgPath";
- }
\ No newline at end of file
--- a/secureswitools/swisistools/test/testmakesis/largelanguagecodes.pkg Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-;
-; 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 the License "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
-;#define LANGUAGE_IDS LANG sc 37 14346 14387 14412 14419 102 42 44 45 25 07 18 01 10 129 158 160 159 157 161 49 50 09 02 51 103 03 54 57 58 30 17 15 59 327 05 32 65 67 68 70 326 08 27 13 76 31 78 16 79 26 28 04 83 06 39 29 33 14 93 94 96
-&01,02,03,04,05,06,07,08,09,10,13,14,15,16,17,18,25,26,27,28,29,30,31,32,33,37,39,42,44,45,49,50,51,54,57,58,59,65,67,68,70,76,78,79,83,93,94,96,102,103,129,157,158,159,160,161,326,327,14346,14387,14412,14419,456789
-
-;Header
-#{"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice "},(0x200002B3),1,1,1,TYPE=SA
-
-;Localised Vendor name
-%{"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice ",
-"Quickoffice "}
-
-;Unique Vendor name
-:"Quickoffice Inc"
-
-;Supports Series 60 v 5.0
-[0x1028315F], 0, 0, 0,
-{"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID",
-"Series60ProductID"}
--- a/secureswitools/swisistools/test/tinterpretsisinteg/check.pl Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/check.pl Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
@@ -172,7 +172,7 @@
$searchresult = 0;
$filenotexist = 0;
- $filename = lc trim($temp);
+ $filename = trim($temp);
if($filename eq "")
{
# Blank line found - no file to check
--- a/secureswitools/swisistools/test/tinterpretsisinteg/scripts/ini.ini Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/ini.ini Wed Oct 13 14:40:19 2010 +0300
@@ -432,20 +432,6 @@
exist1=c:\Documents\InstTest\upgrade2.txt
exist2=c:\Documents\InstTest\upgrade3.txt
-[ROM-Install-09_checkfiles]
-numexist=1
-exist0=z:\Documents\abc1.txt
-
-[ROM-Install-09_checkfilesall]
-numexist=2
-exist0=z:\Documents\abc1.txt
-exist1=c:\Documents\abc1.txt
-
-[ROM-Install-09]
-uid=80000086
-sis=c:\tswi\tsis\data\int_rominstall_02.sisx
-script=c:\tswi\tuiscriptadaptors\scripts\Simple.xml
-
[NR-OPTION-01_checkfiles]
numexist=1
exist0=c:\Documents\abc1.txt
--- a/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int-rominstall-09.script Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// 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 the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-// Load Suite
-LOAD_SUITE tuiscriptadaptors
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-//! @SYMTestCaseID INT-RomInstall-09
-//! @SYMTestCaseDesc Installing SA on Rom Stub. This is a positive testcase
-//! @SYMPREQ
-//! @SYMTestStatus Released
-//! @SYMTestPriority High
-//! @SYMTestActions Install SIS file
-//! @SYMTestExpectedResults error code 0 returned.
-//! @SYMTestType CIT
-//////////////////////////////////////////////////////////////////////////////////////////////
-RUN_UTILS DeleteDirectory c:\sys\bin
-RUN_UTILS DeleteDirectory c:\sys\hash
-RUN_UTILS DeleteDirectory c:\sys\install
-RUN_UTILS DeleteDirectory c:\Documents
-
-START_TESTCASE INT-RomInstall-09
-
-RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini ROM-Install-09_checkfiles
-RUN_TEST_STEP 100 tuiscriptadaptors InstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini ROM-Install-09
-RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini ROM-Install-09_checkfilesall
-//RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
-
-END_TESTCASE INT-RomInstall-09
\ No newline at end of file
--- a/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int-rominstall-10.script Wed Sep 15 12:20:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// 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 the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-// Load Suite
-LOAD_SUITE tuiscriptadaptors
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-//! @SYMTestCaseID INT-RomInstall-10
-//! @SYMTestCaseDesc UnInstalling SA upgrade on Rom Stub. This is a positive testcase
-//! @SYMPREQ
-//! @SYMTestStatus Released
-//! @SYMTestPriority High
-//! @SYMTestActions UnInstall SIS file
-//! @SYMTestExpectedResults error code 0 returned.
-//! @SYMTestType CIT
-//////////////////////////////////////////////////////////////////////////////////////////////
-RUN_UTILS DeleteDirectory c:\sys\bin
-RUN_UTILS DeleteDirectory c:\sys\hash
-RUN_UTILS DeleteDirectory c:\sys\install
-RUN_UTILS DeleteDirectory c:\Documents
-
-START_TESTCASE INT-RomInstall-10
-
-RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini ROM-Install-09_checkfiles
-RUN_TEST_STEP 100 tuiscriptadaptors InstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini ROM-Install-09
-RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini ROM-Install-09_checkfilesall
-RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
-//RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
-
-END_TESTCASE INT-RomInstall-10
\ No newline at end of file
--- a/secureswitools/swisistools/test/tinterpretsisinteg/testinterpretsis.bat Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/testinterpretsis.bat Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
@rem
-@rem Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
@rem All rights reserved.
@rem This component and the accompanying materials are made available
@rem under the terms of the License "Eclipse Public License v1.0"
@@ -901,50 +901,6 @@
GOTO PASS_CLEAN
-:INT002-019
-if not exist \ddrive mkdir \ddrive > NUL
-if not exist .\edrive mkdir .\edrive > NUL
-call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\test_system_drive.sis +e -d g -i \epoc32\winscw\c\tswi\tinterpretsisinteg\data\config-drives.ini -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\800000FD\00000000.reg
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\800000FD\00000000_0000.ctl
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\edrive\sys\install\sisregistry\800000FD\00000000_0000.ctl
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\edrive\Documents\InstTest\upgrade1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\Documents\InstTest\upgrade2.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\edrive\Documents\InstTest\upgrade3.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\Documents\InstTest\upgrade4.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-
-:INT002-020
-if not exist \ddrive mkdir \ddrive > NUL
-if not exist .\edrive mkdir .\edrive > NUL
-call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\test_system_drive.sis +e -d g -i \epoc32\winscw\c\tswi\tinterpretsisinteg\data\config-drives.ini -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-call interpretsis -z .\romdrive -c .\cdrive -x 0x800000FD +e -d g -i \epoc32\winscw\c\tswi\tinterpretsisinteg\data\config-drives.ini -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\800000FD\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\800000FD\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\edrive\sys\install\sisregistry\800000FD\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\edrive\Documents\InstTest\upgrade1.txt
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\Documents\InstTest\upgrade2.txt
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\edrive\Documents\InstTest\upgrade3.txt
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\Documents\InstTest\upgrade4.txt
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
:SWI002-001
if not exist .\romdrive\sys\bin\ mkdir .\romdrive\sys\bin\
if not exist .\romdrive\private\10273582\ mkdir .\romdrive\private\10273582\
@@ -1934,7 +1890,7 @@
call copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\version_5_3.txt .\romdrive\system\data\sisregistry_5.3.txt > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -1948,7 +1904,7 @@
call copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\version_5_1.txt .\romdrive\system\data\sisregistry_5.1.txt > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_51\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_51\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -1962,7 +1918,7 @@
call copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\version_4_1.txt .\romdrive\system\data\sisregistry_4.0.txt > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_40\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_40\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -1972,7 +1928,7 @@
if not exist .\romdrive\system\install mkdir .\romdrive\system\install > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -k 5.3 -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -1984,7 +1940,7 @@
call copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\version_4_1.txt .\romdrive\system\data\sisregistry_4.0.txt > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -k 5.3 -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -1996,7 +1952,7 @@
call copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\version_5_3.txt .\romdrive\system\data\sisregistry_5.3.txt > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -2008,7 +1964,7 @@
call copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\version_5_1.txt .\romdrive\system\data\sisregistry_5.1.txt > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_51\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_51\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -2020,7 +1976,7 @@
call copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\version_5_3.txt .\romdrive\system\data\sisregistry_5.3.txt > NUL
call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tinterpretsisinteg\data\simple.sis -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
if not %errorlevel%==0 GOTO LAST
-call fc /c .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
+call fc .\cdrive\sys\install\sisregistry\80000001\00000000.reg \epoc32\winscw\c\tswi\tinterpretsisinteg\data\80000001_53\00000000.reg | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -2547,7 +2503,7 @@
if not %errorlevel%==0 GOTO LAST
set exist_file=.\edrive\private\10202dce\802730A9_0.sis
if not exist %exist_file% GOTO FAIL_NOT_FOUND
-call fc /c .\edrive\private\10202dce\802730A9_0.sis \epoc32\winscw\c\tswi\tinterpretsisinteg\data\802730A9_0.sis | find "FC: no differences encountered" > NUL
+call fc .\edrive\private\10202dce\802730A9_0.sis \epoc32\winscw\c\tswi\tinterpretsisinteg\data\802730A9_0.sis | find "FC: no differences encountered" > NUL
if not %errorlevel%==0 GOTO LAST
ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
GOTO PASS_CLEAN
@@ -3050,304 +3006,6 @@
if not %errorlevel%==0 GOTO LAST
GOTO PASS_CLEAN
-:INT-RomInstall-01
-::Testcase to Install SIS file to ROM (z) drive and check for file exists.
-mkdir .\romdrive\sys\bin > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-02
-::Testcase to UnInstall SIS file installed in ROM (z) drive and check for file exists
-mkdir .\romdrive\sys\bin > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-call interpretsis -z .\romdrive -c .\cdrive -x 0xe8000097 -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-
-:INT-RomInstall-03
-::Testcase to Install SA over SA to ROM (z) drive. Also validates that the eclipsing is not done.
-mkdir .\romdrive\sys\bin > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-04
-::Testcase to Install SP to ROM (z) drive.
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_nr_option_01_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-05
-::Testcase to Install PU to ROM (z) drive.
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_nr_option_01_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-06
-::Testcase to overwrite orphan files when Installing to ROM (z) drive.
-mkdir .\romdrive\documents > NUL
-call copy \epoc32\winscw\c\tswi\teclipsing\data\file1.txt .\romdrive\documents\abc1.txt > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_nr_option_01_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-07
-::Testcase for installing multiple SA to ROM (z) drive using one CLI.
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_nr_option_01_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-
-:INT-RomInstall-08
-::Testcase for overwritting a file belonging to different SA.
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +z -s \epoc32\winscw\c\tswi\tsis\data\int_rominstall_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\90000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\90000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_nr_option_01_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_romisntall_01_90000086.sis
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-09
-::Testcase for Installing SA using SWI on Rom Stub
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-call xcopy .\cdrive \epoc32\winscw\c /S /Y > NUL
-call xcopy .\romdrive \epoc32\release\winscw\udeb\z /S /Y > NUL
-if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_nr_option_01_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
-GOTO END
-
-:INT-RomInstall-10
-::Testcase for UnInstalling SA upgrade using SWI on Rom Stub
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-call xcopy .\cdrive \epoc32\winscw\c /S /Y > NUL
-call xcopy .\romdrive \epoc32\release\winscw\udeb\z /S /Y > NUL
-if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_nr_option_01_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-ECHO ***ERRORCODE*** %errorlevel% PASS>>\epoc32\winscw\c\interpretsis_test_harness.txt
-GOTO END
-
-:INT-RomInstall-11
-::Testcase for verifying drive selection for 'c' , '$', 'e', '!', 'z' from pkg files while installing to Rom (z) drive.
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_rominstall_03.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\romdrive\documents\abc1.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\documents\abc2.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\documents\abc3.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\documents\abc4.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\documents\abc5.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\documents\abc6.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_rominstall_03_80000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-12
-::Testcase to validate that for Installing SIS file to ROM (z) drive, system drive should not be mentioned.
-mkdir .\romdrive\sys\bin > NUL
-call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-13
-::Testcase to validate that for Installing SA over SA with different file set to ROM (z) drive.
-mkdir .\romdrive\sys\bin > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_rominstall_01.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\int_rominstall_04.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if not %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\80000086\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\documents\abc1.txt
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\documents\abc7.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\documents\abc8.txt
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-set exist_file=.\romdrive\system\install\int_rominstall_01_90000086.sis
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\system\install\int_rominstall_04_90000086.sis
-if not exist %exist_file% GOTO FAIL_NOT_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-14
-::Testcase to validate that for Installing SIS file to ROM (z) drive, -z option is mendatory.
-mkdir .\romdrive\sys\bin > NUL
-call interpretsis -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-15
-::Testcase to validate that -s +z and -s +e cannot be used in same CLI with system drive defined.
-:: the order of -s +e and -s +z are different then the testcase INT-RomInstall-17. Used to test both combination as each SIS file is installed saperately
-mkdir .\romdrive\sys\bin > NUL
-call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +e -w info -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-16
-::Testcase to validate that -s +z and -s +e cannot be used in same CLI without system drive defined.
-mkdir .\romdrive\sys\bin > NUL
-if not exist \epoc32\winscw\e mkdir \epoc32\winscw\e > NUL
-call interpretsis -z .\romdrive -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +e -w info -i \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_38.txt -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
-:INT-RomInstall-17
-::Testcase to validate that -s +z and -s +e cannot be used in same CLI with system drive defined.
-:: the order of -s +e and -s +z are different then the testcase INT-RomInstall-15. Used to test both combination as each SIS file is installed saperately
-mkdir .\romdrive\sys\bin > NUL
-if not exist \epoc32\winscw\e mkdir \epoc32\winscw\e > NUL
-call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +e -s \epoc32\winscw\c\tswi\tsis\data\interpretsis_testcase.sis +z -w info -i \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_38.txt -l \epoc32\winscw\c\interpretsis_test_harness.txt > NUL
-if %errorlevel%==0 GOTO LAST
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000.reg
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\cdrive\sys\install\sisregistry\e8000097\00000000_0000.ctl
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\sys\bin\interpretsis_testcase_01.exe
-if exist %exist_file% GOTO FAIL_FOUND
-set exist_file=.\romdrive\system\install\interpretsis_testcase_e8000097.sis
-if exist %exist_file% GOTO FAIL_FOUND
-GOTO PASS_CLEAN
-
:PASS_CLEAN
rmdir /S /Q .\cdrive > NUL
--- a/secureswitools/swisistools/test/tinterpretsisinteg/testlist.xml Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/testlist.xml Wed Oct 13 14:40:19 2010 +0300
@@ -985,16 +985,6 @@
<command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT002-017</command>
<check type="result"/>
</test>
-<test id="INT002-019">
- <title>SEC-sistools-InterpretSIS-INT002-019</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT002-019</command>
- <check type="result"/>
- </test>
-<test id="INT002-020">
- <title>SEC-sistools-InterpretSIS-INT002-020</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT002-020</command>
- <check type="result"/>
- </test>
<test id="SWI002-001" type="nativeonly">
<title>SEC-sistools-InterpretSIS-SWI002-001</title>
<command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat SWI002-001</command>
@@ -1869,106 +1859,4 @@
<check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-39 INT_NR_Option-39 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-39.script" "int_nr_option-39.htm" "FAIL = 0" "FAIL = 0" </check>
</test>
-<test id="INT-RomInstall-01">
- <title>INT-RomInstall-01</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-01</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-02">
- <title>INT-RomInstall-02</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-02</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-03">
- <title>INT-RomInstall-03</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-03</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-04">
- <title>INT-RomInstall-04</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-04</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-05">
- <title>INT-RomInstall-05</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-05</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-06">
- <title>INT-RomInstall-06</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-06</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-07">
- <title>INT-RomInstall-07</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-07</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-08">
- <title>INT-RomInstall-08</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-08</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-09" type="nativeonly">
- <title>INT-RomInstall-09</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-09</command>
- <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT-RomInstall-09 INT-RomInstall-09 3 "positive" "both" "nouid" "nobatchfile" "int-rominstall-09.script" "int-rominstall-09.htm" "nocheck" "PASS = 3" </check>
- </test>
-
-<test id="INT-RomInstall-10" type="nativeonly">
- <title>INT-RomInstall-10</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-10</command>
- <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT-RomInstall-10 INT-RomInstall-10 3 "positive" "both" "nouid" "nobatchfile" "int-rominstall-10.script" "int-rominstall-10.htm" "nocheck" "PASS = 4" </check>
- </test>
-
-<test id="INT-RomInstall-11">
- <title>INT-RomInstall-11</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-11</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-12">
- <title>INT-RomInstall-12</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-12</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-13">
- <title>INT-RomInstall-13</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-13</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-14">
- <title>INT-RomInstall-14</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-14</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-15">
- <title>INT-RomInstall-15</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-15</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-16">
- <title>INT-RomInstall-16</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-16</command>
- <check type="result"/>
- </test>
-
-<test id="INT-RomInstall-17">
- <title>INT-RomInstall-17</title>
- <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\testinterpretsis.bat INT-RomInstall-17</command>
- <check type="result"/>
- </test>
-
</testlist>