rhodes 3.3.3.beta.4 → 3.3.3

data/platform/wm/rhodes/MainWindow.h

@@ -44,13 +44,12 @@
 #include "IBrowserEngine.h"
 #include "common/app_build_capabilities.h"
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 #include "menubar.h"
 #endif
 
 #include "LogView.h"
 
-#ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
 #define PB_NAVIGATETAB					WM_USER	+ 1
 #define PB_GEN_ACTIVEX					WM_USER	+ 2
 #define PB_GEN_QUIT						WM_USER + 3
@@ -64,6 +63,8 @@
 #define PB_SCREEN_ORIENTATION_CHANGED	WM_USER + 11
 #define PB_NEWGPSDATA					WM_USER + 12
 
+#ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
+
 extern UINT WM_BROWSER_ONDOCUMENTCOMPLETE;
 extern UINT WM_BROWSER_ONNAVIGATECOMPLETE;
 extern UINT WM_BROWSER_ONTITLECHANGE;
@@ -72,6 +73,8 @@ extern UINT WM_BROWSER_ONNAVIGATIONTIMEOUT;
 extern UINT WM_BROWSER_ONNAVIGATIONERROR;
 extern UINT WM_BROWSER_ONSETSIPSTATE;
 extern UINT WM_BROWSER_ONALERTPOPUP;
+extern UINT WM_BROWSER_ONAUTHENTICATIONREQUEST;
+//extern UINT WM_BROWSER_ONGPSDATA;
 
 #else
 #if defined (_WIN32_WCE) && !defined( OS_PLATFORM_MOTCE )
