rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/platform/wm/rhodes/AppManager.cpp

@@ -31,6 +31,7 @@
 #ifdef ENABLE_DYNAMIC_RHOBUNDLE
 #include "net/INetRequest.h"
 
+#include "common/app_build_capabilities.h"
 #include "common/RhodesApp.h"
 
 #include "unzip/unzip.h"
@@ -221,10 +222,20 @@ int CAppManager::removeOldRhoBundle (void)
 		return RRB_REMOVEOLD_ERR;
 	}
 
-	if (!RemoveFolder(root + "lib")) {
-		LOG(ERROR) + "Failed to remove" + "\"" + (root + "lib	") + "\"";
-		return RRB_REMOVEOLD_ERR;
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+	const char *rhopath = rho_native_rhopath();
+	const char *runtimepath = rho_native_reruntimepath();
+	int rhopath_len = strlen(rhopath);
+	int runtimepath_len = strlen(runtimepath);
+	if ((rhopath_len > 0) && (rhopath_len == runtimepath_len) && (_strnicmp(rhopath, runtimepath, rhopath_len)==0)) {
+#endif
+		if (!RemoveFolder(root + "lib")) {
+			LOG(ERROR) + "Failed to remove" + "\"" + (root + "lib	") + "\"";
+			return RRB_REMOVEOLD_ERR;
+		}
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
 	}
+#endif
 	
 	return RRB_NONE_ERR;
 }

data/platform/wm/rhodes/IBrowserEngine.h

@@ -15,10 +15,17 @@ public:
     virtual BOOL BackOnTab(int iInstID,int iPagesBack = 1) = 0;
     virtual BOOL ForwardOnTab(int iInstID) = 0;
     virtual BOOL ReloadOnTab(bool bFromCache, UINT iTab) = 0;
+    virtual BOOL StopOnTab(UINT iTab) = 0;
     virtual BOOL NavigateToHtml(LPCTSTR szHtml) = 0;
     virtual LRESULT OnWebKitMessages(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) = 0;
     virtual void RunMessageLoop(CMainWindow& mainWnd) = 0;
     virtual void SetCookie(char* url, char* cookie) = 0;
+    virtual bool isExistJavascript(const wchar_t* szJSFunction, int index) = 0;
+    virtual void executeJavascript(const wchar_t* szJSFunction, int index) = 0;
+    virtual BOOL ZoomPageOnTab(float fZoom, UINT iTab) = 0;
+    virtual BOOL ZoomTextOnTab(int nZoom, UINT iTab) = 0;
+    virtual int GetTextZoomOnTab(UINT iTab) = 0;
+    virtual BOOL GetTitleOnTab(LPTSTR szURL, UINT iMaxLen, UINT iTab) = 0;
 };
 
 }

data/platform/wm/rhodes/IEBrowserEngine.cpp

@@ -70,6 +70,31 @@ BOOL CIEBrowserEngine::ReloadOnTab(bool bFromCache, UINT iTab)
     return m_spIWebBrowser2->Refresh() == S_OK;
 }
 
