rhodes 3.4.2 → 3.5.1.12

data/platform/wm/rhodes/IEBrowserEngine.cpp

@@ -8,8 +8,7 @@
 #include <webvw.h>
 #endif
 
-extern "C" int rho_wm_impl_CheckLicense();
-extern "C" int rho_wm_impl_CheckSymbolDevice();
+extern "C" void rho_wm_impl_CheckLicense();
 
 CIEBrowserEngine::CIEBrowserEngine(HWND hParentWnd, HINSTANCE hInstance) :
     m_spIWebBrowser2(NULL)
@@ -177,9 +176,6 @@ LRESULT CIEBrowserEngine::OnWebKitMessages(UINT uMsg, WPARAM wParam, LPARAM lPar
 
 void CIEBrowserEngine::RunMessageLoop(CMainWindow& mainWnd)
 {
-    if (!rho_wm_impl_CheckSymbolDevice())
-        return;
-
 	MSG msg;
     while (GetMessage(&msg, NULL, 0, 0))
     {
@@ -243,7 +239,7 @@ void CIEBrowserEngine::OnDocumentComplete(LPCTSTR url)
 {
 	if(!m_bLoadingComplete && wcscmp(url,_T("about:blank"))!=0)
 	{
-		rho_wm_impl_CheckLicense();
+        rho_wm_impl_CheckLicense();
 		m_bLoadingComplete = true;
 	}
 }

data/platform/wm/rhodes/MainWindow.cpp

@@ -275,6 +275,8 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
 
 	rho_rhodesapp_callUiCreatedCallback();
 
+	RHODESAPP().setNetworkStatusMonitor(&m_networkStatusMonitor);
+
     return 0;
 }
 
@@ -579,6 +581,15 @@ LRESULT CMainWindow::OnAuthenticationRequest (UINT /*uMsg*/, WPARAM wParam, LPAR
 
 #endif //APP_BUILD_CAPABILITY_WEBKIT_BROWSER
 
+LRESULT CMainWindow::OnWindowMinimized (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
+{
+    ProcessActivate( FALSE, MAKEWPARAM(0,1), 0 );
+
+    ::ShowWindow( m_hWnd, SW_MINIMIZE );
+
+    return 0;
+}
+
 LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
 {
     int fActive = LOWORD(wParam);
@@ -587,12 +598,18 @@ LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOO
     if (lParam) //We get activate from some internal window
     {
 #if defined(_WIN32_WCE) 
-	if (m_bFullScreen && fActive && (getSIPVisibleTop()<0))
-		RhoSetFullScreen(true);
+        if (m_bFullScreen && fActive && (getSIPVisibleTop()<0))
+	        RhoSetFullScreen(true);
 #endif
         return 0;
     }
 
+    ProcessActivate( fActive, wParam, lParam );    
+    return 0;
+}
+
+void CMainWindow::ProcessActivate( BOOL fActive, WPARAM wParam, LPARAM lParam )
+{
 #if defined(_WIN32_WCE) 
 	if (m_bFullScreen)
 		RhoSetFullScreen(fActive!=0);
@@ -602,24 +619,10 @@ LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOO
 #if defined(_WIN32_WCE)  && !defined (OS_PLATFORM_MOTCE)
     // Notify shell of our WM_ACTIVATE message
     SHHandleWMActivate(m_hWnd, wParam, lParam, &m_sai, 0);
-
-    //pause_sync(!fActive);
-/* TBD: Commented this out because it was called before http server started 
-        We need to fix this properly
-    if ( fActive )
-        CHttpServer::Instance()->ResumeThread();
-    else
-        CHttpServer::Instance()->FreezeThread();
-*/
-    //activate calls after javascript alerts, so we have viciouse cycle if alert is display in home page
-    //if ( rho::common::CRhodesApp::getInstance() != null )
-    //    RHODESAPP().callAppActiveCallback(fActive!=0);
-
 #endif
 
     if (!fActive)
         rho_geoimpl_turngpsoff();
-    return 0;
 }
 
 LRESULT CMainWindow::OnSetCookieCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
@@ -863,26 +866,57 @@ LRESULT CMainWindow::OnHotKey (UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
 
     return 1;
 }
+extern "C" HWND getMainWnd();
+BOOL EnumChildProc(HWND hwnd,LPARAM lParam)
+{
+    if ( getMainWnd() != ::GetParent(hwnd) )
+        return TRUE;
+
+    wchar_t szBuf[200];
+    GetWindowText(hwnd, szBuf, 199);
+    if (!*szBuf)
+        return TRUE;
+
+    DWORD dwStyles = GetWindowLong(hwnd, GWL_STYLE);    
+    //LOG(INFO) + "Child: " + szBuf + "Styles: " + LOGFMT("0x%X") + dwStyles + "Popup: " + (((dwStyles&WS_POPUP) != 0) ? "1" : "0");
+
+	if ( *((HWND*)lParam) != hwnd && (dwStyles&WS_POPUP) != 0 )
+	{
+		HWND* pWnd = (HWND*)lParam;
+		*pWnd = hwnd;
+		return FALSE;
+	}
+
+	return TRUE;
+}
 
 LRESULT CMainWindow::OnSetFocus (UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
 {
-    HWND hBrowserWnd = m_pBrowserEng ? m_pBrowserEng->GetHTMLWND() : NULL;
+    HWND hWndLostFocus = (HWND)wParam;
+	WCHAR wWindowName[30];
+	if (hWndLostFocus && GetClassName(hWndLostFocus, wWindowName, 30))
+	{
+		//  Allow the following windows to remain having focus, avoids
+		//  the bug where we're unable to select anything from a combo 
+		//  box
+		if (wcscmp(wWindowName, L"PopupWindowClass") == 0)
+	        return 0;
+	}
 
-    if (hBrowserWnd && !::IsIconic(m_hWnd))
+    //Look for popup window
+    HWND hChildPopUp = hWndLostFocus;
+    EnumWindows( EnumChildProc, (LPARAM)&hChildPopUp);
+    if ( hChildPopUp && hChildPopUp != hWndLostFocus)
+    {
+        ::SetFocus(hChildPopUp);
+        return 0;
+    }
+
+    HWND hBrowserWnd = m_pBrowserEng ? m_pBrowserEng->GetHTMLWND() : NULL;
+    if (hBrowserWnd && ::IsWindowVisible(m_hWnd) ) //!::IsIconic(m_hWnd))
 	{
-		HWND hWndLostFocus = (HWND)wParam;
 		if (hWndLostFocus == hBrowserWnd)
 	        return 0;
-
-		WCHAR wWindowName[30];
-		if (hWndLostFocus && GetClassName(hWndLostFocus, wWindowName, 30))
-		{
-			//  Allow the following windows to remain having focus, avoids
-			//  the bug where we're unable to select anything from a combo 
-			//  box
-			if (wcscmp(wWindowName, L"PopupWindowClass") == 0)
-		        return 0;
-		}
         ::SetFocus(hBrowserWnd);
 	}
 
@@ -994,7 +1028,9 @@ LRESULT CMainWindow::OnStopNavigate(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWn
 
 LRESULT CMainWindow::OnZoomPage(WORD /*wNotifyCode*/, WORD /*wID*/, HWND hWndCtl, BOOL& /*bHandled*/)
 {
-    float fZoom = (float)(long)(hWndCtl);
+    CRhoFloatData* pFloatData = (CRhoFloatData*)(hWndCtl);
+    float fZoom = pFloatData->m_fValue;
+    delete pFloatData;
     if ( m_pBrowserEng )
         m_pBrowserEng->ZoomPageOnTab(fZoom, rho_webview_active_tab());
 
@@ -1059,6 +1095,7 @@ LRESULT CMainWindow::OnConnectionsNetworkCount(UINT /*uMsg*/, WPARAM wParam, LPA
 #if defined (_WIN32_WCE)
 
 	rho_sysimpl_sethas_network( wParam );
+	m_networkStatusMonitor.notifyReceiver( ((int)wParam!=0)?rho::common::networkStatusConnected:rho::common::networkStatusDisconnected );
 
 #endif
 	return 0;
@@ -1069,6 +1106,7 @@ LRESULT CMainWindow::OnConnectionsNetworkCell(UINT /*uMsg*/, WPARAM wParam, LPAR
 #if defined (_WIN32_WCE)
 
 	rho_sysimpl_sethas_cellnetwork( (int)wParam );
+	m_networkStatusMonitor.notifyReceiver( (wParam!=0)?rho::common::networkStatusConnected:rho::common::networkStatusDisconnected );
 
 #endif
 	return 0;
@@ -1125,11 +1163,11 @@ LRESULT CMainWindow::OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
         m_SyncStatusDlg.setTitle( convertToStringW(params->m_title).c_str() );
         if ( !m_SyncStatusDlg.m_hWnd )
             m_SyncStatusDlg.Create(m_hWnd, 0);
-        else
-        {
-            m_SyncStatusDlg.ShowWindow(SW_SHOW);
-            m_SyncStatusDlg.BringWindowToTop();
-        }
+        //else
+        //{
+        m_SyncStatusDlg.ShowWindow(SW_SHOW);
+        m_SyncStatusDlg.BringWindowToTop();
+        //}
     }else if (params->m_dlgType == CAlertDialog::Params::DLG_DEFAULT) {
 		MessageBox(convertToStringW(params->m_message).c_str(), strAppName.c_str(), MB_ICONWARNING | MB_OK);
         RHODESAPP().callPopupCallback(params->m_callback, "ok", "ok");
@@ -1201,6 +1239,13 @@ LRESULT CMainWindow::OnExecuteCommand(UINT /*uMsg*/, WPARAM wParam, LPARAM lPara
 }	
 
 
+LRESULT CMainWindow::OnLicenseWarning (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
+{
+    ::MessageBoxW( m_hWnd, L"Please provide RhoElements license key.", L"Motorola License", MB_ICONERROR | MB_OK);
+
+    return 0;
+}
+
 LRESULT CMainWindow::OnLicenseScreen(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
 {
     LOG(INFO) + "OnLicenseScreen";
@@ -1215,6 +1260,12 @@ LRESULT CMainWindow::OnLicenseScreen(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam
 		}*/
 	}
 #endif
+
+    //Fix issue with lost focus after License Screen hides
+    HWND hBrowserWnd = m_pBrowserEng ? m_pBrowserEng->GetHTMLWND() : NULL;
+    if (hBrowserWnd && !::IsIconic(m_hWnd))
+        ::SetFocus(hBrowserWnd);
+
 	return 0;
 }	
 

data/platform/wm/rhodes/MainWindow.h

@@ -103,6 +103,8 @@ 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");
+static UINT WM_WINDOW_MINIMIZE 		   = ::RegisterWindowMessage(L"RHODES_WM_MINIMIZE");
+static UINT WM_SHOW_LICENSE_WARNING	   = ::RegisterWindowMessage(L"RHOELEMENTS_WM_LICENSE_WARNING");
 extern UINT WM_LICENSE_SCREEN;
 
 typedef struct _TCookieData {
@@ -110,6 +112,29 @@ typedef struct _TCookieData {
     char* cookie;
 } TCookieData;
 
+namespace rho
+{
+	namespace common
+	{
+		class WMNetworkStatusMonitor : public INetworkStatusMonitor
+		{
+			INetworkStatusReceiver* m_pReceiver;
+		public:
+			WMNetworkStatusMonitor() : m_pReceiver(0) {}
+			  virtual void setPollInterval(int pollInterval) {}
+			  virtual void setNetworkStatusReceiver(INetworkStatusReceiver* receiver) { m_pReceiver = receiver; }
+			  void notifyReceiver( enNetworkStatus status )
+			  {
+				  if (m_pReceiver != 0)
+				  {
+					  m_pReceiver->onNetworkStatusChanged(status);
+				  }
+			  }
+		};
+
+	}
+}
+
 class CMainWindow :
 #if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_MOTCE )
 	public CFrameWindowImpl<CMainWindow>, 
@@ -210,6 +235,8 @@ public:
 		MESSAGE_HANDLER(WM_BLUETOOTH_CALLBACK, OnBluetoothCallback);
 		MESSAGE_HANDLER(WM_EXECUTE_COMMAND, OnExecuteCommand);
         MESSAGE_HANDLER(WM_EXECUTE_RUNNABLE, OnExecuteRunnable);
+        MESSAGE_HANDLER(WM_WINDOW_MINIMIZE, OnWindowMinimized);
+        MESSAGE_HANDLER(WM_SHOW_LICENSE_WARNING, OnLicenseWarning);
 		MESSAGE_HANDLER(WM_LICENSE_SCREEN, OnLicenseScreen);
         MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus);
         MESSAGE_HANDLER(WM_HOTKEY, OnHotKey);
@@ -279,6 +306,8 @@ 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 OnWindowMinimized (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+    LRESULT OnLicenseWarning (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*/);
@@ -389,6 +418,10 @@ private:
 	CAlertDialog *m_alertDialog;
 
     CSyncStatusDlg m_SyncStatusDlg;
+
+	WMNetworkStatusMonitor m_networkStatusMonitor;
+
+    void ProcessActivate( BOOL fActive, WPARAM wParam, LPARAM lParam );
 };
 
 #if !defined(_WIN32_WCE) || defined( OS_PLATFORM_MOTCE ) 

data/platform/wm/rhodes/Rhodes.cpp

@@ -51,7 +51,7 @@ using namespace stdext;
 typedef unsigned long VALUE;
 #endif //!RUBY_RUBY_H
 
-char* parseToken( const char* start, int len );
+LPTSTR parseToken(LPCTSTR start, LPCTSTR* next_token);
 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);
@@ -64,6 +64,12 @@ extern "C" void rho_webview_navigate(const char* url, int index);
 class CEng;
 extern rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance);
 extern "C" CEng* rho_wmimpl_get_webkitbrowser(HWND hParentWnd, HINSTANCE hInstance);
+#else
+extern "C" void rho_wm_impl_SetApplicationLicenseObj(void* pAppLicenseObj)
+{
+    if (pAppLicenseObj)
+        delete pAppLicenseObj;
+}
 #endif // APP_BUILD_CAPABILITY_WEBKIT_BROWSER
 #ifdef APP_BUILD_CAPABILITY_SHARED_RUNTIME
 extern "C" {
@@ -75,7 +81,7 @@ extern "C" {
 	bool rho_wmimpl_get_fullscreen();
 	void rho_wmimpl_set_is_version2(const char* path);
 	bool rho_wmimpl_get_is_version2();
-
+    const wchar_t* rho_wmimpl_sharedconfig_getvalue(const wchar_t* szName);
 #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){}
@@ -90,6 +96,7 @@ extern "C" {
     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; }
+    const wchar_t* rho_wmimpl_sharedconfig_getvalue(const wchar_t* szName){return 0;}
 #endif
 
 	const unsigned int* rho_wmimpl_get_logmaxsize();
@@ -159,8 +166,9 @@ class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
 {
     static HINSTANCE m_hInstance;
     CMainWindow m_appWindow;
-    rho::String m_strRootPath, m_strRhodesPath, m_logPort, m_strRuntimePath;//, m_strDebugHost, m_strDebugPort;*/
+    rho::String m_strRootPath, m_strRhodesPath, m_logPort, m_strRuntimePath, m_strAppName;//, m_strDebugHost, m_strDebugPort;*/
 	int m_nRestarting;
+	bool m_isRhoConnectPush;
 #ifndef RHODES_EMULATOR
 	HANDLE m_hMutex;
 #endif
@@ -188,10 +196,11 @@ public :
     void RunMessageLoop( ) throw( );
     const rho::String& getRhoRootPath();
     const rho::String& getRhoRuntimePath();
-    void parseHttpProxyURI(const rho::String &http_proxy);
-
+    const rho::String& getAppName();
 };
 
+void parseHttpProxyURI(const rho::String &http_proxy);
+
 static String g_strCmdLine;
 HINSTANCE CRhodesModule::m_hInstance;
 CRhodesModule _AtlModule;
@@ -211,151 +220,138 @@ rho::IBrowserEngine* rho_wmimpl_createBrowserEngine(HWND hwndParent)
 bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) throw( )
 {
 	m_nRestarting = 1;
-	TCHAR szTokens[] = _T("-/");
-	LPCTSTR lpszToken = FindOneOf(lpCmdLine, szTokens);
+	LPCTSTR lpszToken = lpCmdLine;
+	LPCTSTR nextToken;
     getRhoRootPath();
 
 	m_logPort = "";
+	m_isRhoConnectPush = false;
 
 	while (lpszToken != NULL)
 	{
-		if (WordCmpI(lpszToken, _T("Restarting"))==0) {
-			m_nRestarting = 10;
+		// skip leading spaces and double-quote (if present)
+	    bool doubleQuote = false;
+		while ((*lpszToken != 0) && ((*lpszToken==' ') || ((!doubleQuote) && (*lpszToken=='"')))) {
+			if (*lpszToken=='"')
+				doubleQuote = true;
+			lpszToken++;
+		}
+		// skip leading spaces and check for leading '/' or '-' of command line option
+		bool isCmdLineOpt = false;
+		while ((*lpszToken != 0) && ((*lpszToken==' ') || ((!isCmdLineOpt) && ((*lpszToken=='/') || (*lpszToken=='-'))))) {
+			if ((*lpszToken=='/') || (*lpszToken=='-'))
+				isCmdLineOpt = true;
+			lpszToken++;
 		}
+		// finish command line processing on EOL
+		if (*lpszToken == 0) break;
+
+		// if option starts with double-quote, find its end by next double-quote;
+		// otherwise the end will be found automatically
+		nextToken = doubleQuote ? FindOneOf(lpszToken, _T("\"")) : NULL;
+
+		//parseToken will allocate extra byte at the end of the returned token value
+		LPTSTR value = parseToken( lpszToken, &nextToken );
 
-		if (wcsncmp(lpszToken, _T("log"), 3)==0) 
-		{
-			String token = convertToStringA(lpszToken);
-			//parseToken will allocate extra byte at the end of the returned token value
-			char* port = parseToken( token.c_str(), token.length() );
-			if (port) {
-				String strLogPort = port;
-				m_logPort = strLogPort;
-				free(port);
+		if (isCmdLineOpt) {
+			if (WordCmpI(lpszToken, _T("Restarting"))==0) {
+				m_nRestarting = 10;
 			}
-			else {
-				m_logPort = rho::String("11000");
+
+			if (WordCmpI(lpszToken, _T("rhoconnectpush"))==0) {
+				m_isRhoConnectPush = true;
+			}
+
+			else if (wcsncmp(lpszToken, _T("log"), 3)==0) 
+			{
+				if (value) {
+					m_logPort = convertToStringA(value);
+				}
+				else {
+					m_logPort = rho::String("11000");
+				}
 			}
-		}
 
 #if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
-        else if (wcsnicmp(lpszToken, _T("s"),1)==0)
-        {
-			String token = convertToStringA(lpszToken);
-			char* path = parseToken( token.c_str(), token.length() );
-			if (path) {
-				// RhoElements v1.0 compatibility mode
-                rho_wmimpl_set_startpage(path);
-				free(path);
+			else if (wcsnicmp(lpszToken, _T("s"),1)==0)
+			{
+				if (value) {
+					// RhoElements v1.0 compatibility mode
+					String strPath = convertToStringA(value);
+					rho_wmimpl_set_startpage(strPath.c_str());
+				}
 			}
-        }
-        else if (wcsnicmp(lpszToken, _T("c"),1)==0)
-        {
-			String token = convertToStringA(lpszToken);
-            char* path = parseToken( token.c_str(), token.length() );
-			if (path) {
-                token = path;
-                if (token.substr(0,7).compare("file://")==0)
-                    token.erase(0,7);
-				rho_wmimpl_set_configfilepath(token.c_str());
-				free(path);
+			else if (wcsnicmp(lpszToken, _T("c"),1)==0)
+			{
+				if (value) {
+					String strPath = convertToStringA(value);
+					if (strPath.substr(0,7).compare("file://")==0)
+						strPath.erase(0,7);
+					rho_wmimpl_set_configfilepath(strPath.c_str());
+				}
 			}
-        }
 #endif // APP_BUILD_CAPABILITY_SHARED_RUNTIME
 
 #if defined(OS_WINDOWS_DESKTOP)
-		else if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) 
-        {
-			String token = convertToStringA(lpszToken);
-            char *proxy = parseToken( token.c_str(), token.length() );
-			
-			if (proxy)
-            {
-				m_strHttpProxy = proxy;
-                free(proxy);
-            }
-			else 
-				LOG(WARNING) + "invalid value for \"http_proxy_url\" cmd parameter";
+			else if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) 
+			{
+				if (value) {
+					m_strHttpProxy = convertToStringA(value);
+				}
+				else 
+					LOG(WARNING) + "invalid value for \"http_proxy_url\" cmd parameter";
 
-		} else if (wcsncmp(lpszToken, _T("approot"),7)==0) 
-        {
-			String token = convertToStringA(lpszToken);
-			//parseToken will allocate extra byte at the end of the returned token value
-            char* path = parseToken( token.c_str(), token.length() );
-			if (path) {
-				int len = strlen(path);
-				if (!(path[len-1]=='\\' || path[len-1]=='/')) {
-#ifdef RHODES_EMULATOR
-					path[len] = '/';
-#else
-					path[len] = '\\';
-#endif
-					path[len+1]  = 0;
+			} else if (wcsncmp(lpszToken, _T("approot"),7)==0) 
+			{
+				if (value) {
+					m_strRootPath = convertToStringA(value);
+					String_replace(m_strRootPath, '\\', '/');
+					if (m_strRootPath.at(m_strRootPath.length()-1)!='/')
+						m_strRootPath.append("/");
 				}
-				m_strRootPath = path;
-				free(path);
-				String_replace(m_strRootPath, '\\', '/');
-			}
-		} else if (wcsncmp(lpszToken, _T("rhodespath"),10)==0) 
-        {
-			String token = convertToStringA(lpszToken);
-			//parseToken will allocate extra byte at the end of the returned token value
-            char* path = parseToken( token.c_str(), token.length() );
-			if (path) {
-				m_strRhodesPath = path;
-				free(path);
-				String_replace(m_strRhodesPath, '\\', '/');
-			}
-		} /* else if (wcsncmp(lpszToken, _T("appname"),7)==0) 
-        {
-			String token = convertToStringA(lpszToken);
-			//parseToken will allocate extra byte at the end of the returned token value
-            char* path = parseToken( token.c_str(), token.length() );
-			if (path) {
-                convertToStringW(path, m_strAppNameW);
-				free(path);
-			}
-		} else if (wcsncmp(lpszToken, _T("debughost"),9)==0) 
-        {
-			String token = convertToStringA(lpszToken);
-			//parseToken will allocate extra byte at the end of the returned token value
-            char* host = parseToken( token.c_str(), token.length() );
-			if (host) {
-				m_strDebugHost = host;
-				free(host);
-			}
-		} else if (wcsncmp(lpszToken, _T("debugport"),9)==0) 
-        {
-			String token = convertToStringA(lpszToken);
-			//parseToken will allocate extra byte at the end of the returned token value
-            char* port = parseToken( token.c_str(), token.length() );
-			if (port) {
-				m_strDebugPort = port;
-				free(port);
-			}
-		} */
+			} else if (wcsncmp(lpszToken, _T("rhodespath"),10)==0) 
+			{
+				if (value) {
+					m_strRhodesPath = convertToStringA(value);
+					String_replace(m_strRhodesPath, '\\', '/');
+				}
+			} /* else if (wcsncmp(lpszToken, _T("appname"),7)==0) 
+			{
+				if (value) {
+					m_strAppNameW = convertToStringW(value);
+				}
+			} else if (wcsncmp(lpszToken, _T("debughost"),9)==0) 
+			{
+				if (value) {
+					m_strDebugHost = convertToStringA(value);
+				}
+			} else if (wcsncmp(lpszToken, _T("debugport"),9)==0) 
+			{
+				if (value) {
+					m_strDebugPort = convertToStringA(value);
+				}
+			} */
 #else
-        else if (wcsnicmp(lpszToken, _T("approot"),7)==0)
-        {
-            String token = convertToStringA(lpszToken);
-			char* path = parseToken( token.c_str(), token.length() );
-			if (path) {
-				// RhoElements v2.0 Shared Runtime command line parameter
-				m_strRootPath = path;
-                if (m_strRootPath.substr(0,7).compare("file://")==0)
-                    m_strRootPath.erase(0,7);
-                String_replace(m_strRootPath, '\\', '/');
-                if (m_strRootPath.at(m_strRootPath.length()-1)!='/')
-                    m_strRootPath.append("/");
-                m_strRootPath.append("rho/");
+			else if (wcsnicmp(lpszToken, _T("approot"),7)==0)
+			{
+				if (value) {
+					// RhoElements v2.0 Shared Runtime command line parameter
+					m_strRootPath = convertToStringA(value);
+					if (m_strRootPath.substr(0,7).compare("file://")==0)
+						m_strRootPath.erase(0,7);
+					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());
+					rho_wmimpl_set_is_version2(m_strRootPath.c_str());
 #endif
-        	}
-			free(path);
-        }
+        		}
+			}
 #endif
-		lpszToken = FindOneOf(lpszToken, szTokens);
+		}
+		if (value) free(value);
+		lpszToken = nextToken;
 	}
 
 	return __super::ParseCommandLine(lpCmdLine, pnRetCode);
@@ -372,7 +368,7 @@ 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();
-extern "C" int rho_wm_impl_CheckLicense();
+extern "C" void rho_wm_impl_CheckLicense();
 
 // This method is called immediately before entering the message loop.
 // It contains initialization code for the application.
@@ -405,7 +401,8 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
 
 	if (hWnd)
 	{
-		SetForegroundWindow( HWND( DWORD(hWnd) | 0x01 ) );
+        SendMessage( hWnd, PB_WINDOW_RESTORE, NULL, TRUE);
+        SetForegroundWindow( hWnd );
 		return S_FALSE;
 	}
 
@@ -478,11 +475,20 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
 #ifdef OS_WINDOWS_DESKTOP
 	if (m_strHttpProxy.length() > 0) {
 		parseHttpProxyURI(m_strHttpProxy);
-	} else {
+	} else
+#endif
+	{
 		if (RHOCONF().isExist("http_proxy_url")) {
 			parseHttpProxyURI(RHOCONF().getString("http_proxy_url"));
+#if defined(OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR)
+		} else {
+			// it's important to call this method from here to perform
+			// a proper initialization of proxy implementation for Win32
+			GetAppWindow().setProxy();
+#endif
 		}
 	}
+
 #ifdef RHODES_EMULATOR
     if (RHOSIMCONF().getString("debug_host").length() > 0)
         SetEnvironmentVariableA("RHOHOST", RHOSIMCONF().getString("debug_host").c_str() );
@@ -490,7 +496,6 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
         SetEnvironmentVariableA("rho_debug_port", RHOSIMCONF().getString("debug_port").c_str() );
 #endif
 
-#endif
     //::SetThreadPriority(GetCurrentThread(),10);
 
 	//Check for bundle directory is exists.
@@ -560,15 +565,16 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
     m_appWindow.ShowWindow(nShowCmd);
 
 #ifndef RHODES_EMULATOR
-    int nRes = rho_wm_impl_CheckLicense();
-    if ( !nRes )
-        ::MessageBoxW(0, L"Please provide RhoElements license key.", L"Motorola License", MB_ICONERROR | MB_OK);
+    rho_wm_impl_CheckLicense();
 #endif
 
 #else
     String strTitle = RHODESAPP().getAppTitle();
     m_appWindow.Create(NULL, CWindow::rcDefault, convertToStringW(strTitle).c_str(), dwStyle);
 
+	//if( m_isRhoConnectPush )
+	//	m_appWindow.ShowWindow(SW_MINIMIZE);
+
     if (NULL == m_appWindow.m_hWnd)
     {
         return S_FALSE;
@@ -619,13 +625,6 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
     {
         RHODESAPP().startApp();
 
-	#ifdef RHODES_EMULATOR
-		int width = RHOSIMCONF().getInt("screen_width");
-		int height = RHOSIMCONF().getInt("screen_height");
-		if ((width>0) && (height>0))
-			m_appWindow.setSize(width, height);
-	#endif
-
         // Navigate to the "loading..." page
 	    m_appWindow.Navigate2(_T("about:blank")
     #if defined(OS_WINDOWS_DESKTOP)
@@ -674,7 +673,8 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
 		&g_hNotifyCell);
 
 #elif !defined( OS_PLATFORM_MOTCE )
-	rho_clientregister_create("win32_client");
+    if (RHOCONF().getString("test_push_client").length() > 0 ) 
+	    rho_clientregister_create(RHOCONF().getString("test_push_client").c_str());//"win32_client");
 #endif
 
     return S_OK;
@@ -700,9 +700,9 @@ void CRhodesModule::RunMessageLoop( ) throw( )
 #endif
     rho_ringtone_manager_stop();
 
-#if !defined(_WIN32_WCE)
-    rho_clientregister_destroy();
-#endif
+//#if !defined(_WIN32_WCE)
+//    rho::sync::CClientRegister::Destroy();
+//#endif
 
 #if defined(OS_WINDOWS_DESKTOP)
     m_appWindow.DestroyUi();
@@ -721,9 +721,39 @@ const rho::String& CRhodesModule::getRhoRootPath()
 {
     if ( m_strRootPath.length() == 0 )
         m_strRootPath = getRhoRuntimePath();
+
     return m_strRootPath;
 }
 
+const rho::String& CRhodesModule::getAppName()
+{
+    if ( m_strAppName.length() == 0 )
+    {
+#if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
+        bool bRE1App = false;
+        if (!rho_wmimpl_get_is_version2())
+            bRE1App = true;
+        if ( bRE1App )
+            m_strAppName = convertToStringA( rho_wmimpl_sharedconfig_getvalue( L"General\\Name" ) );
+        else
+        {
+            String path = getRhoRootPath();
+            String_replace(path, '/', '\\');
+
+            int nEnd = path.find_last_of('\\');
+            nEnd = path.find_last_of('\\', nEnd-1)-1;
+
+            int nStart = path.find_last_of('\\', nEnd) +1;
+            m_strAppName = path.substr( nStart, nEnd-nStart+1);
+        }
+#else
+        m_strAppName = get_app_build_config_item("name");
+#endif
+    }
+
+    return m_strAppName;
+}
+
 const rho::String& CRhodesModule::getRhoRuntimePath()
 {
     if ( m_strRuntimePath.length() == 0 )
@@ -802,21 +832,17 @@ void rho_platform_restart_application()
 typedef bool (WINAPI *PCSD)();
 
 #ifdef APP_BUILD_CAPABILITY_MOTOROLA
-extern "C" void rho_wm_impl_CheckLicenseWithBarcode(HWND hParent);
+extern "C" void rho_wm_impl_CheckLicenseWithBarcode(HWND hParent, HINSTANCE hLicenseInstance);
 #endif
+extern "C" void rho_wm_impl_SetApplicationLicenseObj(void* pAppLicenseObj);
 
 typedef LPCWSTR (WINAPI *PCL)(HWND, LPCWSTR, LPCWSTR, LPCWSTR);
 typedef int (WINAPI *FUNC_IsLicenseOK)();
+typedef void* (WINAPI *FUNC_GetAppLicenseObj)();
 
-extern "C" int rho_wm_impl_CheckLicense()
+extern "C" void rho_wm_impl_CheckLicense()
 {
-//#ifdef OS_WINDOWS_DESKTOP
-//    return;
-//#else
-
-#ifdef APP_BUILD_CAPABILITY_MOTOROLA
-    rho_wm_impl_CheckLicenseWithBarcode(getMainWnd());
-#else
+    int nRes = 0;
     HINSTANCE hLicenseInstance = LoadLibrary(L"license_rc.dll");
     if(hLicenseInstance)
     {
@@ -836,51 +862,57 @@ extern "C" int rho_wm_impl_CheckLicense()
             StringW strCompanyW;
             common::convertToStringW( get_app_build_config_item("motorola_license_company"), strCompanyW );
 
-            szLogText = pCheckLicense( getMainWnd(), L"rhodes-system-api-samples", strLicenseW.c_str(), strCompanyW.c_str() );
+            bool bRE1App = false;
+        #if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
+            if (!rho_wmimpl_get_is_version2())
+                bRE1App = true;
+
+            if ( bRE1App )
+            {
+                LPCTSTR szLicense = rho_wmimpl_sharedconfig_getvalue( L"LicenseKey" );
+                if ( szLicense )
+                    strLicenseW = szLicense;
+
+                LPCTSTR szLicenseComp = rho_wmimpl_sharedconfig_getvalue( L"LicenseKeyCompany" );
+                if ( szLicenseComp )
+                    strCompanyW = szLicenseComp;
+            }
+        #endif
+
+            StringW strAppNameW;
+//#if defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME)
+            strAppNameW = RHODESAPP().getAppNameW();
+//#else
+//            common::convertToStringW( get_app_build_config_item("name"), strAppNameW );
+//#endif
+            szLogText = pCheckLicense( getMainWnd(), strAppNameW.c_str(), strLicenseW.c_str(), strCompanyW.c_str() );
         }
 
         if ( szLogText && *szLogText )
             LOGC(INFO, "License") + szLogText;
 
-        return pIsOK ? pIsOK() : 0;
+        nRes = pIsOK ? pIsOK() : 0;
     }
-#endif
-
-    return 0;
-//#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;
-	}*/
+#ifdef APP_BUILD_CAPABILITY_MOTOROLA
+    if ( nRes == 0 )
+    {
+        rho_wm_impl_CheckLicenseWithBarcode(getMainWnd(),hLicenseInstance);
+        return;
+    }
+#endif
 
-    return 1;
+#ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
+    if ( nRes )
+    {
+        FUNC_GetAppLicenseObj pGetAppLicenseObj = (FUNC_GetAppLicenseObj) GetProcAddress(hLicenseInstance, L"GetAppLicenseObj");
+        if ( pGetAppLicenseObj )
+            rho_wm_impl_SetApplicationLicenseObj( pGetAppLicenseObj() );
+    }
 #endif
 
+    if ( !nRes )
+        ::PostMessage( getMainWnd(), WM_SHOW_LICENSE_WARNING, 0, 0);
 }
 
 static inline char *
@@ -894,6 +926,11 @@ translate_char(char *p, int from, int to)
     return p;
 }
 
+extern "C" const char* rho_native_get_appname()
+{
+    return _AtlModule.getAppName().c_str();
+}
+
 extern "C" const char* rho_native_rhopath() 
 {
     return _AtlModule.getRhoRootPath().c_str();
@@ -1001,38 +1038,51 @@ extern "C" void Init_fcntl(void)
 
 //parseToken will allocate extra byte at the end of the 
 //returned token value
-char* parseToken( const char* start, int len ) {
+LPTSTR parseToken (LPCTSTR start, LPCTSTR* next_token) {
     int nNameLen = 0;
-    while(*start==' '){ start++; len--;}
+    while(*start==' '){ start++; }
 
     int i = 0;
-    for( i = 0; i < len; i++ ){
-        if (( start[i] == '=' ) || ( start[i] == ':' ) || ( start[i] == ' ' )) {
+    while( start[i] != L'\0' )
+	{
+        if (( start[i] == L'=' ) || ( start[i] == L':' ) || ( start[i] == L' ' )) {
             if ( i > 0 ){
                 int s = i-1;
                 for(; s >= 0 && start[s]==' '; s-- );
-
                 nNameLen = s+1;
                 break;
             }else 
                 break;
         }
+		++i;
     }
 
-    if ( nNameLen == 0 )
+	if ( nNameLen == 0 )
         return NULL;
 
-    const char* szValue = start + i+1;
+    LPCTSTR szValue = start + i+1;
     int nValueLen = 0;
 
-    while(*szValue==' ' || *szValue=='\'' || *szValue=='"' && nValueLen >= 0 ){ szValue++;}
-    while(szValue[nValueLen] && szValue[nValueLen] !='\'' && szValue[nValueLen] != '"' ){ nValueLen++;}
-
-    //while(nValueLen > 0 && (szValue[nValueLen-1]==' ' || szValue[nValueLen-1]=='\'' || szValue[nValueLen-1]=='"')) nValueLen--;
+	// skip leading spaces and optional delimiter (that is either ' or ") and keep the delimiter for further use
+	TCHAR delimiter = L' ';
+	while ((*szValue==delimiter) || ((delimiter==L' ') && ((*szValue==L'\'') || (*szValue==L'"')))) {
+		if ((delimiter==L' ') && ((*szValue==L'\'') || (*szValue==L'"'))) {
+			// delimiter found
+			delimiter = *szValue;
+			szValue++;
+			break;
+		}
+		szValue++;
+	}
+	// search for value end -- that is either end of line or delimiter
+	while ((szValue[nValueLen] != L'\0') && (szValue[nValueLen] != delimiter)) { nValueLen++; }
+	// next token begins with the character next to delimiter (if it's not the end of the line)
+	if (*next_token == NULL)
+		*next_token = szValue + nValueLen + (szValue[nValueLen] != L'\0' ? 1 : 0 );
 
-	char* value = (char*) malloc(nValueLen+2);
-	strncpy(value, szValue, nValueLen);
-	value[nValueLen] = '\0';
+	TCHAR* value = (TCHAR*) malloc((nValueLen+2)*sizeof(TCHAR));
+	wcsncpy(value, szValue, nValueLen);
+	value[nValueLen] = L'\0';
 
 	return value;
 }
@@ -1186,19 +1236,34 @@ HBITMAP SHLoadImageFile(  LPCTSTR pszFileName )
 
 #endif
 
-void CRhodesModule::parseHttpProxyURI(const rho::String &http_proxy)
+extern "C" void rho_sys_unset_http_proxy()
+{
+#if defined(OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR)
+	_AtlModule.GetAppWindow().setProxy();
+#endif
+	RHOCONF().removeProperty("http_proxy_host", false);
+	RHOCONF().removeProperty("http_proxy_port", false);
+	RHOCONF().removeProperty("http_proxy_login", false);
+	RHOCONF().removeProperty("http_proxy_password", false);
+	RAWLOG_INFO("Unsetting HTTP proxy");
+}
+
+void parseHttpProxyURI(const rho::String &http_proxy)
 {
 	// http://<login>:<passwod>@<host>:<port>
 	const char *default_port = "8080";
 
+	if (http_proxy.length() == 0)
+		rho_sys_unset_http_proxy();
+
 	if (http_proxy.length() < 8) {
-		LOG(ERROR) + "invalid http proxy url";
+		RAWLOG_ERROR("invalid http proxy url");
 		return;
 	}
 
 	int index = http_proxy.find("http://", 0, 7);
 	if (index == string::npos) {
-		LOG(ERROR) + "http proxy url should starts with \"http://\"";
+		RAWLOG_ERROR("http proxy url should starts with \"http://\"");
 		return;
 	}
 	index = 7;
@@ -1284,20 +1349,23 @@ void CRhodesModule::parseHttpProxyURI(const rho::String &http_proxy)
 		}
 	}
 
-	LOG(INFO) + "Setting up HTTP proxy:";
-	LOG(INFO) + "URI: " + http_proxy;
-	LOG(INFO) + "HTTP proxy login    = " + login;
-	LOG(INFO) + "HTTP proxy password = " + password;
-	LOG(INFO) + "HTTP proxy host     = " + host;
-	LOG(INFO) + "HTTP proxy port     = " + port;
+	RAWLOG_INFO("Setting up HTTP proxy:");
+	RAWLOG_INFO1("URI: %s", http_proxy.c_str());
+	RAWLOG_INFO1("HTTP proxy login    = %s", login.c_str());
+	RAWLOG_INFO1("HTTP proxy password = %s", password.c_str());
+	RAWLOG_INFO1("HTTP proxy host     = %s", host.c_str());
+	RAWLOG_INFO1("HTTP proxy port     = %s", port.c_str());
 
 	if (host.length()) {
+#if defined(OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR)
+		_AtlModule.GetAppWindow().setProxy(host, port, login, password);
+#endif
 		RHOCONF().setString ("http_proxy_host", host, false);
 
 		if (port.length()){
 			RHOCONF().setString ("http_proxy_port", port, false);
 		} else {
-			LOG(WARNING) + "there is no proxy port defined";
+			RAWLOG_WARNING("there is no proxy port defined");
 		}
 
 		if (login.length())
@@ -1307,7 +1375,12 @@ void CRhodesModule::parseHttpProxyURI(const rho::String &http_proxy)
 			RHOCONF().setString ("http_proxy_password", password, false);
 
 	} else {
-		LOG(ERROR) + "empty host name in HTTP-proxy URL";
+		RAWLOG_ERROR("empty host name in HTTP-proxy URL");
 	}
-
 }
+
+extern "C" void rho_sys_set_http_proxy_url(const char* url)
+{
+	String m_strHttpProxy = url;
+    parseHttpProxyURI(m_strHttpProxy);
+}