rhodes 3.3.2.beta.1 → 3.3.2.beta.2

data/platform/wm/rhodes/rho/rubyext/RhoSignature.h

@@ -74,16 +74,35 @@ public:
 
 class CRhoSignatureWindow : public CDialogImpl <CRhoSignatureWindow>
 {
-    void* m_pInkImpl;
+    struct CSigPoint
+    {
+   	    short m_xPos;
+	    short m_yPos;
+	    bool  m_bNewLine;	
+
+        CSigPoint() : m_xPos(-1), m_yPos(-1), m_bNewLine(false){}
+        CSigPoint( int x, int y, bool bNewLine ) : m_xPos(x), m_yPos(y), m_bNewLine(bNewLine){}
+    };
+
+    //bool        m_bSigning;
+    //int         m_nCurPoint;
+    CPoint      m_ptLast;
+    bool        m_bOutOfSignature, m_bCapture;
+	Vector<CSigPoint> m_vecPoints;
+	bool		m_bDoVectors;
+
+    void addNewPoint(int x, int y, bool bNewLine);
+    void sendVectors();
+    void drawLastStroke();
+
     CRhoSignature::CParams* m_pParams;
     HRESULT m_hResult;
     HWND m_hWndCommandBar;
 
-    HBITMAP getScreenBitmap();
-    HRESULT saveBitmapToFile( HBITMAP hBitmap, LPCTSTR filename, LPCTSTR format);
-
+    HRESULT saveBitmapToFileByImageFactory( HBITMAP hBitmap, LPCTSTR filename, LPCTSTR format);
+    void drawSignature( CDC& oDC, CRect& rcDraw );
 public:
-    CRhoSignatureWindow(CRhoSignature::CParams* pParams) : m_pInkImpl(0), m_pParams(pParams), m_hWndCommandBar(0){}
+    CRhoSignatureWindow(CRhoSignature::CParams* pParams) : m_pParams(pParams), m_hWndCommandBar(0), m_bDoVectors(false), m_bOutOfSignature(false), m_bCapture(false){}
     ~CRhoSignatureWindow(){ delete m_pParams; }
 	
 	enum { IDD = IDD_TAKE_SIGNATURE };

data/platform/wm/rhodes/rho/rubyext/calendar.cpp

@@ -83,7 +83,14 @@ static void addVariantTimeToHash(VALUE hash, const char* key, DATE time)
 static DATE dateFromRuby(VALUE rDate)
 {
     SYSTEMTIME sysTime = {0};
-    UnixTimeToSystemTime(rho_ruby_get_time(rDate), &sysTime );
+//    UnixTimeToSystemTime(rho_ruby_get_time(rDate), &sysTime );
+    rDate = rho_ruby_get_time(rDate);
+    sysTime.wYear = (WORD)rho_ruby_get_time_part(rDate, "year");
+    sysTime.wMonth = (WORD)rho_ruby_get_time_part(rDate, "month");
+    sysTime.wDay = (WORD)rho_ruby_get_time_part(rDate, "day");
+    sysTime.wHour = (WORD)rho_ruby_get_time_part(rDate, "hour");
+    sysTime.wMinute = (WORD)rho_ruby_get_time_part(rDate, "min");
+    sysTime.wSecond = (WORD)rho_ruby_get_time_part(rDate, "sec");
 
     DATE time = 0;
     SystemTimeToVariantTime(&sysTime, &time);

data/platform/wm/tools/detool/detool.cpp

@@ -398,8 +398,9 @@ FatalError:
 
 bool wceRunProcess(const char *process, const char *args)
 {
-	HRESULT hRapiResult;
+#ifndef UNICODE
 	HRESULT hr;
+#endif
 	PROCESS_INFORMATION pi;    
 	WCHAR wszProgram[MAX_PATH];
 	WCHAR wszArgs[MAX_PATH];
@@ -694,6 +695,75 @@ void startLogServer( TCHAR * log_file, TCHAR* log_port )
 	WSACleanup();
 }
 
+void simulateKeyInput (int vk, BOOL bExtended, BOOL doDown, BOOL doUp)
+{
+    KEYBDINPUT kb = {0};
+    INPUT Input = {0};
+    if (doDown) {
+        // generate down 
+        if (bExtended)
+            kb.dwFlags = KEYEVENTF_EXTENDEDKEY;
+        kb.wVk = vk;  
+        Input.type = INPUT_KEYBOARD;
+        Input.ki = kb;
+        ::SendInput(1,&Input,sizeof(Input));
+    }
+    if (doUp) {
+        // generate up 
+        ::ZeroMemory(&kb,sizeof(KEYBDINPUT));
+        ::ZeroMemory(&Input,sizeof(INPUT));
+        kb.dwFlags = KEYEVENTF_KEYUP;
+        if (bExtended)
+            kb.dwFlags |= KEYEVENTF_EXTENDEDKEY;
+        kb.wVk = vk;
+        Input.type = INPUT_KEYBOARD;
+        Input.ki = kb;
+        ::SendInput(1,&Input,sizeof(Input));
+    }
+}
+
+bool doUseWMDC() {
+    OSVERSIONINFOW os_version;
+    ZeroMemory(&os_version, sizeof(OSVERSIONINFO));
+    os_version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+	::GetVersionEx(&os_version);
+	return (os_version.dwMajorVersion >= 6);
+}
+
+HWND findWMDCWindow() {
+    return FindWindow(NULL, L"Windows Mobile Device Center");
+}
+
+void startWMDC() {
+	if (doUseWMDC()) {
+        if (findWMDCWindow() == 0) {
+            _tprintf( TEXT("WMDC is not running. Starting WMDC...\n") );
+			::system("start %WINDIR%\\WindowsMobile\\wmdc.exe /show");
+			::Sleep(5000);
+		}
+	}
+}
+
+void connectWMDC() {
+	if (doUseWMDC()) {
+		HWND hwnd = findWMDCWindow();
+        if (hwnd == 0) {
+            _tprintf( TEXT("Cannot find WMDC window to establish network connection to device emulator.\n") );
+		} else {
+			::SetForegroundWindow(hwnd);
+			::SetFocus(hwnd);
+			::LockSetForegroundWindow(LSFW_LOCK);
+			::Sleep(100);
+			simulateKeyInput(VK_MENU, TRUE, TRUE, FALSE);
+			::Sleep(20);
+			simulateKeyInput('C', FALSE, TRUE, TRUE);
+			::Sleep(20);
+			simulateKeyInput(VK_MENU, TRUE, FALSE, TRUE);
+			::LockSetForegroundWindow(LSFW_UNLOCK);
+		}
+	}
+}
+
 int _tmain(int argc, _TCHAR* argv[])
 {
 	TCHAR *emu_name = NULL;
@@ -796,6 +866,8 @@ int _tmain(int argc, _TCHAR* argv[])
 				printf ("Failed to connect to remote device.\n");
 				goto stop_emu_deploy;
 			} else {
+				// start Windows Mobile Device Center for network connectivity of the device emulator (if applicable)
+				startWMDC();
 
 				hFind = CeFindFirstFile(app_dir, &findData);
 				if (INVALID_HANDLE_VALUE == hFind) {
@@ -846,6 +918,9 @@ int _tmain(int argc, _TCHAR* argv[])
 					goto stop_emu_deploy;
 				}
 
+				// establish network connectivity of the device emulator from Windows Mobile Device Center (if applicable)
+				connectWMDC();
+
 				emuBringToFront(emu_name);
 
 				_tprintf( TEXT("Starting application..."));
@@ -893,6 +968,9 @@ int _tmain(int argc, _TCHAR* argv[])
 			}
 			_tprintf( TEXT("DONE\n"));
 
+			// start Windows Mobile Device Center for network connectivity of the device emulator (if applicable)
+			startWMDC();
+
 			_tprintf( TEXT("Loading cab file..."));		
 			if (!wcePutFile (T2A(cab_file), "")) {
 				_tprintf( TEXT("FAILED\n"));
@@ -906,7 +984,7 @@ int _tmain(int argc, _TCHAR* argv[])
 				goto stop_emu_deploy;
 			}
 			_tprintf( TEXT("DONE\n"));
-			
+
 			_tprintf( TEXT("Setup application..."));
 
 			//FIXME: rake gives pathname with unix-like '/' file separators,
@@ -923,6 +1001,9 @@ int _tmain(int argc, _TCHAR* argv[])
 			}
 			_tprintf( TEXT("DONE\n"));
 
+			// establish network connectivity of the device emulator from Windows Mobile Device Center (if applicable)
+			connectWMDC();
+
 			emuBringToFront(emu_name);
 
 			_tprintf( TEXT("Starting application..."));
@@ -934,7 +1015,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
 			TCHAR params[128];
 			_tcscpy(params, _T("-log="));
-			_tcscpy(params, log_port);
+			_tcscat(params, log_port);
 
 			if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));