+BOOL CIEBrowserEngine::StopOnTab(UINT iTab)
+{
+    return FALSE;
+}
+
+BOOL CIEBrowserEngine::ZoomPageOnTab(float fZoom, UINT iTab)
+{
+    return FALSE;
+}
+
+BOOL CIEBrowserEngine::ZoomTextOnTab(int nZoom, UINT iTab)
+{
+    return FALSE;
+}
+
+int CIEBrowserEngine::GetTextZoomOnTab(UINT iTab)
+{
+    return 2; //Normal
+}
+
+BOOL CIEBrowserEngine::GetTitleOnTab(LPTSTR szURL, UINT iMaxLen, UINT iTab)
+{
+    return FALSE;
+}
+
 static void writeHtmlToTheDoc (
 #if defined(_WIN32_WCE) && !defined( OS_PLATFORM_MOTCE )
 					IPIEHTMLDocument2 *document
@@ -140,6 +165,9 @@ void CIEBrowserEngine::RunMessageLoop(CMainWindow& mainWnd)
     MSG msg;
     while (GetMessage(&msg, NULL, 0, 0))
     {
+        if ( RHODESAPP().getExtManager().onWndMsg(msg) )
+            continue;
+
         if (!mainWnd.TranslateAccelerator(&msg))
         {
             TranslateMessage(&msg);
@@ -148,6 +176,21 @@ void CIEBrowserEngine::RunMessageLoop(CMainWindow& mainWnd)
     }
 }
 
+bool CIEBrowserEngine::isExistJavascript(const wchar_t* szJSFunction, int index)
+{
+    return true;
+}
+
+void CIEBrowserEngine::executeJavascript(const wchar_t* szJSFunction, int index)
+{
+    StringW strUrlW;
+    if(_memicmp(szJSFunction,L"JavaScript:",11*2) != 0)
+        strUrlW = L"javascript:";
+
+    strUrlW += szJSFunction;
+    Navigate(strUrlW.c_str());
+}
+
 void CIEBrowserEngine::SetCookie(char* url, char* cookie)
 {
 	URL_COMPONENTSA uri;

data/platform/wm/rhodes/IEBrowserEngine.h

@@ -29,8 +29,15 @@ public:
     virtual BOOL BackOnTab(int iInstID,int iPagesBack = 1);
     virtual BOOL ForwardOnTab(int iInstID);
     virtual BOOL ReloadOnTab(bool bFromCache, UINT iTab);
+    virtual BOOL StopOnTab(UINT iTab);
     virtual BOOL NavigateToHtml(LPCTSTR szHtml);
     virtual LRESULT OnWebKitMessages(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
     virtual void RunMessageLoop(CMainWindow& mainWnd);
     virtual void SetCookie(char* url, char* cookie);
+    virtual bool isExistJavascript(const wchar_t* szJSFunction, int index);
+    virtual void executeJavascript(const wchar_t* szJSFunction, int index);
+    virtual BOOL ZoomPageOnTab(float fZoom, UINT iTab);
+    virtual BOOL ZoomTextOnTab(int nZoom, UINT iTab);
+    virtual int GetTextZoomOnTab(UINT iTab);
+    virtual BOOL GetTitleOnTab(LPTSTR szURL, UINT iMaxLen, UINT iTab);
 };

data/platform/wm/rhodes/LogOptionsDlg.cpp

@@ -54,7 +54,7 @@ LRESULT CLogOptionsDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
     mbi.hInstRes = _AtlBaseModule.GetResourceInstance();
     mbi.dwFlags    = SHCMBF_HMENU;
     SHCreateMenuBar(&mbi);
-#else
+#elif defined (OS_PLATFORM_MOTCE) 
 	SetWindowLong(GWL_STYLE,(long)WS_BORDER);
 
 	m_hWndCommandBar = CommandBar_Create(_AtlBaseModule.GetResourceInstance(), m_hWnd, 1);

data/platform/wm/rhodes/MainWindow.cpp

@@ -140,6 +140,29 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
     return S_OK;
 }
 
+#if defined( OS_PLATFORM_MOTCE )
+void CMainWindow::SetFullScreen(bool bFull)
+{
+	HWND hTaskBar = FindWindow(_T("HHTaskBar"), NULL);
+	if(!hTaskBar) 
+		return;
+	::ShowWindow(hTaskBar, !bFull ? SW_SHOW : SW_HIDE);
+
+	if(g_hWndCommandBar)
+		::ShowWindow(g_hWndCommandBar, !bFull ? SW_SHOW : SW_HIDE);
+
+	RECT rect = { 0 };
+	SystemParametersInfo(SPI_GETWORKAREA, NULL, &rect, FALSE);
+	
+	if(bFull)
+		rect.bottom =  GetSystemMetrics(SM_CYSCREEN);
+	
+	MoveWindow(&rect);
+
+	m_bFullScreen = bFull;
+}
+#endif
+
 LRESULT CMainWindow::InitMainWindow()
 {
     HRESULT hr = S_OK;
@@ -256,9 +279,12 @@ LRESULT CMainWindow::InitMainWindow()
 
 #endif
 
-#if defined(_WIN32_WCE) && !defined( OS_PLATFORM_MOTCE )
+#if defined(_WIN32_WCE)
 	//Set fullscreen after window resizing
-	if ( RHOCONF().getBool("full_screen"))
+#if defined( OS_PLATFORM_MOTCE )
+	m_bFullScreen = RHOCONF().getBool("full_screen");
+#endif
+	if (RHOCONF().getBool("full_screen"))
    	    SetFullScreen(true);
 #endif
 
@@ -325,8 +351,10 @@ LRESULT CMainWindow::OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam
 {
 	rho_rhodesapp_callUiDestroyedCallback();
 
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)  && !defined(OS_PLATFORM_MOTCE)
     m_menuBar = NULL;
+    ShowTaskBar(true, false);
+   	//SetFullScreen(false);
 #endif
 
 #if defined(OS_WINDOWS)
@@ -377,7 +405,7 @@ LRESULT CMainWindow::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOO
         rect.bottom -= m_toolbar.getHeight();
 
 #if defined( OS_PLATFORM_MOTCE )
-    if (g_hWndCommandBar)
+    if (!m_bFullScreen && g_hWndCommandBar)
     {
         CRect rcCmdBar;
         ::GetWindowRect(g_hWndCommandBar, &rcCmdBar);
@@ -435,6 +463,26 @@ LRESULT CMainWindow::OnBeforeNavigate(UINT uMsg, WPARAM wParam, LPARAM lParam, B
     return 0;
 }
 
+LRESULT CMainWindow::OnNavigateTimeout (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
+{
+    return RHODESAPP().getExtManager().OnNavigateTimeout((LPCTSTR)lParam);
+}
+
+LRESULT CMainWindow::OnNavigateError (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
+{
+    return RHODESAPP().getExtManager().OnNavigateError((LPCTSTR)lParam);
+}
+
+LRESULT CMainWindow::OnSetSIPState (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
+{
+    return RHODESAPP().getExtManager().OnSIPState(lParam != 0 ? true:false);
+}
+
+LRESULT CMainWindow::OnAlertPopup (UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
+{
+    return RHODESAPP().getExtManager().OnAlertPopup(wParam, (void*)lParam);
+}
+
 #endif //APP_BUILD_CAPABILITY_WEBKIT_BROWSER
 
 LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
@@ -444,6 +492,7 @@ LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOO
 
     int fActive = LOWORD(wParam);
 	rho_rhodesapp_callAppActiveCallback(fActive);
+    RHODESAPP().getExtManager().OnAppActivate(fActive!=0);
 
 #if defined(_WIN32_WCE)  && !defined (OS_PLATFORM_MOTCE)
     // Notify shell of our WM_ACTIVATE message
@@ -672,8 +721,8 @@ LRESULT CMainWindow::OnLogCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWn
 
 LRESULT CMainWindow::OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND hwnd, BOOL& /*bHandled*/)
 {
-#if defined (_WIN32_WCE) && !defined( OS_PLATFORM_MOTCE )
-	SetFullScreen(!m_bFullScreen);
+#if defined (_WIN32_WCE)
+    SetFullScreen( hwnd != 0 ? true : false);
 #endif
 	return 0;
 };
@@ -695,6 +744,37 @@ LRESULT CMainWindow::OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND
     return 0;
 }
 
+LRESULT CMainWindow::OnExecuteJSCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
+{
+	LPTSTR wcurl = (LPTSTR)hWndCtl;
+	if (wcurl) 
+    {
+        m_pBrowserEng->executeJavascript(wcurl,0);
+		free(wcurl);
+	}
+    return 0;
+}
+
+LRESULT CMainWindow::OnStopNavigate(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
+{
+    m_pBrowserEng->StopOnTab((UINT)hWndCtl);
+    return 0;
+}
+
+LRESULT CMainWindow::OnZoomPage(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
+{
+    float fZoom = (float)(long)(hWndCtl);
+    m_pBrowserEng->ZoomPageOnTab(fZoom, rho_webview_active_tab());
+    return 0;
+}
+
+LRESULT CMainWindow::OnZoomText(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
+{
+    int nZoom = (int)hWndCtl;
+    m_pBrowserEng->ZoomTextOnTab(nZoom, rho_webview_active_tab());
+    return 0;
+}
+
 #if defined(OS_WINDOWS) || defined( OS_PLATFORM_MOTCE )
 LRESULT CMainWindow::OnPopupMenuCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) 
 {
@@ -926,7 +1006,7 @@ bool Rhodes_WM_ProcessBeforeNavigate(LPCTSTR url)
 {
     LOG(TRACE) + "OnBeforeNavigate2: " + url;
 
-    RHODESAPP().getExtManager().onBeforeNavigate();
+    RHODESAPP().getExtManager().onBeforeNavigate(url);
 
     const wchar_t *to_remove;
     if ( (to_remove = wcsstr(url, L"rho_open_target=_blank")) != 0)
@@ -1000,7 +1080,10 @@ void CMainWindow::ProcessNavigateComplete(LPCTSTR url)
 	if ( !m_bLoading && !mIsBrowserViewHided )
         ::ShowWindow(m_pBrowserEng->GetHTMLWND(), SW_SHOW);
 
+
     LOG(TRACE) + "OnNavigateComplete2: " + url;
+
+    RHODESAPP().getExtManager().onNavigateComplete(url);
 }
 
 void CMainWindow::ShowLoadingPage()
@@ -1054,6 +1137,8 @@ void CMainWindow::ProcessDocumentComplete(LPCTSTR url)
 #endif	
     
     //CMetaHandler oHandler(m_spIWebBrowser2);
+
+    RHODESAPP().getExtManager().onDocumentComplete(url);
 }
 
 void __stdcall CMainWindow::OnCommandStateChange(long lCommand, BOOL bEnable)

data/platform/wm/rhodes/MainWindow.h

@@ -68,6 +68,11 @@ extern UINT WM_BROWSER_ONDOCUMENTCOMPLETE;
 extern UINT WM_BROWSER_ONNAVIGATECOMPLETE;
 extern UINT WM_BROWSER_ONTITLECHANGE;
 extern UINT WM_BROWSER_ONBEFORENAVIGATE;
+extern UINT WM_BROWSER_ONNAVIGATIONTIMEOUT;
+extern UINT WM_BROWSER_ONNAVIGATIONERROR;
+extern UINT WM_BROWSER_ONSETSIPSTATE;
+extern UINT WM_BROWSER_ONALERTPOPUP;
+
 #else
 #if defined (_WIN32_WCE) && !defined( OS_PLATFORM_MOTCE )
 #include <pvdispid.h>
@@ -129,12 +134,17 @@ public:
     // Required to forward messages to the PIEWebBrowser control
     BOOL TranslateAccelerator(MSG* pMsg);
 
+#if defined( OS_PLATFORM_MOTCE )
+   	void SetFullScreen(bool bFull);
+	bool m_bFullScreen;
+#endif
+
 	void openNativeView(	NativeViewFactory* nativeViewFactory, 
 							NativeView* nativeView,
 							String nativeViewType);
 	void closeNativeView();
     rho::IBrowserEngine* getWebKitEngine(){return m_pBrowserEng; }
-    
+
 #if defined(OS_WINDOWS)
     DECLARE_WND_CLASS(TEXT("Rhodes.MainWindow"))
 #else
@@ -165,6 +175,10 @@ public:
         COMMAND_ID_HANDLER(IDM_SK1_EXIT, OnBackCommand)
         COMMAND_ID_HANDLER(IDM_REFRESH, OnRefreshCommand)
 		COMMAND_ID_HANDLER(IDM_NAVIGATE, OnNavigateCommand)
+        COMMAND_ID_HANDLER(IDM_EXECUTEJS, OnExecuteJSCommand)
+        COMMAND_ID_HANDLER(IDM_STOPNAVIGATE, OnStopNavigate)
+        COMMAND_ID_HANDLER(IDM_ZOOMPAGE, OnZoomPage)
+        COMMAND_ID_HANDLER(IDM_ZOOMTEXT, OnZoomText)
         COMMAND_ID_HANDLER(IDM_LOG,OnLogCommand)
 		COMMAND_ID_HANDLER(ID_FULLSCREEN, OnFullscreenCommand)
         COMMAND_ID_HANDLER(ID_SETCOOKIE, OnSetCookieCommand)
@@ -195,6 +209,11 @@ public:
         MESSAGE_HANDLER(WM_BROWSER_ONNAVIGATECOMPLETE, OnNavigateComplete);
         MESSAGE_HANDLER(WM_BROWSER_ONTITLECHANGE, OnTitleChange);
         MESSAGE_HANDLER(WM_BROWSER_ONBEFORENAVIGATE, OnBeforeNavigate);
+        MESSAGE_HANDLER(WM_BROWSER_ONNAVIGATIONTIMEOUT, OnNavigateTimeout);
+        MESSAGE_HANDLER(WM_BROWSER_ONNAVIGATIONERROR, OnNavigateError);
+        MESSAGE_HANDLER(WM_BROWSER_ONSETSIPSTATE, OnSetSIPState);
+        MESSAGE_HANDLER(WM_BROWSER_ONALERTPOPUP, OnAlertPopup);
+
         MESSAGE_RANGE_HANDLER(PB_NAVIGATETAB, PB_NEWGPSDATA, OnWebKitMessages)
 #endif
 
@@ -218,6 +237,10 @@ private:
     LRESULT OnNavigateForwardCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnRefreshCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnExecuteJSCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnStopNavigate(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnZoomPage(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnZoomText(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnLogCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnSetCookieCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
@@ -251,6 +274,10 @@ private:
     LRESULT OnTitleChange (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnWebKitMessages (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnBeforeNavigate (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);    
+    LRESULT OnNavigateTimeout (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);    
+    LRESULT OnNavigateError (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);    
+    LRESULT OnSetSIPState (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);    
+    LRESULT OnAlertPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);    
 #endif
 
 public:

data/platform/wm/rhodes/MapView/MapViewManager.cpp

@@ -144,7 +144,7 @@ LRESULT CRhoMapViewDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
 		::SendMessage(GetDlgItem(IDC_SLIDER_ZOOM).m_hWnd, TBM_SETPOS, TRUE, dwPos); 
 
 		String strImagePath = "lib/res/blue_pushpin.png";
-		String fullImagePath = CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath);
+		String fullImagePath = CFilePath::join( RHODESAPP().getRhoRuntimePath(), strImagePath);
 		IDrawingImage* pinImg = ourDrawingDevice.createImage(fullImagePath, true);
 
         PIN_INFO pin_info = {0};
@@ -158,7 +158,7 @@ LRESULT CRhoMapViewDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
 		ourMapView->setPinImage(pinImg, pin_info);
 
 		strImagePath = "lib/res/callout.png";
-		fullImagePath = CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath);
+		fullImagePath = CFilePath::join( RHODESAPP().getRhoRuntimePath(), strImagePath);
 		IDrawingImage* pinCalloutImg = ourDrawingDevice.createImage(fullImagePath, true);
 
         PIN_INFO pin_callout_info = {0};
@@ -170,12 +170,12 @@ LRESULT CRhoMapViewDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
 		ourMapView->setPinCalloutImage(pinCalloutImg, pin_callout_info);
 
 		strImagePath = "lib/res/callout_link.png";
-		fullImagePath = CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath);
+		fullImagePath = CFilePath::join( RHODESAPP().getRhoRuntimePath(), strImagePath);
 		IDrawingImage* pinCalloutLinkImg = ourDrawingDevice.createImage(fullImagePath, true);
 		ourMapView->setPinCalloutLinkImage(pinCalloutLinkImg, pin_callout_info);
 
 		strImagePath = "lib/res/esri.png";
-		fullImagePath = CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath);
+		fullImagePath = CFilePath::join( RHODESAPP().getRhoRuntimePath(), strImagePath);
 		IDrawingImage* esriLogoImg = ourDrawingDevice.createImage(fullImagePath, true);
 		ourMapView->setESRILogoImage(esriLogoImg);
 	}

data/platform/wm/rhodes/Rhodes.cpp

@@ -38,6 +38,8 @@
 #include "common/RhoFilePath.h"
 #include "common/app_build_capabilities.h"
 
+#include <algorithm>
+
 using namespace rho;
 using namespace rho::common;
 using namespace std;
@@ -59,7 +61,6 @@ extern "C" int rho_sys_check_rollback_bundle(const char* szRhoPath);
 class CEng;
 extern "C" CEng* rho_wmimpl_get_webkitbrowser(HWND hParentWnd, HINSTANCE hInstance);
 extern rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance);
-
 #endif
 
 
@@ -117,8 +118,14 @@ class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
 {
     static HINSTANCE m_hInstance;
     CMainWindow m_appWindow;
-    rho::String m_strRootPath, m_strRhodesPath, m_logPort;//, m_strDebugHost, m_strDebugPort;*/
+    rho::String m_strRootPath, m_strRhodesPath, m_logPort, m_strRuntimePath;//, m_strDebugHost, m_strDebugPort;*/
 	int m_nRestarting;
+    CExtManager m_oExtManager;
+
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+    static WCHAR g_ConfigFilePath[MAX_PATH + 1];
+    static TCHAR g_StartPage[MAX_PATH + 1];
+#endif // APP_BUILD_CAPABILITY_MOTOROLA
 
 #ifdef OS_WINDOWS
     String m_strHttpProxy;
@@ -128,6 +135,14 @@ public :
     static HINSTANCE GetModuleInstance(){return m_hInstance;}
     static void SetModuleInstance(HINSTANCE hInstance){m_hInstance = hInstance;}
 
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+    static void setConfigFilePath(const char* path);
+    static void setStartPage(const char* path);
+    static void setStartPage(const TCHAR* tpath);
+    static WCHAR* getConfigFilePath();
+    static TCHAR* getStartPage();
+#endif // APP_BUILD_CAPABILITY_MOTOROLA
+
     HWND GetMainWindow() { return m_appWindow.m_hWnd;}
 	CMainWindow* GetMainWindowObject() { return &m_appWindow;}
 	CMainWindow& GetAppWindow() { return m_appWindow; }
@@ -142,6 +157,7 @@ public :
     HRESULT PreMessageLoop(int nShowCmd) throw();
     void RunMessageLoop( ) throw( );
     const rho::String& getRhoRootPath();
+    const rho::String& getRhoRuntimePath();
     void parseHttpProxyURI(const rho::String &http_proxy);
 };
 
@@ -150,6 +166,33 @@ HINSTANCE CRhodesModule::m_hInstance;
 CRhodesModule _AtlModule;
 bool g_restartOnExit = false;
 
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+WCHAR CRhodesModule::g_ConfigFilePath[MAX_PATH + 1] = {0};
+TCHAR CRhodesModule::g_StartPage[MAX_PATH + 1] = {0};
+
+extern "C" WCHAR* rho_wmimpl_get_configfilepath()
+{
+    return CRhodesModule::getConfigFilePath();
+}
+extern "C" TCHAR* rho_wmimpl_get_startpage()
+{
+    return CRhodesModule::getStartPage();
+}
+extern "C" void rho_wmimpl_set_configfilepath(const char* path)
+{
+    CRhodesModule::setConfigFilePath(path);
+}
+extern "C" void rho_wmimpl_set_startpage(const char* path)
+{
+    CRhodesModule::setStartPage(path);
+}
+extern "C" void rho_wmimpl_set_startpage_tchar(const TCHAR* path)
+{
+    CRhodesModule::setStartPage(path);
+}
+#endif // APP_BUILD_CAPABILITY_MOTOROLA
+
+
 #ifndef RHODES_EMULATOR
 rho::IBrowserEngine* rho_wmimpl_createBrowserEngine(HWND hwndParent)
 {
@@ -190,6 +233,41 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 				m_logPort = rho::String("11000");
 			}
 		}
+
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+        else if (wcsnicmp(lpszToken, _T("s"),1)==0)
+        {
+			String token = convertToStringA(lpszToken);
+			char* path = parseToken( token.c_str(), token.length() );
+			if (path) {
+				if ((_strnicmp(path+strlen(path)-1,".html",5)==0) || (_strnicmp(path+strlen(path)-5,".htm",4)==0))
+                {
+					// RhoElements v1.0 compatibility mode
+					rho_wmimpl_set_startpage(path);
+                } else {
+					// RhoElements v2.0 mode
+					m_strRootPath = path;
+                    if (m_strRootPath.substr(0,7).compare("file://")==0)
+                        m_strRootPath.erase(0,7);
+                    ::std::replace(m_strRootPath.begin(), m_strRootPath.end(), '\\', '/');
+                    if (m_strRootPath.at(m_strRootPath.length()-1)!='/')
+                        m_strRootPath.append("/");
+                    m_strRootPath.append("rho/");
+				}
+				free(path);
+			}
+        }
+        else if (wcsnicmp(lpszToken, _T("c"),1)==0)
+        {
+			String token = convertToStringA(lpszToken);
+            char* path = parseToken( token.c_str(), token.length() );
+			if (path) {
+				rho_wmimpl_set_configfilepath(path);
+				free(path);
+			}
+        }
+#endif // APP_BUILD_CAPABILITY_MOTOROLA
+
 #if defined(OS_WINDOWS)
 		else if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) 
         {
@@ -278,6 +356,46 @@ extern "C" void rho_sys_impl_exit_with_errormessage(const char* szTitle, const c
 extern "C" void rho_scanner_TEST(HWND hwnd);
 extern "C" void rho_scanner_TEST2();
 
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+
+WCHAR* CRhodesModule::getConfigFilePath()
+{
+    return g_ConfigFilePath;
+}
+
+TCHAR* CRhodesModule::getStartPage()
+{
+    return g_StartPage;
+}
+
+void CRhodesModule::setConfigFilePath(const char* path)
+{
+    USES_CONVERSION;
+    WCHAR* wpath = A2W(path);
+    _tcscpy(g_ConfigFilePath, wpath);
+}
+
+void CRhodesModule::setStartPage(const char* path)
+{
+    USES_CONVERSION;
+    TCHAR* tpath = A2T(path);
+    setStartPage(tpath);
+}
+
+void CRhodesModule::setStartPage(const TCHAR* tpath)
+{
+    _tcscpy(g_StartPage, tpath);
+    // Store command line parameter in the registry
+    HKEY hKey;
+    DWORD Disposition;
+    RegCreateKeyEx( HKEY_CURRENT_USER, L"Software\\Symbol\\SymbolPB\\Temp", 0, NULL, 0, 0, 0, &hKey, &Disposition ); 
+    RegSetValueEx(hKey, L"cmdline", 0, REG_MULTI_SZ, (const BYTE *) tpath, (wcslen(tpath)+1)*2); 
+    RegCloseKey(hKey);
+}
+
+#endif // APP_BUILD_CAPABILITY_MOTOROLA
+
+
 // This method is called immediately before entering the message loop.
 // It contains initialization code for the application.
 // Returns:
@@ -397,7 +515,8 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
 		return S_FALSE;
     }
 
-    rho::common::CRhodesApp::Create(m_strRootPath, m_strRootPath);
+    rho::common::CRhodesApp::Create(m_strRootPath, m_strRootPath, m_strRuntimePath);
+    RHODESAPP().setExtManager( &m_oExtManager );
 
     DWORD dwStyle = WS_VISIBLE;
 
@@ -422,6 +541,14 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
     }
 #endif
 
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+    if (rho_wmimpl_get_startpage()[0] != 0) {
+        String spath = convertToStringA(rho_wmimpl_get_startpage());
+        RHOCONF().setString("start_path", spath, false);
+    }
+#endif // APP_BUILD_CAPABILITY_MOTOROLA
+
+
     m_appWindow.InitMainWindow();
 #endif
     if (NULL == m_appWindow.m_hWnd)
@@ -521,6 +648,13 @@ void CRhodesModule::RunMessageLoop( ) throw( )
 const rho::String& CRhodesModule::getRhoRootPath()
 {
     if ( m_strRootPath.length() == 0 )
+        m_strRootPath = getRhoRuntimePath();
+    return m_strRootPath;
+}
+
+const rho::String& CRhodesModule::getRhoRuntimePath()
+{
+    if ( m_strRuntimePath.length() == 0 )
     {
         char rootpath[MAX_PATH];
         int len;
@@ -533,15 +667,15 @@ const rho::String& CRhodesModule::getRhoRootPath()
             rootpath[len+1]=0;
         }
 
-        m_strRootPath = rootpath;
-        m_strRootPath += "rho\\";
+        m_strRuntimePath = rootpath;
+        m_strRuntimePath += "rho\\";
 
-        for(unsigned int i = 0; i < m_strRootPath.length(); i++ )
-            if ( m_strRootPath.at(i) == '\\' )
-                m_strRootPath[i] = '/';
+        for(unsigned int i = 0; i < m_strRuntimePath.length(); i++ )
+            if ( m_strRuntimePath.at(i) == '\\' )
+                m_strRuntimePath[i] = '/';
     }
 
-    return m_strRootPath; 
+    return m_strRuntimePath; 
 }
 
 extern "C" int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/,
@@ -609,6 +743,11 @@ extern "C" const char* rho_native_rhopath()
     return _AtlModule.getRhoRootPath().c_str();
 }
 
+extern "C" const char* rho_native_reruntimepath() 
+{
+    return _AtlModule.getRhoRuntimePath().c_str();
+}
+
 extern "C" HINSTANCE rho_wmimpl_get_appinstance()
 {
     return _AtlModule.GetModuleInstance();
@@ -712,7 +851,7 @@ char* parseToken( const char* start, int len ) {
 
     int i = 0;
     for( i = 0; i < len; i++ ){
-        if ( start[i] == '=' ){
+        if (( start[i] == '=' ) || ( start[i] == ':' ) || ( start[i] == ' ' )) {
             if ( i > 0 ){
                 int s = i-1;
                 for(; s >= 0 && start[s]==' '; s-- );