rhodes 3.3.3.beta.4 → 3.3.3

data/platform/wm/rhodes.sln

@@ -1,16 +1,16 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rhodes", "rhodes\Rhodes.vcproj", "{95D5D2E5-FEF5-4CA9-88CF-FCB0F7465E62}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
 		{6F57C60E-C083-4D46-A3B9-E17948A33518} = {6F57C60E-C083-4D46-A3B9-E17948A33518}
 		{B381B601-04B1-475B-B635-003F8E7DA3A9} = {B381B601-04B1-475B-B635-003F8E7DA3A9}
 		{F196A418-11F1-4067-9F4F-BCC7D70E6EC5} = {F196A418-11F1-4067-9F4F-BCC7D70E6EC5}
 		{AA77BEC0-2A60-4589-A784-7D78F60B35B6} = {AA77BEC0-2A60-4589-A784-7D78F60B35B6}
 	EndProjectSection
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubylib", "rubylib\rubylib.vcproj", "{AA77BEC0-2A60-4589-A784-7D78F60B35B6}"
 	ProjectSection(WebsiteProperties) = preProject

data/platform/wm/rhodes/DateTimePicker.h

@@ -73,7 +73,7 @@ public:
 #endif
 
 class CDateTimePickerDialog : public 
-#if defined(OS_WINDOWS) || defined(OS_PLATFORM_MOTCE)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_PLATFORM_MOTCE)
 	COkCancelModalDialog<CDateTimePickerDialog>
 #else
 	CDialogImpl <CDateTimePickerDialog>
@@ -110,7 +110,7 @@ private:
 
 
 class CTimePickerDialog : public
-#if defined(OS_WINDOWS) || defined(OS_PLATFORM_MOTCE)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_PLATFORM_MOTCE)
 	COkCancelModalDialog<CTimePickerDialog>
 #else
 	CDialogImpl <CTimePickerDialog>

data/platform/wm/rhodes/IBrowserEngine.h

@@ -26,6 +26,9 @@ public:
     virtual BOOL ZoomTextOnTab(int nZoom, UINT iTab) = 0;
     virtual int GetTextZoomOnTab(UINT iTab) = 0;
     virtual BOOL GetTitleOnTab(LPTSTR szURL, UINT iMaxLen, UINT iTab) = 0;
+    virtual void OnDocumentComplete(LPCTSTR url) = 0;
+    virtual void setBrowserGesturing(bool bEnableGesturing) = 0;
+    virtual void NotifyEngineOfSipPosition() = 0;
 };
 
 }

data/platform/wm/rhodes/IEBrowserEngine.cpp

@@ -8,9 +8,14 @@
 #include <webvw.h>
 #endif
 