@@ -100,6 +103,7 @@ static UINT WM_BLUETOOTH_DISCOVERED    = ::RegisterWindowMessage(L"RHODES_WM_BLU
 static UINT WM_BLUETOOTH_CALLBACK	   = ::RegisterWindowMessage(L"RHODES_WM_BLUETOOTH_CALLBACK");
 static UINT WM_EXECUTE_COMMAND		   = ::RegisterWindowMessage(L"RHODES_WM_EXECUTE_COMMAND");
 static UINT WM_EXECUTE_RUNNABLE		   = ::RegisterWindowMessage(L"RHODES_WM_EXECUTE_RUNNABLE");
+extern UINT WM_LICENSE_SCREEN;
 
 typedef struct _TCookieData {
     char* url;
@@ -109,7 +113,7 @@ typedef struct _TCookieData {
 class CMainWindow :
 #if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_MOTCE )
 	public CFrameWindowImpl<CMainWindow>, 
-	public CFullScreenFrame<CMainWindow>
+	public CFullScreenFrame<CMainWindow, false>
 #else
     public CWindowImpl<CMainWindow, CWindow, CWinTraits<WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_CLIPCHILDREN | WS_CLIPSIBLINGS> >
 #endif
@@ -129,14 +133,16 @@ public:
     CNativeToolbar& getToolbar(){ return m_toolbar; }
     void performOnUiThread(rho::common::IRhoRunnable* pTask);
 
-    LRESULT InitMainWindow();
+    void calculateMainWindowRect(RECT& rcMainWindow);
+    void initBrowserWindow();
+    void resizeWindow( int xSize, int ySize);
 
     // Required to forward messages to the PIEWebBrowser control
     BOOL TranslateAccelerator(MSG* pMsg);
 
-#if defined( OS_PLATFORM_MOTCE )
-   	void SetFullScreen(bool bFull);
+#if defined(OS_WINCE)
 	bool m_bFullScreen;
+   	void RhoSetFullScreen(bool bFull, bool bDestroy = false);
 #endif
 
 	void openNativeView(	NativeViewFactory* nativeViewFactory, 
@@ -145,7 +151,7 @@ public:
 	void closeNativeView();
     rho::IBrowserEngine* getWebKitEngine(){return m_pBrowserEng; }
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
     DECLARE_WND_CLASS(TEXT("Rhodes.MainWindow"))
 #else
 	static ATL::CWndClassInfo& GetWndClassInfo() 
@@ -184,11 +190,11 @@ public:
         COMMAND_ID_HANDLER(ID_SETCOOKIE, OnSetCookieCommand)
 		COMMAND_RANGE_HANDLER(ID_CUSTOM_MENU_ITEM_FIRST, ID_CUSTOM_MENU_ITEM_LAST, OnCustomMenuItemCommand)
 		COMMAND_RANGE_HANDLER(ID_CUSTOM_TOOLBAR_ITEM_FIRST, ID_CUSTOM_TOOLBAR_ITEM_LAST, OnCustomToolbarItemCommand)
-#if defined(OS_WINDOWS) || defined( OS_PLATFORM_MOTCE )
+#if defined(OS_WINDOWS_DESKTOP) || defined( OS_PLATFORM_MOTCE )
 		COMMAND_ID_HANDLER(IDM_POPUP_MENU, OnPopupMenuCommand)
 #endif
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 		MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnPosChanged)
 #endif
 		MESSAGE_HANDLER(WM_TAKEPICTURE, OnTakePicture)
@@ -204,6 +210,9 @@ public:
 		MESSAGE_HANDLER(WM_BLUETOOTH_CALLBACK, OnBluetoothCallback);
 		MESSAGE_HANDLER(WM_EXECUTE_COMMAND, OnExecuteCommand);
         MESSAGE_HANDLER(WM_EXECUTE_RUNNABLE, OnExecuteRunnable);
+		MESSAGE_HANDLER(WM_LICENSE_SCREEN, OnLicenseScreen);
+        MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus);
+        MESSAGE_HANDLER(WM_HOTKEY, OnHotKey);
 #ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
         MESSAGE_HANDLER(WM_BROWSER_ONDOCUMENTCOMPLETE, OnBrowserDocumentComplete);
         MESSAGE_HANDLER(WM_BROWSER_ONNAVIGATECOMPLETE, OnNavigateComplete);
@@ -213,9 +222,11 @@ public:
         MESSAGE_HANDLER(WM_BROWSER_ONNAVIGATIONERROR, OnNavigateError);
         MESSAGE_HANDLER(WM_BROWSER_ONSETSIPSTATE, OnSetSIPState);
         MESSAGE_HANDLER(WM_BROWSER_ONALERTPOPUP, OnAlertPopup);
+        MESSAGE_HANDLER(WM_BROWSER_ONAUTHENTICATIONREQUEST, OnAuthenticationRequest);
+//        MESSAGE_HANDLER(WM_BROWSER_ONGPSDATA, OnGeolocationData);
+#endif
 
         MESSAGE_RANGE_HANDLER(PB_NAVIGATETAB, PB_NEWGPSDATA, OnWebKitMessages)
-#endif
 
     END_MSG_MAP()
 	
@@ -247,11 +258,11 @@ private:
 	LRESULT OnCustomMenuItemCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnCustomToolbarItemCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 
-#if defined(OS_WINDOWS) || defined( OS_PLATFORM_MOTCE )
+#if defined(OS_WINDOWS_DESKTOP) || defined( OS_PLATFORM_MOTCE )
 	LRESULT OnPopupMenuCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 #endif
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	LRESULT OnPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 #endif
 
@@ -268,16 +279,23 @@ private:
 	LRESULT OnBluetoothCallback (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnExecuteCommand (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnExecuteRunnable (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+	LRESULT OnLicenseScreen (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+    LRESULT OnSetFocus (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+    LRESULT OnHotKey (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+
+    LRESULT OnWebKitMessages (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+
 #ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
     LRESULT OnBrowserDocumentComplete (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnNavigateComplete (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     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*/);    
+    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*/);
+    LRESULT OnAuthenticationRequest (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+//    LRESULT OnGeolocationData (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 #endif
 
 public:
@@ -336,7 +354,7 @@ private:
 #if defined(_WIN32_WCE)
     // main menu bar for application
     CWindow m_menuBar;
-#elif defined (OS_WINDOWS)
+#elif defined (OS_WINDOWS_DESKTOP)
 	CMenuBar m_menuBar;
 //	int m_menuBarHeight;
 	CLogView m_logView;

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

@@ -124,7 +124,7 @@ public:
 */
 
 class CRhoMapViewDlg : public //CDialog
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	CDialogImpl<CRhoMapViewDlg>
 #else
 	CDialogImpl <CRhoMapViewDlg>

data/platform/wm/rhodes/OkCancelModalDialog.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#if defined(OS_WINDOWS)  || defined(OS_PLATFORM_MOTCE)
+#if defined(OS_WINDOWS_DESKTOP)  || defined(OS_PLATFORM_MOTCE)
 
 template <class T> class COkCancelModalDialog : public CDialogImpl<T> 
 {

data/platform/wm/rhodes/Rhodes.cpp

@@ -27,6 +27,9 @@
 #include "stdafx.h"
 #include "MainWindow.h"
 #include "IEBrowserEngine.h"
+//#if !defined(RHODES_EMULATOR) && !defined(OS_WINDOWS_DESKTOP)
+#include "LogMemory.h"
+//#endif
 
 #include "common/RhodesApp.h"
 #include "common/StringConverter.h"
@@ -37,8 +40,7 @@
 #include "sync/ClientRegister.h"
 #include "common/RhoFilePath.h"
 #include "common/app_build_capabilities.h"
-
-#include <algorithm>
+#include "common/app_build_configs.h"
 
 using namespace rho;
 using namespace rho::common;
@@ -50,28 +52,58 @@ typedef unsigned long VALUE;
 #endif //!RUBY_RUBY_H
 
 char* parseToken( const char* start, int len );
-
 extern "C" void rho_ringtone_manager_stop();
 extern "C" void rho_sysimpl_sethas_network(int nValue);
 extern "C" void rho_sysimpl_sethas_cellnetwork(int nValue);
 extern "C" HINSTANCE rho_wmimpl_get_appinstance();
 extern "C" int rho_sys_check_rollback_bundle(const char* szRhoPath);
+extern "C" void registerRhoExtension();
+extern "C" void rho_webview_navigate(const char* url, int index);
 
 #ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
 class CEng;
-class CConfig;
-extern "C" CEng* rho_wmimpl_get_webkitbrowser(HWND hParentWnd, HINSTANCE hInstance);
-extern "C" CConfig* rho_wmimpl_get_webkitconfig();
 extern rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance);
-extern "C" WCHAR* rho_wmimpl_get_configfilepath();
-extern "C" void rho_wmimpl_set_configfilepath(const char* path);
-extern "C" TCHAR* rho_wmimpl_get_startpage();
-extern "C" void rho_wmimpl_set_startpage(const char* path);
-extern "C" void rho_wmimpl_set_logpath(const TCHAR* path);
-extern "C" const char* rho_wmimpl_get_logpath();
-extern "C" const char* rho_wmimpl_get_logurl();
+extern "C" CEng* rho_wmimpl_get_webkitbrowser(HWND hParentWnd, HINSTANCE hInstance);
+#endif // APP_BUILD_CAPABILITY_WEBKIT_BROWSER
+#ifdef APP_BUILD_CAPABILITY_SHARED_RUNTIME
+extern "C" {
+	void rho_wmimpl_set_configfilepath(const char* path);
+	TCHAR* rho_wmimpl_get_startpage();
+	void rho_wmimpl_set_startpage(const char* path);
+	const char* rho_wmimpl_get_logpath();
+	const char* rho_wmimpl_get_logurl();
+	bool rho_wmimpl_get_fullscreen();
+	void rho_wmimpl_set_is_version2(const char* path);
+	bool rho_wmimpl_get_is_version2();
+
+#if !defined( APP_BUILD_CAPABILITY_WEBKIT_BROWSER ) && !defined(APP_BUILD_CAPABILITY_MOTOROLA)
+    bool rho_wmimpl_get_is_version2(){ return 1;}
+    void rho_wmimpl_set_is_version2(const char* path){}
+    void rho_wmimpl_set_configfilepath(const char* path){}
+    void rho_wmimpl_set_configfilepath_wchar(const WCHAR* path){}
+    void rho_wmimpl_set_startpage(const char* path){}
+    TCHAR* rho_wmimpl_get_startpage(){ return L""; }
+    const unsigned int* rho_wmimpl_get_logmemperiod(){ return 0; }
+    const unsigned int* rho_wmimpl_get_logmaxsize(){ return 0; }
+    const char* rho_wmimpl_get_logurl(){ return ""; }
+    bool rho_wmimpl_get_fullscreen(){ return 0; }
+    const char* rho_wmimpl_get_logpath(){ return ""; }
+    int rho_wmimpl_is_loglevel_enabled(int nLogLevel){ return true; }
+	const int* rho_wmimpl_get_loglevel(){ return NULL; }
 #endif
 
+	const unsigned int* rho_wmimpl_get_logmaxsize();
+	const int* rho_wmimpl_get_loglevel();
+	const unsigned int* rho_wmimpl_get_logmemperiod();
+};
+#endif // APP_BUILD_CAPABILITY_SHARED_RUNTIME
+
+#if !defined( APP_BUILD_CAPABILITY_MOTOROLA ) && !defined( APP_BUILD_CAPABILITY_WEBKIT_BROWSER)
+extern "C" bool rho_wmimpl_get_resize_on_sip()
+{
+    return true;
+}
+#endif
 
 #if defined(_WIN32_WCE) && !defined(OS_PLATFORM_MOTCE)
 #include <regext.h>
@@ -129,9 +161,12 @@ class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
     CMainWindow m_appWindow;
     rho::String m_strRootPath, m_strRhodesPath, m_logPort, m_strRuntimePath;//, m_strDebugHost, m_strDebugPort;*/
 	int m_nRestarting;
+#ifndef RHODES_EMULATOR
+	HANDLE m_hMutex;
+#endif
     CExtManager m_oExtManager;
 
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
     String m_strHttpProxy;
 #endif
 
@@ -154,6 +189,7 @@ public :
     const rho::String& getRhoRootPath();
     const rho::String& getRhoRuntimePath();
     void parseHttpProxyURI(const rho::String &http_proxy);
+
 };
 
 static String g_strCmdLine;
@@ -202,7 +238,7 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 			}
 		}
 
-#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+#if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
         else if (wcsnicmp(lpszToken, _T("s"),1)==0)
         {
 			String token = convertToStringA(lpszToken);
@@ -225,9 +261,9 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 				free(path);
 			}
         }
-#endif // APP_BUILD_CAPABILITY_MOTOROLA
+#endif // APP_BUILD_CAPABILITY_SHARED_RUNTIME
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 		else if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) 
         {
 			String token = convertToStringA(lpszToken);
@@ -258,6 +294,7 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 				}
 				m_strRootPath = path;
 				free(path);
+				String_replace(m_strRootPath, '\\', '/');
 			}
 		} else if (wcsncmp(lpszToken, _T("rhodespath"),10)==0) 
         {
@@ -267,6 +304,7 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 			if (path) {
 				m_strRhodesPath = path;
 				free(path);
+				String_replace(m_strRhodesPath, '\\', '/');
 			}
 		} /* else if (wcsncmp(lpszToken, _T("appname"),7)==0) 
         {
@@ -306,10 +344,13 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 				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(), '\\', '/');
+                String_replace(m_strRootPath, '\\', '/');
                 if (m_strRootPath.at(m_strRootPath.length()-1)!='/')
                     m_strRootPath.append("/");
                 m_strRootPath.append("rho/");
+#ifdef APP_BUILD_CAPABILITY_SHARED_RUNTIME
+                rho_wmimpl_set_is_version2(m_strRootPath.c_str());
+#endif
         	}
 			free(path);
         }
@@ -366,22 +407,44 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
 		SetForegroundWindow( HWND( DWORD(hWnd) | 0x01 ) );
 		return S_FALSE;
 	}
+
+	// creating mutex
+/*	m_hMutex = CreateMutex(NULL, TRUE, CMainWindow::GetWndClassInfo().m_wc.lpszClassName);
+	if (m_hMutex==NULL) {
+		// Failed to create mutex
+		return S_FALSE;
+	}
+	if ((GetLastError() == ERROR_ALREADY_EXISTS) && (WaitForSingleObject(m_hMutex, 60000L) != WAIT_OBJECT_0)) {
+        rho_sys_impl_exit_with_errormessage( "Initialization", "Another instance of the application is running. Please, exit it or use Task Manager to terminate it.");
+        return S_FALSE;
+	}*/
 #endif
 
     if ( !rho_sys_check_rollback_bundle(rho_native_rhopath()) )
     {
-        rho_sys_impl_exit_with_errormessage( "Bundle update.", "Application is currupted. Reinstall it , please.");
+        rho_sys_impl_exit_with_errormessage( "Bundle update", "Application is corrupted. Reinstall it, please.");
         return S_FALSE;
     }
 
-#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
-    CConfig* conf = rho_wmimpl_get_webkitconfig();
+#if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
     rho_logconf_Init((rho_wmimpl_get_logpath()[0]==0 ? m_strRootPath.c_str() : rho_wmimpl_get_logpath()), m_strRootPath.c_str(), m_logPort.c_str());
     if (rho_wmimpl_get_logurl()[0]!=0)
-        RHOCONF().setString("rhologurl", rho_wmimpl_get_logurl(), false);
+		LOGCONF().setLogURL(rho_wmimpl_get_logurl());
+	if (rho_wmimpl_get_logmaxsize())
+		LOGCONF().setMaxLogFileSize(*rho_wmimpl_get_logmaxsize());
+    if (rho_wmimpl_get_loglevel())
+		LOGCONF().setMinSeverity(*rho_wmimpl_get_loglevel());
+    if (rho_wmimpl_get_fullscreen())
+        RHOCONF().setBool("full_screen", true, false);
+	if (rho_wmimpl_get_logmemperiod())
+		LOGCONF().setCollectMemoryInfoInterval(*rho_wmimpl_get_logmemperiod());
 #else
     rho_logconf_Init(m_strRootPath.c_str(), m_strRootPath.c_str(), m_logPort.c_str());
-#endif // APP_BUILD_CAPABILITY_MOTOROLA
+#endif // APP_BUILD_CAPABILITY_SHARED_RUNTIME
+
+//#if !defined(RHODES_EMULATOR) && !defined(OS_WINDOWS_DESKTOP)
+	LOGCONF().setMemoryInfoCollector(CLogMemory::getInstance());
+//#endif // RHODES_EMULATOR
 
 #ifdef RHODES_EMULATOR
     RHOSIMCONF().setAppConfFilePath(CFilePath::join( m_strRootPath, RHO_EMULATOR_DIR"/rhosimconfig.txt").c_str());
@@ -403,7 +466,7 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
     }
 
 	LOG(INFO) + "Rhodes started";
-#ifdef OS_WINDOWS
+#ifdef OS_WINDOWS_DESKTOP
 	if (m_strHttpProxy.length() > 0) {
 		parseHttpProxyURI(m_strHttpProxy);
 	} else {
@@ -461,6 +524,13 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
     rho::common::CRhodesApp::Create(m_strRootPath, m_strRootPath, m_strRuntimePath);
     RHODESAPP().setExtManager( &m_oExtManager );
 
+#if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
+    if ((!rho_wmimpl_get_is_version2()) && (rho_wmimpl_get_startpage()[0] != 0)) {
+        String spath = convertToStringA(rho_wmimpl_get_startpage());
+        RHOCONF().setString("start_path", spath, false);
+    }
+#endif // APP_BUILD_CAPABILITY_SHARED_RUNTIME
+
     DWORD dwStyle = WS_VISIBLE;
 
 #if !defined(_WIN32_WCE)
@@ -469,11 +539,22 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
     // Create the main application window
 #ifdef RHODES_EMULATOR
     m_appWindow.Initialize(convertToStringW(RHOSIMCONF().getString("app_name")).c_str());
+    if (NULL == m_appWindow.m_hWnd)
+    {
+        return S_FALSE;
+    }
+    m_appWindow.ShowWindow(nShowCmd);
+
 #else
     String strTitle = RHODESAPP().getAppTitle();
     m_appWindow.Create(NULL, CWindow::rcDefault, convertToStringW(strTitle).c_str(), dwStyle);
 
-#ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
+    if (NULL == m_appWindow.m_hWnd)
+    {
+        return S_FALSE;
+    }
+
+/*#ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
     {
         CBarcodeInit oBarcodeInit;
 
@@ -483,33 +564,50 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
         }
     }
 #endif
+*/
+    m_appWindow.InvalidateRect(NULL, TRUE);
+    m_appWindow.UpdateWindow();
 
-#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();
+    m_appWindow.initBrowserWindow();
 #endif
-    if (NULL == m_appWindow.m_hWnd)
-    {
-        return S_FALSE;
-    }
-
 
-    RHODESAPP().startApp();
+    bool bRE1App = false;
+#if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
+    if (!rho_wmimpl_get_is_version2())
+        bRE1App = true;
+#endif
 
-    // Navigate to the "loading..." page
-	m_appWindow.Navigate2(_T("about:blank")
+    if (bRE1App)
+    {
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+        registerRhoExtension();
+#endif
+	    m_appWindow.Navigate2(_T("about:blank")
 #ifdef RHODES_EMULATOR
-        , -1
+            , -1
 #endif
-    );
+        );
+        
+        rho_webview_navigate( RHOCONF().getString("start_path").c_str(), 0 );
+/*    	m_appWindow.Navigate2( convertToStringW( RHOCONF().getString("start_path") ).c_str()
+#ifdef RHODES_EMULATOR
+            , -1
+#endif
+        );*/
+    }
+    else
+    {
+        RHODESAPP().startApp();
+
+        // Navigate to the "loading..." page
+	    m_appWindow.Navigate2(_T("about:blank")
+    #ifdef RHODES_EMULATOR
+            , -1
+    #endif
+        );
+    }
     // Show the main application window
-    m_appWindow.ShowWindow(nShowCmd);
+    //m_appWindow.ShowWindow(nShowCmd);
 
 #if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_MOTCE )
 
@@ -548,7 +646,7 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
 		NULL, 
 		&g_hNotifyCell);
 
-#else
+#elif !defined( OS_PLATFORM_MOTCE )
 	rho_clientregister_create("win32_client");
 #endif
 
@@ -586,6 +684,10 @@ void CRhodesModule::RunMessageLoop( ) throw( )
     rho::common::CRhodesApp::Destroy();
 
     net::CNetRequestImpl::deinitConnection();
+
+#ifndef RHODES_EMULATOR
+//	ReleaseMutex(m_hMutex);
+#endif
 }
 
 const rho::String& CRhodesModule::getRhoRootPath()
@@ -670,6 +772,67 @@ void rho_platform_restart_application()
     rho_wmsys_run_app(module, (g_strCmdLine + " -restarting").c_str());
 }
 