@@ -1027,7 +1108,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
 		TCHAR params[128];
 		_tcscpy(params, _T("-log="));
-		_tcscpy(params, log_port);
+		_tcscat(params, log_port);
 
 		if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 			_tprintf( TEXT("FAILED\n"));
@@ -1100,7 +1181,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
             TCHAR params[128];
             _tcscpy(params, _T("-log="));
-			_tcscpy(params, log_port);
+			_tcscat(params, log_port);
 
 			if(!wceRunProcess (T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));
@@ -1161,8 +1242,8 @@ int _tmain(int argc, _TCHAR* argv[])
 
     if (deploy_type == DEPLOY_EMU_WEBKIT)
     {
-        HANDLE hFind;
-        CE_FIND_DATA findData;
+        //HANDLE hFind;
+        //CE_FIND_DATA findData;
 
         _tprintf( TEXT("Searching for Windows CE device..."));
 

data/platform/wm/tools/detool/detool.vcproj

@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=""C:\Program Files\Windows Mobile 6 SDK\Activesync\inc""
+				AdditionalIncludeDirectories=""C:\Program Files (x86)\Windows Mobile 6 SDK\Activesync\inc""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -140,7 +140,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="rapi.lib Ws2_32.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Program Files\Windows Mobile 6 SDK\Activesync\Lib"
+				AdditionalLibraryDirectories="C:\Program Files (x86)\Windows Mobile 6 SDK\Activesync\Lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

data/platform/wm/tools/detool/stdafx.h

@@ -37,6 +37,7 @@
 
 #include <atlbase.h>
 #include <atlstr.h>
+#include <windows.h>
 
 //Device Emulator interface
 #import "DEMComInterface.tlb" no_namespace raw_interfaces_only

data/platform/wp7/RhoRubyExtGen/RhoSyncEngine.cs

@@ -37,7 +37,7 @@ namespace rho.rubyext
     public static class RhoSyncEngine
     {
         [RubyMethod("dosync", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync(RubyModule/*!*/ self, RubyArray args)
+        public static object dosync(RubyModule/*!*/ self, params object[] args)
         {
             return null;
         }
@@ -49,7 +49,7 @@ namespace rho.rubyext
         }*/
 
         [RubyMethod("dosync_source", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync_source(RubyModule/*!*/ self, RubyArray args)
+        public static object dosync_source(RubyModule/*!*/ self, params object[] args)
         {
             return null;
         }

data/platform/wp7/RhoRubyLib/Initializers.Generated.cs

@@ -285,13 +285,13 @@ namespace rho.rubyext {
             );
             
             DefineLibraryMethod(module, "dosync", 0x21, 
-                0x00000000U, 
-                new Func<IronRuby.Builtins.RubyModule, IronRuby.Builtins.RubyArray, System.Object>(rho.rubyext.RhoSyncEngine.dosync)
+                0x80000000U, 
+                new Func<IronRuby.Builtins.RubyModule, System.Object[], System.Object>(rho.rubyext.RhoSyncEngine.dosync)
             );
             
             DefineLibraryMethod(module, "dosync_source", 0x21, 
-                0x00000000U, 
-                new Func<IronRuby.Builtins.RubyModule, IronRuby.Builtins.RubyArray, System.Object>(rho.rubyext.RhoSyncEngine.dosync_source)
+                0x80000000U, 
+                new Func<IronRuby.Builtins.RubyModule, System.Object[], System.Object>(rho.rubyext.RhoSyncEngine.dosync_source)
             );
             
             DefineLibraryMethod(module, "enable_status_popup", 0x21, 

data/platform/wp7/RhoRubyLib/common/RhodesApp.cs

@@ -289,6 +289,11 @@ namespace rho.common
                 }
             }
 
+            processInvokeScriptArgs(arr[0], arrParams, index);
+        }
+
+        public void processInvokeScriptArgs(String strFuncName, String[] arrParams, int index)
+        {
             m_webBrowser.Dispatcher.BeginInvoke(() =>
             {
                 try
@@ -297,17 +302,17 @@ namespace rho.common
                     {
                         if (m_tabControl != null && m_tabControl.Items.Count > 0)
                         {
-                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.InvokeScript(arr[0], arrParams);
+                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.InvokeScript(strFuncName, arrParams);
                         }
                     }
                     else
                     {
-                        m_webBrowser.InvokeScript(arr[0], arrParams);
+                        m_webBrowser.InvokeScript(strFuncName, arrParams);
                     }
                 }
                 catch (Exception exc)
                 {
-                    LOG.ERROR("WebView.execute_js failed: " + arr[0] + "(" + String.Join(",", arrParams), exc);
+                    LOG.ERROR("WebView.execute_js failed: " + strFuncName + "(" + String.Join(",", arrParams), exc);
                 }
             });
         }

data/platform/wp7/RhoRubyLib/net/HttpServer.cs

@@ -67,11 +67,12 @@ namespace rho.net
             CRoute m_route;
             CHttpServer m_Parent;
             int m_nCommand;
+            String m_strAjaxContext;
 
             public const int scDispatch = 1, scIndex = 2;
 
-            public CServerCommand(CHttpServer Parent, CRoute route, 
-                String method, String uri, String query, String body, int nCommand)
+            public CServerCommand(CHttpServer Parent, CRoute route,
+                String method, String uri, String query, String body, int nCommand, String strAjaxContext)
             {
                 m_Parent = Parent;
                 m_method = method;
@@ -80,6 +81,7 @@ namespace rho.net
                 m_body = body;
                 m_route = route;
                 m_nCommand = nCommand;
+                m_strAjaxContext = strAjaxContext;
             }
 
             public void execute()
@@ -90,7 +92,22 @@ namespace rho.net
                 else if ( m_nCommand == scIndex )
                     strUrl = m_Parent.processIndex(m_route, m_method, m_uri, m_query, m_body);
 
-                RHODESAPP().processWebNavigate(strUrl, -1);
+                if (m_strAjaxContext == null || m_strAjaxContext.length() == 0)
+                {
+                    RHODESAPP().processWebNavigate(strUrl, -1);
+                }
+                else
+                {
+                    String res = CRhoFile.isResourceFileExist(strUrl) ? CRhoFile.readStringFromResourceFile(strUrl) : CRhoFile.readStringFromFile(strUrl);
+                    
+                    String[] args = new String[4];
+                    args[0] = m_strAjaxContext;
+                    args[1] = res;
+                    args[2] = "ok";
+                    args[3] = "200";
+
+                    RHODESAPP().processInvokeScriptArgs("RhodesAjaxResult", args, RHODESAPP().getCurrentTab());
+                }
             }
 
             public boolean equals(IQueueCommand cmd) { return false; }
@@ -122,8 +139,10 @@ namespace rho.net
             (pCmd as CServerCommand).execute();
         }
 