+extern "C" void rho_wm_impl_CheckLicense();
+extern "C" int rho_wm_impl_CheckSymbolDevice();
+
 CIEBrowserEngine::CIEBrowserEngine(HWND hParentWnd, HINSTANCE hInstance) :
     m_spIWebBrowser2(NULL)
 {
+	m_bLoadingComplete = false;
+
 #if defined(_WIN32_WCE)
     m_browser.Create(hParentWnd,
                      CWindow::rcDefault, // proper sizing is done in CMainWindow::OnSize
@@ -156,13 +161,23 @@ BOOL CIEBrowserEngine::NavigateToHtml(LPCTSTR szHtml)
 
 LRESULT CIEBrowserEngine::OnWebKitMessages(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
-    bHandled = FALSE;
+    switch (uMsg) 
+    {
+		case PB_ONMETA:
+            RHODESAPP().getExtManager().onSetPropertiesData( (LPCWSTR)wParam, (LPCWSTR)lParam );
+			break;
+    }
+
+    bHandled = TRUE;
     return 0;
 }
 
 void CIEBrowserEngine::RunMessageLoop(CMainWindow& mainWnd)
 {
-    MSG msg;
+    if (!rho_wm_impl_CheckSymbolDevice())
+        return;
+
+	MSG msg;
     while (GetMessage(&msg, NULL, 0, 0))
     {
         if ( RHODESAPP().getExtManager().onWndMsg(msg) )
@@ -220,3 +235,20 @@ void CIEBrowserEngine::SetCookie(char* url, char* cookie)
 		for (c = s + 1; *c == ' '; ++c);
 	}
 }
+
+void CIEBrowserEngine::OnDocumentComplete(LPCTSTR url)
+{
+	if(!m_bLoadingComplete && wcscmp(url,_T("about:blank"))!=0)
+	{
+		rho_wm_impl_CheckLicense();
+		m_bLoadingComplete = true;
+	}
+}
+
+void CIEBrowserEngine::setBrowserGesturing(bool bEnableGesturing)
+{
+}
+
+void CIEBrowserEngine::NotifyEngineOfSipPosition()
+{
+}

data/platform/wm/rhodes/IEBrowserEngine.h

@@ -18,7 +18,7 @@ class CIEBrowserEngine :  public rho::IBrowserEngine
 
     // cached copy of hosted control's IWebBrowser2 interface pointer
     CComPtr<IWebBrowser2> m_spIWebBrowser2;
-
+    bool  m_bLoadingComplete;
 public:
     CIEBrowserEngine(HWND hParentWnd, HINSTANCE hInstance);
     virtual ~CIEBrowserEngine(void);
@@ -40,4 +40,7 @@ public:
     virtual BOOL ZoomTextOnTab(int nZoom, UINT iTab);
     virtual int GetTextZoomOnTab(UINT iTab);
     virtual BOOL GetTitleOnTab(LPTSTR szURL, UINT iMaxLen, UINT iTab);
+    virtual void OnDocumentComplete(LPCTSTR url);
+    virtual void setBrowserGesturing(bool bEnableGesturing);
+    virtual void NotifyEngineOfSipPosition();
 };

data/platform/wm/rhodes/LicenseStub.cpp

@@ -0,0 +1,73 @@
+#include "stdafx.h"
+#include "common/app_build_capabilities.h"
+
+#if defined(APP_BUILD_CAPABILITY_WEBKIT_BROWSER) && !defined(APP_BUILD_CAPABILITY_MOTOROLA)
+class CConfig
+{
+};
+
+class CSync
+{
+public:	
+	int Run(int a, long b,long c);
+};
+
+int CSync::Run(int a, long b,long c)
+{
+	return 1;
+}
+
+class CAppManager
+{
+public:	
+	long SwitchAppInst(int iInstID);
+};
+
+long CAppManager::SwitchAppInst(int iInstID)
+{
+	return 1;
+}
+
+struct PBCoreStruct
+{
+};
+
+CConfig *g_pConfig = 0;
+CSync	*g_pEventSync = 0;
+CAppManager	*g_pAppManager = 0;	
+PBCoreStruct *g_pPBCore = 0;
+
+typedef long IMOREF;
+
+typedef struct VarsStruct{
+	LPCTSTR		pStr;
+	VarsStruct	*pNextVar;
+}VARSTRUCT,*PVARSTRUCT;
+typedef int (CALLBACK* IMOEVENTPROC)(PVARSTRUCT pVars,int iTABID,LPARAM lParam);
+
+enum LogTypeInterface {
+	PB_LOG_ERROR	= 0,	///< Show stopper
+	PB_LOG_WARNING,	///< PB Can continue with reduced functionality
+	PB_LOG_INFO,		///< General Information, e.g. Plugin X loaded
+	PB_LOG_USER,
+	PB_LOG_DEBUG,	///< the only message to show during debug
+	PB_LOG_MEMORY
+};
+
+typedef struct PBStruct
+{
+	HWND			hWnd;				///<  Handle to the instance topmost window 
+	HINSTANCE		hInstance;			///<  Main window instance
+	BOOL			bInvoked;			///<  Whether the associated Meta Tag has been manually invoked
+	int				iTabID;				///<  PB Application ID
+	
+}PBSTRUCT,*PPBSTRUCT;
+
+BOOL	DeleteIMO		(IMOREF IMORef){ return TRUE;}
+BOOL	CallIMOMethod	(IMOREF IMORef,LPCTSTR pMethod){ return TRUE;}
+BOOL    SetIMOCallBack  (IMOREF IMORef,IMOEVENTPROC IMOEventProc,LPARAM lParam){ return TRUE;}
+BOOL	SetIMOProperty	(IMOREF IMORef,LPCTSTR pParam,LPCTSTR pValue){ return TRUE;}
+BOOL    Log (LogTypeInterface logSeverity,LPCTSTR pLogComment, 
+             LPCTSTR pFunctionName, DWORD dwLineNumber,LPCTSTR pCallingModule){ return TRUE;}
+IMOREF	CreateIMO		(PPBSTRUCT pPBStructure,LPCTSTR pTargetModuleName,LPCTSTR pCallingModName){ return 0; }
+#endif

data/platform/{android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java → wm/rhodes/LogMemory.cpp}

@@ -24,32 +24,44 @@
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
-package com.rhomobile.rhodes.webview;
+#include "stdafx.h"
+#include "LogMemory.h"
+#include "logging/RhoLog.h"
+#include <sstream>
 
-import android.webkit.WebStorage;
+#define DIV 1024
 
-import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhodesActivity;
+CLogMemory* CLogMemory::gInstance = 0;
 
+CLogMemory* CLogMemory::getInstance()
+{
+	if (gInstance==0)
+		gInstance = new CLogMemory();
+	return gInstance;
+}
 
-public class ChromeClientNew extends ChromeClientOld {
+rho::String CLogMemory::collect()
+{
+	std::ostringstream oss;
 
-	private static final String TAG = "ChromeClientNew";
-	
-	public ChromeClientNew(RhodesActivity rhodesActivity) {
-		super(rhodesActivity);
-	}
+	//Get the memory stats
+	MEMORYSTATUS sMemStat;
+	sMemStat.dwLength = sizeof(MEMORYSTATUS);
 
-	@Override
-	public void onConsoleMessage(String message, int lineNumber, String sourceID) {
-		Logger.D(TAG, message + " -- From line " + lineNumber + " of " + sourceID);
-	}
+	GlobalMemoryStatus(&sMemStat); 
 
-    public void onExceededDatabaseQuota(String url, String databaseIdentifier, long currentQuota, long estimatedSize,
-            long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) {
-            quotaUpdater.updateQuota(estimatedSize * 2);
-    }
-	
-}
+	sMemStat.dwTotalPhys /= DIV;
+	sMemStat.dwAvailPhys /= DIV;
+	sMemStat.dwTotalVirtual /= DIV;
+	sMemStat.dwAvailVirtual /= DIV;
 
+	oss <<
+		"Stats: Load=" << sMemStat.dwMemoryLoad <<
+		"%  TotalPhy=" << sMemStat.dwTotalPhys <<
+		"KB  FreePhy=" << sMemStat.dwAvailPhys <<
+		"KB  TotalVM=" << sMemStat.dwTotalVirtual <<
+		"KB  FreeVM=" << sMemStat.dwAvailVirtual <<
+		"KB";
 
+	return rho::String(oss.str());
+}

data/platform/{android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java → wm/rhodes/LogMemory.h}

@@ -24,13 +24,16 @@
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
-package com.rhomobile.rhodes.webview;
+#pragma once
 
-import android.webkit.WebSettings;
-import android.webkit.WebView;
+#include "logging/RhoLogConf.h"
 
-public interface RhoWebSettings {
-
-	public WebSettings setWebSettings(WebView w);
-	
-}
+class CLogMemory: public rho::IMemoryInfoCollector
+{
+private:
+	CLogMemory(){};
+	static CLogMemory* gInstance;
+public:
+	static CLogMemory* getInstance();
+	virtual rho::String collect();
+};

data/platform/wm/rhodes/LogOptionsDlg.h

@@ -36,7 +36,7 @@ public:
 	CLogOptionsDlg() : m_hWndCommandBar(0) {}
 	~CLogOptionsDlg(){}
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	enum { IDD = IDD_SIMULATOR_LOGOPTIONS };
 #else
 	enum { IDD = IDD_LOGOPTIONS };

data/platform/wm/rhodes/LogView.cpp

@@ -25,7 +25,7 @@
 *------------------------------------------------------------------------*/
 
 #include "stdafx.h"
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 #include <richedit.h>
 #include "common/RhoConf.h"
 #endif
@@ -35,7 +35,7 @@
 #include "logging/RhoLog.h"
 #include "common/RhodesApp.h"
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 rho::common::CMutex CLogView::m_ViewFlushLock;
 #endif
 
@@ -82,7 +82,7 @@ LRESULT CLogView::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
 
     loadLogText();
 
-#elif defined(OS_WINDOWS)
+#elif defined(OS_WINDOWS_DESKTOP)
 	m_grip.InitGrip(m_hWnd);
 	m_grip.ShowSizeGrip();
 	CWindow edit = GetDlgItem(IDC_LOGEDIT);
@@ -105,7 +105,7 @@ LRESULT CLogView::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
 	return 1;  // Let the system set the focus
 }
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 void CLogView::writeLogMessage( rho::String& strMsg ) {
 	rho::common::CMutexLock oLock(m_ViewFlushLock);
 	m_buffer.AddTail(strMsg);
@@ -138,7 +138,7 @@ LRESULT CLogView::OnRefresh(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHan
 LRESULT CLogView::OnClear(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled){
 
     LOGCONF().clearLog();
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	SetDlgItemText(IDC_LOGEDIT,_T(""));
 #else
 	loadLogText();
@@ -170,7 +170,7 @@ void CLogView::OnFinalMessage(HWND /*hWnd*/)
 
 LRESULT CLogView::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
 {
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	if (m_grip.GetSafeHwnd()) {
 		m_grip.UpdateGripPos();
 	}
@@ -181,7 +181,7 @@ LRESULT CLogView::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL&
     return 0;
 }
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 LRESULT CLogView::OnSizing(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
 {
   LPRECT pRect = (LPRECT) lParam;
@@ -318,7 +318,7 @@ LRESULT CLogView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl
 	return 0;
 }
 
-#endif  //OS_WINDOWS
+#endif  //OS_WINDOWS_DESKTOP
 
 
 #ifdef OS_WINCE
@@ -367,7 +367,7 @@ LRESULT CLogView::OnSendLog(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHan
 }
 
 // CResizableGrip
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 CResizableGrip::CResizableGrip()
 {
 	m_hParent = NULL;
@@ -528,4 +528,4 @@ void setIniInt(LPCTSTR lpKeyName, int nValue) {
 		lpKeyName, value, getIniPath());
 }
 
-#endif //OS_WINDOWS
+#endif //OS_WINDOWS_DESKTOP

data/platform/wm/rhodes/LogView.h

@@ -29,7 +29,7 @@
 #include "logging/RhoLogConf.h"
 #include "resource.h"
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 
 static UINT WM_FIND_TEXT = ::RegisterWindowMessage(FINDMSGSTRING);
 
@@ -78,13 +78,13 @@ protected:
 	static LRESULT CALLBACK GripWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
 };
-#endif //OS_WINDOWS
+#endif //OS_WINDOWS_DESKTOP
 
 // CLogView
 
 class CLogView : 
 	public CDialogImpl<CLogView>
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
    ,public rho::ILogSink
 #endif
 {
@@ -95,13 +95,13 @@ class CLogView :
 public:
     CLogView() : 
 	  m_hBrush ( NULL ), m_hWndCommandBar(0)
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	, m_pFindDialog(NULL), m_findText(L""), m_findParams(FR_DOWN)
 #endif
 	{}
 	~CLogView(){}
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 // IlogSink
 	static rho::common::CMutex m_ViewFlushLock;
 	CAtlList<rho::String> m_buffer;
@@ -112,7 +112,7 @@ public:
 #endif
 
 // Dialog
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	enum { IDD = IDD_SIMULATOR_LOGVIEW };
 #else
 	enum { IDD = IDD_LOGVIEW };
@@ -123,7 +123,7 @@ BEGIN_MSG_MAP(CLogView)
     MESSAGE_HANDLER(WM_SIZE, OnSize)
     MESSAGE_HANDLER(WM_CTLCOLORSTATIC,OnCtlColor)
     MESSAGE_HANDLER(WM_CTLCOLOREDIT,OnCtlColor)
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	MESSAGE_HANDLER(WM_SIZING, OnSizing)
 	MESSAGE_HANDLER(WM_CLOSE,OnClose)
 	MESSAGE_HANDLER(WM_TIMER, OnTimer)
@@ -172,7 +172,7 @@ END_MSG_MAP()
 
 	LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnCtlColor(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	LRESULT OnSizing(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 	LRESULT OnPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
@@ -196,7 +196,7 @@ END_MSG_MAP()
 		return 0;
 	}
 #endif
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 protected:
   CResizableGrip m_grip;
   CFindReplaceDialog *m_pFindDialog;
@@ -205,7 +205,7 @@ protected:
 #endif
 };
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 
 int  getIniInt(LPCTSTR lpKeyName, int nDefault);
 void setIniInt(LPCTSTR lpKeyName, int nValue);