--- a/hapticsservices_plat/tactile_feedback_server_api/tsrc/group/testdomtactilefeedbackserver.mmp Tue Sep 14 21:53:31 2010 +0300
+++ b/hapticsservices_plat/tactile_feedback_server_api/tsrc/group/testdomtactilefeedbackserver.mmp Wed Oct 13 14:52:48 2010 +0300
@@ -51,7 +51,7 @@
SOURCE testtactilefeedbackserver.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY tactileclickplugin.lib
--- a/hapticsservices_pub/tactile_feedback_client_api/tsrc/group/testsdktfc.mmp Tue Sep 14 21:53:31 2010 +0300
+++ b/hapticsservices_pub/tactile_feedback_client_api/tsrc/group/testsdktfc.mmp Wed Oct 13 14:52:48 2010 +0300
@@ -45,7 +45,7 @@
SOURCE testsdktfcblocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY touchfeedback.lib
--- a/tacticonserver/server/group/bld.inf Tue Sep 14 21:53:31 2010 +0300
+++ b/tacticonserver/server/group/bld.inf Wed Oct 13 14:52:48 2010 +0300
@@ -22,7 +22,7 @@
PRJ_EXPORTS
../data/Tacticons.ivt /epoc32/data/z/system/Sounds/Digital/tacticons.ivt
-../data/Tacticons.ivt /epoc32/release/winscw/udeb/z/System/Sounds/Digital/tacticons.ivt
+../data/Tacticons.ivt /epoc32/release/winscw/udeb/Z/System/Sounds/Digital/tacticons.ivt
PRJ_MMPFILES
../tacticonpluginfw/group/tacticonpluginfw.mmp
--- a/tacticonserver/tacticonactionplugin/group/bld.inf Tue Sep 14 21:53:31 2010 +0300
+++ b/tacticonserver/tacticonactionplugin/group/bld.inf Wed Oct 13 14:52:48 2010 +0300
@@ -26,10 +26,10 @@
../rom/tacticonactionplugin.iby CORE_IBY_EXPORT_PATH(mw, tacticonactionplugin.iby)
../data/tacticon.rul\
- /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/tacticon.rul
+ /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/tacticon.rul
../data/tacticon.rul\
- /epoc32/data/z/private/10282BC4/Rules/tacticon.rul
+ /epoc32/data/Z/private/10282BC4/Rules/tacticon.rul
#ifndef TOOLS
--- a/tactilefeedback/tactileactionplugin/group/bld.inf Tue Sep 14 21:53:31 2010 +0300
+++ b/tactilefeedback/tactileactionplugin/group/bld.inf Wed Oct 13 14:52:48 2010 +0300
@@ -26,10 +26,10 @@
../rom/tactileactionplugin.iby CORE_IBY_EXPORT_PATH(mw, tactileactionplugin.iby)
../data/tactile.rul\
- /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/tactile.rul
+ /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/tactile.rul
../data/tactile.rul\
- /epoc32/data/z/private/10282BC4/Rules/tactile.rul
+ /epoc32/data/Z/private/10282BC4/Rules/tactile.rul
#ifndef TOOLS
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp Tue Sep 14 21:53:31 2010 +0300
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp Wed Oct 13 14:52:48 2010 +0300
@@ -35,8 +35,6 @@
const TInt KTactileChunkInitialSize = 4096; // 4kB
const TInt KTactileChunkMaxSize = 262144; // 256kB
const TUid KTactileClickPluginUid = { 0x2000B493 };
-
-_LIT( KChunkNameFormat, "PID_0x%Lx_TID_0x%Lx" );
// ======== MEMBER FUNCTIONS ========
// ---------------------------------------------------------------------------
@@ -88,14 +86,15 @@
}
// #2 Create shared chunk
+ RThread me;
+
TTactileFeedbackConnectData data;
// Set window group identifier
data.iWindowGroupId = CCoeEnv::Static()->RootWin().Identifier();
- // We use our own process id and thread id as name for the chunk
- data.iChunkName.Format( KChunkNameFormat,
- RProcess().Id().Id(), RThread().Id().Id() );
+ // We use our own thread name as name for the chunk
+ data.iChunkName.Copy( me.Name().Right( KMaxKernelName ) );
// Now create the chunk
TInt err = iChunk.CreateGlobal( data.iChunkName,
--- a/tactilefeedback/tactilefeedbackresolver/group/bld.inf Tue Sep 14 21:53:31 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/group/bld.inf Wed Oct 13 14:52:48 2010 +0300
@@ -26,11 +26,11 @@
PRJ_EXPORTS
// Tactile feedback effects files
../data/9.2_TactileFeedbackLevel1_A.ivt /epoc32/data/z/private/10003B20/9.2_TactileFeedbackLevel1_A.ivt
-../data/9.2_TactileFeedbackLevel1_A.ivt /epoc32/release/winscw/udeb/z/private/10003B20/9.2_TactileFeedbackLevel1_A.ivt
+../data/9.2_TactileFeedbackLevel1_A.ivt /epoc32/release/winscw/udeb/Z/private/10003B20/9.2_TactileFeedbackLevel1_A.ivt
../data/9.2_TactileFeedbackLevel2_A.ivt /epoc32/data/z/private/10003B20/9.2_TactileFeedbackLevel2_A.ivt
-../data/9.2_TactileFeedbackLevel2_A.ivt /epoc32/release/winscw/udeb/z/private/10003B20/9.2_TactileFeedbackLevel2_A.ivt
+../data/9.2_TactileFeedbackLevel2_A.ivt /epoc32/release/winscw/udeb/Z/private/10003B20/9.2_TactileFeedbackLevel2_A.ivt
../data/9.2_TactileFeedbackLevel3_A.ivt /epoc32/data/z/private/10003B20/9.2_TactileFeedbackLevel3_A.ivt
-../data/9.2_TactileFeedbackLevel3_A.ivt /epoc32/release/winscw/udeb/z/private/10003B20/9.2_TactileFeedbackLevel3_A.ivt
+../data/9.2_TactileFeedbackLevel3_A.ivt /epoc32/release/winscw/udeb/Z/private/10003B20/9.2_TactileFeedbackLevel3_A.ivt
// IBY file
../rom/tactilefeedbackresolver.iby CORE_IBY_EXPORT_PATH(mw, tactilefeedbackresolver.iby)
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/group/tactiletoneplugin.mmp Tue Sep 14 21:53:31 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/group/tactiletoneplugin.mmp Wed Oct 13 14:52:48 2010 +0300
@@ -53,4 +53,4 @@
LIBRARY ecom.lib
LIBRARY mediaclientaudio.lib
LIBRARY tactilefeedbackresolver.lib
-LIBRARY profileeng.lib
+LIBRARY profileeng.lib