+typedef void (WINAPI *PCL)(HWND);
+typedef bool (WINAPI *PCSD)();
+
+#ifdef APP_BUILD_CAPABILITY_MOTOROLA
+extern "C" void rho_wm_impl_CheckLicenseWithBarcode(HWND hParent);
+#endif
+
+extern "C" void rho_wm_impl_CheckLicense()
+{
+#ifdef OS_WINDOWS_DESKTOP
+    return;
+#else
+
+#ifdef APP_BUILD_CAPABILITY_MOTOROLA
+    rho_wm_impl_CheckLicenseWithBarcode(getMainWnd());
+#else
+    HINSTANCE hLicenseInstance = LoadLibrary(L"license_rc.dll");
+    if(hLicenseInstance)
+    {
+        PCL pCheckLicense = (PCL) GetProcAddress(hLicenseInstance, L"CheckLicense");
+        if(pCheckLicense) 
+	        pCheckLicense(getMainWnd());
+    }
+#endif
+
+#endif
+}
+
+extern "C" int rho_wm_impl_CheckSymbolDevice()
+{
+#ifdef OS_WINDOWS_DESKTOP
+    //return false;
+	return true;
+#else 
+    int res = -1;
+    HINSTANCE hLicenseInstance = LoadLibrary(L"license_rc.dll");
+	if(!hLicenseInstance)
+	{
+		MessageBox(NULL, L"license_rc.dll is absent. Application will be closed"
+						   , L"Rhodes", MB_SETFOREGROUND | MB_TOPMOST | MB_ICONSTOP | MB_OK);
+		return 0;
+	}
+	/*if(hLicenseInstance)
+	{
+		PCSD pCheckSymbolDevice = (PCSD) GetProcAddress(hLicenseInstance, L"CheckSymbolDevice");
+		if(pCheckSymbolDevice) 
+			res = pCheckSymbolDevice();
+	}
+
+	if(res == -1)
+	{
+		MessageBox(NULL, L"license_rc.dll is absent. Application will be closed"
+						   , L"Rhodes", MB_SETFOREGROUND | MB_TOPMOST | MB_ICONSTOP | MB_OK);
+		return 0;
+	}*/
+
+    return 1;
+#endif
+
+}
+
 static inline char *
 translate_char(char *p, int from, int to)
 {
@@ -824,7 +987,7 @@ char* parseToken( const char* start, int len ) {
 	return value;
 }
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 /*
 // char -> wchar_t 
 wchar_t* wce_mbtowc(const char* a)