-        public boolean processBrowserRequest(Uri uri)
+        public boolean processBrowserRequest(Uri uri, String strAjaxContext)
         {
+            boolean bAjaxCall = !(strAjaxContext == null || strAjaxContext.length() == 0);
+            
             if (!uri.OriginalString.StartsWith(RHODESAPP().getHomeUrl())
                            && (uri.IsAbsoluteUri || uri.OriginalString.StartsWith("res:")))
                 return false;
@@ -149,7 +168,7 @@ namespace rho.net
             CRoute route = new CRoute();
             if (dispatch(url, route))
             {
-                addQueueCommand(new CServerCommand(this, route, "GET", url, query, "", CServerCommand.scDispatch));
+                addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "POST" : "GET", url, query, "", CServerCommand.scDispatch, strAjaxContext));
 
                 return true;
             }
@@ -159,7 +178,7 @@ namespace rho.net
             String strIndexFile = getIndex(fullPath);
             if (strIndexFile.Length > 0)
             {
-                addQueueCommand(new CServerCommand(this, route, "GET", url, query, "", CServerCommand.scIndex));
+                addQueueCommand(new CServerCommand(this, route, bAjaxCall ? "POST" : "GET", url, query, "", CServerCommand.scIndex, strAjaxContext));
 
                 return true;
             }

