CR: Fix to remove Network Shim Layer from 8.1

Synopsis:
Atlas Helix porting to Symbian 8.1, without Network Shim
Layer.

Files Added:
None

Files Modified:
client/netwksvc/hxnetwksvcpln_symbian.pcf
clientapps/symbianplayer/platform/symbian/chxavplayer.cpp
common/netio/platform/symbian/hxsymbiannet.cpp
common/netio/platform/symbian/hxsymbianresolver.cpp
common/netio/platform/symbian/hxsymbiansocket.cpp

Image Size and Heap Use impact (Client -Only):
None.

Platforms and Profiles Affected:
Symbian8.1


Distribution Libraries Affected:
None


Distribution library impact and planned action:
None


Platforms and Profiles Build Verified:
BIF branch  -> helix_restricted
Target(s)   -> symbianinst
Profile     -> helix-client-s60-advanced
SYSTEM_ID   -> symbian-81-winscw-emulator



Files Attached:
net.diff.txt

Regards,
Satish
Index: client/netwksvc/hxnetwksvcpln_symbian.pcf
============================================================
=======
RCS file:
/cvsroot/client/netwksvc/hxnetwksvcpln_symbian.pcf,v
retrieving revision 1.2
diff -u -r1.2 hxnetwksvcpln_symbian.pcf
--- client/netwksvc/hxnetwksvcpln_symbian.pcf	6 Dec 2006
10:07:02 -0000	1.2
+++ client/netwksvc/hxnetwksvcpln_symbian.pcf	7 Dec 2006
13:23:35 -0000
 -49,9
+49,6 
 # 
 # ***** END LICENSE BLOCK *****
 
-if project.IsDefined('_SYMBIAN_81_'):
-	project.AddDefines('HELIX_FEATURE_NETSERVICES_SHIM')
-
 project.AddModuleIncludes("common/netio/pub/platform/s
ymbian")
 
 ### Add resource files...
Index:
clientapps/symbianplayer/platform/symbian/chxavplayer.cpp
============================================================
=======
RCS file:
/cvsroot/clientapps/symbianplayer/platform/symbian/chxavplay
er.cpp,v
retrieving revision 1.52
diff -u -r1.52 chxavplayer.cpp
---
clientapps/symbianplayer/platform/symbian/chxavplayer.cpp	13
Oct 2005 19:00:33 -0000	1.52
+++
clientapps/symbianplayer/platform/symbian/chxavplayer.cpp	7
Dec 2006 13:23:50 -0000
 -33,6
+33,7 
 #include "comptr_traits.h"
 #include "chxavutil.h"
 #include "chxavplayer.h"
+#include "hxnet.h"
 
 namespace
 {
 -672,9
+673,11 
     comptr<IHXErrorSinkControl> control;
     control.From(m_hxPlayer);
     control->AddErrorSink(this, HXLOG_EMERG,
HXLOG_INFO);
-
+    IHXNetServices* pServices = NULL;
+    m_hxPlayer->QueryInterface(IID_IHXNetServices,
(void**)&pServices);
     // set us up as ap selector
-    m_apManager.From(m_hxPlayer);
+    m_apManager.From(pServices);
+    HX_RELEASE(pServices);
     if(m_apManager)
     {
         m_apManager->RegisterSelector(this);
		 
Index: common/netio/platform/symbian/hxsymbiannet.cpp
============================================================
=======
RCS file:
/cvsroot/common/netio/platform/symbian/hxsymbiannet.cpp,v
retrieving revision 1.1
diff -u -r1.1 hxsymbiannet.cpp
--- common/netio/platform/symbian/hxsymbiannet.cpp	29 Sep
2005 21:02:47 -0000	1.1
+++ common/netio/platform/symbian/hxsymbiannet.cpp	7 Dec
2006 13:24:04 -0000
 -108,9
+108,14 
 };
 
 
-CHXClientNetServices* CreateClientNetServices(IUnknown*
/*pContext*/)
+CHXClientNetServices* CreateClientNetServices(IUnknown*
pContext)
 {
-    return new CHXClientNetServices();
+    CHXClientNetServices* pClientNetServices	=  new
CHXClientNetServices();
+    if(pClientNetServices)
+    {
+        pClientNetServices->Init(pContext);
+    }
+    return pClientNetServices;
 }
 
 TUint
Index: common/netio/platform/symbian/hxsymbianresolver.cpp
============================================================
=======
RCS file:
/cvsroot/common/netio/platform/symbian/hxsymbianresolver.cpp
,v
retrieving revision 1.1
diff -u -r1.1 hxsymbianresolver.cpp
--- common/netio/platform/symbian/hxsymbianresolver.cpp	29
Sep 2005 21:02:47 -0000	1.1
+++ common/netio/platform/symbian/hxsymbianresolver.cpp	7
Dec 2006 13:24:05 -0000
 -132,7
+132,7 
         HX_ADDREF(m_pResponse);
     }
 
-   
m_pContext->QueryInterface(IID_IHXAccessPointManager,
+   
m_pNetServices->QueryInterface(IID_IHXAccessPointManager,
             (void**)&m_pAPManager);
     if (!m_pAPManager)
     {
Index: common/netio/platform/symbian/hxsymbiansocket.cpp
============================================================
=======
RCS file:
/cvsroot/common/netio/platform/symbian/hxsymbiansocket.cpp,v
retrieving revision 1.2
diff -u -r1.2 hxsymbiansocket.cpp
--- common/netio/platform/symbian/hxsymbiansocket.cpp	21 Jul
2006 19:15:54 -0000	1.2
+++ common/netio/platform/symbian/hxsymbiansocket.cpp	7 Dec
2006 13:24:05 -0000
 -227,7
+227,7 
             m_uReadSize = UDP_READ_SIZE_READCONTINUATION;
         }
 
-       
m_pContext->QueryInterface(IID_IHXAccessPointManager,
+       
m_pNetSvc->QueryInterface(IID_IHXAccessPointManager,
              (void**)&m_pAPManager);
 
         if (m_pAPManager ==
NULL)_______________________________________________
Clientapps-dev mailing list
Clientapps-devhelixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/
clientapps-dev