rhodes 1.5.5 → 2.0.0.beta1

data/platform/wm/rhodes/rho/net/NetRequestImpl.h

@@ -41,7 +41,7 @@ public:
 
 	boolean isOK()
 	{
-		return m_nRespCode == 200;
+		return m_nRespCode == 200 || m_nRespCode == 206;
 	}
 
     boolean isUnathorized()
@@ -74,23 +74,27 @@ class CNetRequestImpl
     Hashtable<String,String>* m_pHeaders;
     boolean m_bCancel;
     IRhoSession* m_pSession;
+    boolean m_sslVerifyPeer;
 
 public :
-    CNetRequestImpl(CNetRequest* pParent, const char* method, const String& strUrl, IRhoSession* oSession, Hashtable<String,String>* pHeaders);
+    CNetRequestImpl(CNetRequest* pParent, const char* method, const String& strUrl, 
+        IRhoSession* oSession, Hashtable<String,String>* pHeaders, boolean sslVerifyPeer);
     ~CNetRequestImpl();
 
     void close();
     void cancel();
     bool isError(){ return pszErrFunction!= null; }
     CNetResponseImpl* sendString(const String& strBody);
-    CNetResponseImpl* sendStream(common::InputStream* body);
+
+    CNetResponseImpl* sendMultipartData(VectorPtr<CMultipartItem*>& arItems);
+
     CNetResponseImpl* downloadFile(common::CRhoFile& oFile);
 
 private:
     String makeClientCookie();
 
     void ErrorMessage(LPCTSTR pszFunction);
-    void readInetFile( void* hRequest, CNetResponseImpl* pNetData, common::CRhoFile* pFile = NULL );
+    void readInetFile( void* hRequest, CNetResponseImpl* pNetData, common::CRhoFile* pFile = NULL, char* pBuf = NULL, DWORD dwBufSize = 0);
     void alloc_url_components(URL_COMPONENTS *uri, const wchar_t *url);
     void free_url_components(URL_COMPONENTS *uri);
     void readResponse(CNetResponseImpl* pNetData);
@@ -98,6 +102,12 @@ private:
 
     boolean readHeaders(Hashtable<String,String>& oHeaders);
     void    writeHeaders(Hashtable<String,String>* pHeaders);
+    boolean checkSslCertError();
+
+    String getBodyContentType();
+    bool internetWriteHeader( const char* szPrefix, const char* szBody, const char* szPrefixEnd);
+
+    int processMultipartItems( VectorPtr<CMultipartItem*>& arItems );
 
 };
 

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

@@ -38,7 +38,7 @@ CGPSDevice * CGPSDevice::Instance()
     return CGPSDevice::s_pInstance;
 }
 
-/*static*/ boolean CGPSDevice::isAvailable()
+/*static*/ bool CGPSDevice::isAvailable()
 {
     return s_pInstance && s_pInstance->m_hGPS_Device;
 }

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

@@ -53,7 +53,7 @@ public:
     static HRESULT TurnOn(IGPSController * pController);
     static HRESULT TurnOff();
 