data/platform/wp7/RhoRubyLib/net/NetRequest.cs

@@ -467,7 +467,7 @@ namespace rho.net
 
             if ((strBody != null && strBody.length() > 0) || m_isPullFile || m_isMultiPart)
 			{
-                if (oSession != null)
+                if (oSession != null && !m_isPullFile)
                     m_webRequest.ContentType = oSession.getContentType();
                 else if (m_isMultiPart)
                     m_webRequest.ContentType = "multipart/form-data; boundary=----------A6174410D6AD474183FDE48F5662FCC5";

data/platform/wp7/RhoRubyLib/rubyext/RhoSyncEngine.cs

@@ -43,21 +43,26 @@ namespace rho.rubyext
         static CRhoRuby RhoRuby { get { return CRhoRuby.Instance; } }
 
         [RubyMethod("dosync", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync(RubyModule/*!*/ self, RubyArray args)
+        public static object dosync(RubyModule/*!*/ self, params object[] args)
         {
             object res = null;
             try
             {
                 boolean bShowStatus = true;	
                 String query_params = "";
-                if ( args != null && args.Count > 0 )	
+                if ( args != null && args.Length > 0 )	
                 {
-                    String str = ((MutableString)args[0]).ToString();	
-                    //bShowStatus = args[0].Equals(RubyConstant.QTRUE)||"true".equalsIgnoreCase(str);	
-                    bShowStatus = "true".equalsIgnoreCase(str);	
+                    if (args[0] is int)
+                        bShowStatus = ((int)args[0]).Equals(1);
+                    else
+                    {
+                        String str = ((MutableString)args[0]).ToString();
+                        //bShowStatus = args[0].Equals(RubyConstant.QTRUE)||"true".equalsIgnoreCase(str);	
+                        bShowStatus = "true".equalsIgnoreCase(str);
+                    }
                 }
         
-                if (args != null && args.Count > 1)
+                if (args != null && args.Length > 1)
                     query_params = ((MutableString)args[1]).ToString();
                 
                 SyncThread.getInstance().addQueueCommand(new SyncThread.SyncCommand(SyncThread.scSyncAll, bShowStatus, query_params));
@@ -103,7 +108,7 @@ namespace rho.rubyext
         }*/
 
         [RubyMethod("dosync_source", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync_source(RubyModule/*!*/ self, RubyArray args)
+        public static object dosync_source(RubyModule/*!*/ self, params object[] args)
         {
             object res = null;
             try
@@ -127,14 +132,19 @@ namespace rho.rubyext
 
                 boolean bShowStatus = true;	
                 String query_params = "";
-                if ( args != null && args.Count > 1 )	
+                if ( args != null && args.Length > 1 )	
                 {
-                    String str = ((MutableString)args[1]).ToString();	
-                    //bShowStatus = args[0].Equals(RubyConstant.QTRUE)||"true".equalsIgnoreCase(str);	
-                    bShowStatus = "true".equalsIgnoreCase(str);	
+                    if (args[1] is int)
+                        bShowStatus = ((int)args[1]).Equals(1);
+                    else
+                    {
+                        String str = ((MutableString)args[1]).ToString();
+                        //bShowStatus = args[0].Equals(RubyConstant.QTRUE)||"true".equalsIgnoreCase(str);	
+                        bShowStatus = "true".equalsIgnoreCase(str);
+                    }
                 }
-        
-                if (args != null && args.Count > 2)
+
+                if (args != null && args.Length > 2)
                     query_params = ((MutableString)args[2]).ToString();
 
                 SyncThread.getInstance().addQueueCommand(new SyncThread.SyncCommand(SyncThread.scSyncOne, strName, nSrcID, bShowStatus, query_params));

data/platform/wp7/RhoRubyLib/sync/SyncProtocol_3.cs

@@ -17,7 +17,12 @@ namespace rho.sync
 
         public String getLoginUrl()
         {
-            return RhoConf.getInstance().getPath("syncserver") + "clientlogin";
+            if (RhoConf.getInstance().getPath("syncserver").Equals("http://rhoconnect-spec-wp.heroku.com/application/"))
+                return "http://rhoconnect-spec-wp.heroku.com/api/application/clientlogin";
+            else if (RhoConf.getInstance().getPath("syncserver").Equals("http://rhodes-samples-server.heroku.com/application/"))
+                return "http://rhodes-samples-server.heroku.com/api/application/clientlogin";
+            else
+                return RhoConf.getInstance().getPath("syncserver") + "clientlogin";
         }
 
         public String getLoginBody(String name, String password)

data/platform/wp7/RhoRubyLib/views/RhoView.xaml.cs

@@ -39,11 +39,15 @@ using Microsoft.Phone.Controls;
 using System.Windows.Navigation;
 using IronRuby.Builtins;
 using rho.common;
+using System.IO;
 
 namespace rho.views
 {
     public partial class RhoView : UserControl
     {
+        private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() :
+                    new RhoLogger("RhoView");
+
         private Stack<Uri> m_backHistory = new Stack<Uri>();
         private Stack<Uri> m_forwardHistory = new Stack<Uri>();
         /// <summary>
@@ -59,6 +63,7 @@ namespace rho.views
         private bool m_reload = false;
         private bool m_loadFirstTime = true;
         private bool m_masterView = false;
+        private const string AJAX_CONTEXT_PARAM = "_rho_callbackId";
         //TO DO history. each time we have to save our current state of rhodesapp in rhoview entity
         public Stack<Uri> BackHistory { set { m_backHistory = value; } }
         public Stack<Uri> ForwardHistory { set { m_forwardHistory = value; } }
@@ -74,6 +79,7 @@ namespace rho.views
             //webBrowser1.LoadCompleted += WebBrowser_OnLoadCompleted;
             webBrowser1.Navigating += WebBrowser_OnNavigating;
             webBrowser1.Navigated += WebBrowser_OnNavigated;
+            webBrowser1.ScriptNotify += WebBrowser_OnScriptNotify;
         }
         
         public RhoView(PhoneApplicationPage mainPage, Grid layoutRoot, String strAction,
@@ -86,7 +92,7 @@ namespace rho.views
             //webBrowser1.LoadCompleted += WebBrowser_OnLoadCompleted;
             webBrowser1.Navigating += WebBrowser_OnNavigating;
             webBrowser1.Navigated += WebBrowser_OnNavigated;
-            //webBrowser1.ScriptNotify += WebBrowser_OnScriptNotify;
+            webBrowser1.ScriptNotify += WebBrowser_OnScriptNotify;
             m_mainPage = mainPage;
             m_strAction = strAction;
             m_layoutRoot = layoutRoot;
@@ -134,7 +140,7 @@ namespace rho.views
 
         private void WebBrowser_OnNavigating(object sender, NavigatingEventArgs e)
         {
-            if (!RHODESAPP().HttpServer.processBrowserRequest(e.Uri))
+            if (!RHODESAPP().HttpServer.processBrowserRequest(e.Uri, null))
                 return;
 
             e.Cancel = true;
@@ -145,6 +151,31 @@ namespace rho.views
             RHODESAPP().addToHistory(e.Uri);
         }
 
+        private string extractAjaxContext(string uri)
+        {
+            int idx = uri.indexOf(AJAX_CONTEXT_PARAM) + AJAX_CONTEXT_PARAM.length();
+            if (-1 == idx)
+                return null;
+
+            string context = uri.substring(idx + 1);  // +1 due to the '=' sign after param name
+
+            idx = context.indexOf('&');
+            if (-1 < idx)
+                context = context.substring(0, idx);
+
+            return context;
+        }
+
+        private void WebBrowser_OnScriptNotify(object sender, NotifyEventArgs e)
+        {
+            string ajaxContext = extractAjaxContext(e.Value);
+            if (!RHODESAPP().HttpServer.processBrowserRequest(new Uri(e.Value, UriKind.Relative), ajaxContext))
+            {
+                LOG.ERROR("External requests should be filtered in javascript");
+            }
+
+        }
+
         public void refresh()
         {
             WebBrowser_OnLoaded(this, null);

data/platform/wp7/build/wp.rake

@@ -417,6 +417,58 @@ namespace "run" do
                 $rhosim_config = "platform='wp'\r\n"
                 Rake::Task["run:rhosimulator_debug"].invoke            
             end
+            
+            task :spec do
+				Rake::Task["run:wp"].invoke
+				Jake.before_run_spec
+				log_file = getLogPath
+
+				puts "waiting for log: " + log_file
+        
+				for i in 0..120
+				if !File.exist?(log_file)
+					sleep(1)
+				else
+					break
+				end
+				end
+
+				if !File.exist?(log_file)
+					puts "Can not read log file: " + log_file
+					exit(1)
+		        end
+
+		        puts "start read log"
+
+				io = File.new(log_file, "r")
+				waiting_count = 0
+				end_spec = false
+				while !end_spec do
+					line_count = 0
+					io.each do |line|
+						#puts line
+						end_spec = !Jake.process_spec_output(line)
+						break if end_spec
+						line_count += 1
+					end
+					if line_count==0
+						waiting_count += 1
+					else
+						waiting_count = 0
+					end
+					if waiting_count > 240
+						puts "spec application hung (240 seconds timeout)"
+						end_spec = true
+					end
+					sleep(1) unless end_spec
+				end
+				io.close
+
+				Jake.process_spec_results(start)
+        
+				$stdout.flush
+				chdir $startdir
+			end
 
 			task :phone_spec do
 				Jake.run_spec_app('wp','phone_spec')

data/rakefile.rb

@@ -80,7 +80,7 @@ namespace "framework" do
 end
 
 
-$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_use_doc_folder', 'iphone_all_in_doc_folder']
+$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot']
 
 def make_application_build_config_header_file
   f = StringIO.new("", "w+")      

data/res/generators/rhogen.rb

@@ -388,6 +388,11 @@ module Rhogen
         template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/Rakefile"
     end
 
+    template :extension_wm_vcsol do |template|
+        template.source = 'extensions/montana/ext/montana/platform/wm/Montana.sln'
+        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/#{name.camel_case}.sln"
+    end
+
     template :extension_wm_vcproject do |template|
         template.source = 'extensions/montana/ext/montana/platform/wm/Montana.vcproj'
         template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/#{name.camel_case}.vcproj"

data/res/generators/templates/application/app/Settings/controller.rb

@@ -112,6 +112,6 @@ class SettingsController < Rho::RhoController
       else
         WebView.navigate( url_for :action => :err_sync, :query => { :msg => @msg } )
       end    
-	  end
+	end
   end  
 end