--- a/appinstaller/AppinstUi/startuplistupdater/inc/startuplistupdater.h	Thu Oct 14 14:11:30 2010 +0300
+++ b/appinstaller/AppinstUi/startuplistupdater/inc/startuplistupdater.h	Wed Oct 20 14:52:56 2010 +0300
@@ -19,11 +19,12 @@
 #define STARTUPLISTUPDATER_H
 
 #include <e32base.h>                    // CBase
-#include <f32file.h>                    // RFs
+#include <f32file.h>                    // RFs, RFile
 #include <dscstore.h>                   // RDscStore
 
 namespace Swi
     {
+    class RSisRegistrySession;
     class RSisRegistryEntry;
     }
 
@@ -51,7 +52,16 @@
     void AppendExecutablesFromResourceFileL( const TDesC& aResourceFile,
             RPointerArray<HBufC>& aExecutableArray );
     TBool IsValidExecutableForStartupL( const TDesC& aResourceFile,
-        const TDesC& aExecutableName );
+            const TDesC& aExecutableName );
+    void ExtractPackageUidFromResourceFileL( const TDesC& aResourceFile,
+            TUid& aPackageUid );
+    TBool IsResourceFileValidForPackageL( Swi::RSisRegistrySession& aSisRegSession,
+            const TDesC& aResourceFile, const TUid& aPackageUid );
+    TBool IsFileIncludedInPackageL( const TDesC& aFile, Swi::RSisRegistryEntry& aPackage );
+    TBool IsFileIncludedInEmbeddedPackagesL( Swi::RSisRegistrySession& aSisRegSession,
+            const TDesC& aFile, Swi::RSisRegistryEntry& aPackage );
+    TBool IsExeFileIncludedInPackageL( Swi::RSisRegistrySession& aSisRegSession,
+            const TDesC& aExeFile, const TUid& aPackageUid );
     void GetInstalledAppsL( RPointerArray<HBufC>& aInstalledExecutableArray );
     void GetStartupListAppsL( RDscStore& aDscStore,
             RPointerArray<HBufC>& aStartedExecutableArray );
@@ -61,10 +71,15 @@
     void RemoveFromStartupListL( RDscStore& aDscStore, RPointerArray<HBufC>& aExecutableArray );
     void GetExecutablesFromEntryL( Swi::RSisRegistryEntry& aEntry,
             RPointerArray<HBufC>& aExecutableArray );
+    void OpenDevTraceL();
+    void DevTrace( TRefByValue<const TDesC> aFmt, ... );
 
 private:    // new data
     RFs iFs;
     HBufC* iPrivateImportPath;
+    RFile iLogFile;
+    RBuf8 iFileBuf;
+    HBufC* iLogBuf;  // NULL if logging disabled
     };
 
 #endif  // STARTUPLISTUPDATER_H