-    static boolean isAvailable();
+    static bool isAvailable();
 };
 
 class CGPSController : public IGPSController {

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

@@ -13,6 +13,8 @@
 
 using namespace rho;
 using namespace rho::common;
+extern "C" HWND getMainWnd();
+extern "C" char* wce_wctomb(const wchar_t* w);
 
 extern "C"
 {
@@ -235,13 +237,79 @@ static int has_camera()
 #endif
 }
 
-VALUE rho_sysimpl_get_property(char* szPropName)
+static double get_screen_ppi_x()
+{
+	HWND hWndDesktop = GetDesktopWindow();
+	HDC hdcDesktop = GetDC(hWndDesktop);
+	int mms = GetDeviceCaps(hdcDesktop, HORZSIZE);
+	int pixels = GetDeviceCaps(hdcDesktop, HORZRES);
+	double ret = (pixels*25.4)/mms;
+	return ret;
+}
+
+static double get_screen_ppi_y()
+{
+	HWND hWndDesktop = GetDesktopWindow();
+	HDC hdcDesktop = GetDC(hWndDesktop);
+	int mms = GetDeviceCaps(hdcDesktop, VERTSIZE);
+	int pixels = GetDeviceCaps(hdcDesktop, VERTRES);
+	double ret = (pixels*25.4)/mms;
+	return ret;
+}
+
+int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 {
 	if (strcasecmp("has_camera",szPropName) == 0) 
-        return rho_ruby_create_boolean(has_camera());
+        {*resValue = rho_ruby_create_boolean(has_camera()); return 1;}
 
 	if (strcasecmp("phone_number",szPropName) == 0)
-		return phone_number();
+        {*resValue = phone_number();return 1;}
+
+	if (strcasecmp("ppi_x",szPropName) == 0)
+        {*resValue = rho_ruby_create_double(get_screen_ppi_x()); return 1;}
+
+	if (strcasecmp("ppi_y",szPropName) == 0)
+        {*resValue = rho_ruby_create_double(get_screen_ppi_y()); return 1; }
+
+	if (strcasecmp("device_name",szPropName) == 0)
+	{
+#ifdef OS_WINDOWS
+		*resValue = rho_ruby_create_string("Win32");
+#else
+		HKEY hKey;
+		if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("Ident"),
+			0, KEY_READ, &hKey ) != ERROR_SUCCESS)
+			return 0;
+
+		DWORD dwType = REG_SZ;
+		DWORD dwDataSize = 0;
+		if ( RegQueryValueEx( hKey, _T("name"), 0, &dwType, (PBYTE)NULL,
+			&dwDataSize ) != ERROR_SUCCESS)
+			return 0;
+
+		std::vector<wchar_t> deviceName(dwDataSize + 1);
+		RegQueryValueEx( hKey, _T("name"), 0, &dwType, (PBYTE)&deviceName[0], &dwDataSize );
+		char *s = wce_wctomb(&deviceName[0]);
+		*resValue = rho_ruby_create_string(s);
+		::free(s);
+
+		RegCloseKey(hKey);
+		return 1;
+#endif
+	}
+
+	if (strcasecmp("os_version",szPropName) == 0)
+	{
+		OSVERSIONINFO osv;
+		osv.dwOSVersionInfoSize = sizeof(osv);
+		if (!GetVersionEx(&osv))
+			return 0;
+		char buf[50];
+		snprintf(buf, sizeof(buf), "%u.%u.%u", (unsigned)osv.dwMajorVersion,
+			(unsigned)osv.dwMinorVersion, (unsigned)osv.dwBuildNumber);
+		*resValue = rho_ruby_create_string(&buf[0]);
+		return 1;
+	}
 
     return 0;
 }
@@ -291,4 +359,9 @@ VALUE rho_sys_has_network()
 	return rho_ruby_create_boolean(g_rho_has_network!=0);
 }
 
-}
+void rho_sys_app_exit()
+{
+	::PostMessage(getMainWnd(), WM_COMMAND, MAKEWPARAM(IDM_EXIT,0), (LPARAM )0);
+}
+
+} //extern "C"

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

@@ -0,0 +1,63 @@
+#include "stdafx.h"
+
+#include "ruby/ext/rho/rhoruby.h"
+#include "rubyext/WebView.h"
+#include "common/RhodesApp.h"
+#include "common/StringConverter.h"
+#include "MainWindow.h"
+
+using namespace rho;
+using namespace rho::common;
+extern "C" {
+HWND getMainWnd();
+
+void rho_webview_refresh(int index) 
+{
+    rho_webview_navigate(RHODESAPP().getCurrentUrl().c_str(),0);
+}
+
+void rho_webview_navigate(const char* url, int index) 
+{
+    String strUrl = RHODESAPP().canonicalizeRhoUrl(url);
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE, (LPARAM)_tcsdup(convertToStringW(strUrl).c_str()) );
+}
+
+void rho_webview_navigate_back()
+{
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE_BACK, (LPARAM)0 );
+}
+
+const char* rho_webview_execute_js(const char* js, int index) 
+{
+    String strJS = "javascript:";
+    strJS += js;
+
+    rho_webview_navigate(strJS.c_str(), index);
+	return "";
+}
+
+const char* rho_webview_current_location(int index) 
+{
+    return RHODESAPP().getCurrentUrl(index).c_str();
+}
+
+int rho_webview_active_tab() 
+{
+	return 0;
+}
+
+void rho_webview_set_menu_items(VALUE valMenu) 
+{
+    rho_rhodesapp_setViewMenu(valMenu); 
+}
+
+
+void rho_webview_full_screen_mode(int enable)
+{
+    ::PostMessage( getMainWnd(), WM_COMMAND, ID_FULLSCREEN, (LPARAM)enable );
+}
+
+}
+
+
+

data/platform/wm/rhodes/rhodes.vcproj

@@ -60,7 +60,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;."
+				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
 				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;DEBUG;UNICODE;_UNICODE;$(ARCHFAM);$(_ARCHFAM_);POCKETPC2003_UI_MODEL"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -89,6 +89,7 @@
 				AdditionalDependencies="aygshell.lib Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppwd.lib pimstore.lib"
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="0"
 				StackReserveSize="196608"
@@ -157,7 +158,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;."
+				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
 				PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_WINDOWS;ENABLE_DYNAMIC_RHOBUNDLE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -442,7 +443,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;."
+				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
 				PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);NDEBUG;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE;POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -470,6 +471,7 @@
 				AdditionalDependencies="Ws2.lib Ceshell.lib wininet.lib Cellcore.lib Gpsapi.lib  comsuppw.lib pimstore.lib"
 				OutputFile="$(OutDir)/rhodes.exe"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="0"
 				StackReserveSize="196608"
@@ -537,7 +539,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;."
+				AdditionalIncludeDirectories="../../shared;./rho;../../shared/ruby;../../shared/wtl80/include;."
 				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS;ENABLE_DYNAMIC_RHOBUNDLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -807,7 +809,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\GetURLDialog.cpp"
+				RelativePath=".\DateTimePicker.cpp"
 				>
 			</File>
 			<File
@@ -902,6 +904,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\Utils.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Vibrate.cpp"
 				>
@@ -921,7 +927,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\GetURLDialog.h"
+				RelativePath=".\DateTimePicker.h"
 				>
 			</File>
 			<File
@@ -956,6 +962,10 @@
 				RelativePath=".\stdafx.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Utils.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Vibrate.h"
 				>
@@ -1042,6 +1052,10 @@
 					RelativePath=".\rho\rubyext\SystemImpl.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\rho\rubyext\WebView.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1096,66 +1110,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="unzip"
-			>
-			<File
-				RelativePath="..\..\shared\unzip\unzip.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\shared\unzip\unzip.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="camera"
 			>

data/platform/wm/rhodes/stdafx.h

@@ -75,6 +75,28 @@
 #include <atlstr.h>
 #include <atlcoll.h>
 
+#if defined (_WIN32_WCE) 
+//--- Define max and min macroses for WTL only ---
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+#include <atlapp.h>
+#include <atlframe.h>
+#include <atlmisc.h>
+#include <atlctrls.h>
+#define _WTL_CE_NO_ZOOMSCROLL
+#include <atlwince.h>
+
+#undef max
+#undef min
+//---   ---
+#endif
+
 #if defined (_WIN32_WCE) 
 #include <pvdispid.h>
 #include <piedocvw.h>

data/platform/wm/rubylib/rubylib.vcproj

@@ -1551,6 +1551,10 @@
 				<Filter
 					Name="webview"
 					>
+					<File
+						RelativePath="..\..\shared\ruby\ext\webview\webview.i"
+						>
+					</File>
 					<File
 						RelativePath="..\..\shared\ruby\ext\webview\webview_wrap.c"
 						>

data/platform/wm/syncengine/syncengine.vcproj

@@ -1155,6 +1155,10 @@
 				RelativePath="..\..\shared\sync\ClientRegister.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\sync\ISyncProtocol.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\sync\SyncEngine.cpp"
 				>
@@ -1171,6 +1175,10 @@
 				RelativePath="..\..\shared\sync\SyncNotify.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\sync\SyncProtocol_3.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\sync\SyncSource.cpp"
 				>