rhodes 2.2.6 → 2.3.0.beta.1

data/platform/wm/rhodes/Rhodes.cpp

@@ -5,7 +5,6 @@
 #include "common/RhodesApp.h"
 #include "common/StringConverter.h"
 #include "common/rhoparams.h"
-#include "common/app_build_configs.h"
 #include "rho/rubyext/GeoLocationImpl.h"
 #include "ruby/ext/rho/rhoruby.h"
 #include "net/NetRequestImpl.h"
@@ -46,14 +45,16 @@ HREGNOTIFY g_hNotify = NULL;
 String httpProxy;
 #endif
 
+static String g_strCmdLine;
+
 class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
 {
 private:
 
 public :
-	bool ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) throw( ) {
+	bool ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) throw( ) 
+    {
 		m_nRestarting = 1;
-        //m_bRhoGalleryApp = false;
 		TCHAR szTokens[] = _T("-/");
 		LPCTSTR lpszToken = FindOneOf(lpCmdLine, szTokens);
         getRhoRootPath();
@@ -63,37 +64,6 @@ public :
 			if (WordCmpI(lpszToken, _T("Restarting"))==0) {
 				m_nRestarting = 10;
 			}
-			/*
-			if (WordCmpI(lpszToken, _T("rhogallery_app"))==0) {
-				m_bRhoGalleryApp = true;
-			}
-			*/
-			{ // -RhoStartParams:
-				rho::String cur_token = wce_wctomb(lpszToken);
-				rho::String start_params_key = "RhoStartParams:";
-				int sppos = cur_token.find(start_params_key.c_str(), 0, start_params_key.length());
-				if (sppos != string::npos) {
-					// extract start params
-					rho::String start_params = cur_token.substr(sppos+start_params_key.length(), cur_token.length() - start_params_key.length() - sppos);
-
-					// check start params for security_token
-
-					rho::String security_key = "security_token=";
-					int skpos = start_params.find(security_key.c_str(), 0, security_key.length());
-					if (skpos != string::npos) {
-						rho::String tmp = start_params.substr(skpos+security_key.length(), start_params.length() - security_key.length() - skpos);
-
-						int divider = tmp.find_first_of(" /-,");
-						if (divider != string::npos) {
-							m_strSecurityToken = tmp.substr(0, divider);
-						}
-						else {
-							m_strSecurityToken = tmp;
-						}
-					}
-
-				}
-			}
 
 #if defined(OS_WINDOWS)
 			if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) {
@@ -165,32 +135,14 @@ public :
 		}
 
 		rho_logconf_Init(m_strRootPath.c_str());
-		/*
-        if ( RHOCONF().getBool("rhogallery_only_app") && !m_bRhoGalleryApp)
+
+        if ( !rho_rhodesapp_canstartapp(g_strCmdLine.c_str(), " /-,") )
         {
-            LOG(INFO) + "This is RhoGallery only app and can be started only from RhoGallery.";
-            return S_FALSE;
+			LOG(INFO) + "This is hidden app and can be started only with security key.";
+			return S_FALSE;
         }
-		*/
-		///*
-		{
-
-			const char* app_security_token_cc = get_app_build_config_item("security_token");
-			if (app_security_token_cc != NULL) {
-				rho::String app_security_token = app_security_token_cc;
-				if (app_security_token.length() > 0) {
-					if (app_security_token.compare(m_strSecurityToken) != 0) {
-						LOG(INFO) + "This is hidden app and can be started only with security key.";
-						return S_FALSE;
-					}
-				}
-			}
-		}
-		//*/
-
 
 		LOG(INFO) + "Rhodes started";
-
 #ifdef OS_WINDOWS
 		if (httpProxy.length() > 0) {
 			parseHttpProxyURI(httpProxy);
@@ -200,8 +152,6 @@ public :
 			}
 		}
 #endif
-			
-
         //::SetThreadPriority(GetCurrentThread(),10);
 
 		//Check for bundle directory is exists.
@@ -280,10 +230,18 @@ public :
         return S_OK;
     }
 
-	HWND GetManWindow() {
+	HWND GetMainWindow() {
 		return m_appWindow.m_hWnd;
 	}
 
+	CMainWindow* GetMainWindowObject() {
+		return &m_appWindow;
+	}
+
+	CMainWindow& GetAppWindow() {
+		return m_appWindow;
+	}
+
 	HWND GetWebViewWindow() {
 		return m_appWindow.getWebViewHWND();
 	}
@@ -443,19 +401,19 @@ public :
 		LOG(INFO) + "HTTP proxy port     = " + port;
 	
 		if (host.length()) {
-			RHOCONF().setString ("http_proxy_host", host);
+			RHOCONF().setString ("http_proxy_host", host, false);
 
 			if (port.length()){
-				RHOCONF().setString ("http_proxy_port", port);
+				RHOCONF().setString ("http_proxy_port", port, false);
 			} else {
 				LOG(WARNING) + "there is no proxy port defined";
 			}
 
 			if (login.length())
-				RHOCONF().setString ("http_proxy_login", login);
+				RHOCONF().setString ("http_proxy_login", login, false);
 
 			if (password.length())
-				RHOCONF().setString ("http_proxy_password", password);
+				RHOCONF().setString ("http_proxy_password", password, false);
 
 		} else {
 			LOG(ERROR) + "empty host name in HTTP-proxy URL";
@@ -467,19 +425,15 @@ private:
     CMainWindow m_appWindow;
     rho::String m_strRootPath;
 	int m_nRestarting;
-
-    bool m_bRhoGalleryApp;
-	rho::String m_strSecurityToken;
 };
 
 CRhodesModule _AtlModule;
 HINSTANCE rhoApplicationHINSTANCE = 0;
-
 //
 bool g_restartOnExit = false;
 //
 extern "C" int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/,
-                                LPTSTR /*lpCmdLine*/, int nShowCmd)
+                                LPTSTR lpCmdLine, int nShowCmd)
 {
 	INITCOMMONCONTROLSEX ctrl;
 
@@ -487,20 +441,31 @@ extern "C" int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/
 	
 	//Required to use datetime picker controls.
 	ctrl.dwSize = sizeof(ctrl);
-	ctrl.dwICC = ICC_DATE_CLASSES;
+	ctrl.dwICC = ICC_DATE_CLASSES|ICC_BAR_CLASSES;
 	InitCommonControlsEx(&ctrl);
 
+    g_strCmdLine = convertToStringA(lpCmdLine);
+
 	return _AtlModule.WinMain(nShowCmd);
 }
 
 extern "C" HWND getMainWnd() {
-	return _AtlModule.GetManWindow();
+	return _AtlModule.GetMainWindow();
+}
+
+CMainWindow& getAppWindow() 
+{
+	return _AtlModule.GetAppWindow();
 }
 
 extern "C" HWND getWebViewWnd() {
 	return _AtlModule.GetWebViewWindow();
 }
 
+CMainWindow* Rhodes_getMainWindow() {
+	return _AtlModule.GetMainWindowObject();
+}
+
 
 extern "C" const char* rho_native_rhopath() 
 {
@@ -512,39 +477,13 @@ extern "C" void rho_conf_show_log()
     ::PostMessage(getMainWnd(),WM_COMMAND,IDM_LOG,0);
 }
 
-extern "C" const char* rho_sys_get_start_params() {
-    return "";
-}
-
-
 //Hook for ruby call to refresh web view
 
 extern "C" void rho_net_impl_network_indicator(int active)
 {
     //TODO: rho_net_impl_network_indicator
 }
-
-extern "C" void create_nativebar(int bar_type, rho_param *p) {
-	//TODO: Implement me!
-}
-
-extern "C" void remove_nativebar() {
-	//TODO: Implement me!
-}
-
-extern "C" void nativebar_set_tab_badge(int index,char* val)
-{
-}
-
-extern "C" void nativebar_switch_tab(int index) {
-	//TODO: Implement me!
-}
-
-extern "C" VALUE nativebar_started() {
-    // TODO:
-    return rho_ruby_create_boolean(0);
-}
-
+/*
 extern "C" void mapview_create(rho_param *p) {
     //TODO: mapview_create
 }
@@ -567,7 +506,7 @@ extern "C" double mapview_state_center_lon() {
     //TODO:
     return 0;
 }
-
+*/
 extern "C" void rho_map_location(char* query)
 {
 }
@@ -588,10 +527,6 @@ extern "C" void Init_fcntl(void)
 {
 }
 
-extern "C" void Init_NavBar(void)
-{
-}
-
 //extern "C" void Init_RhoEvent()
 //{
 //}
@@ -687,3 +622,60 @@ char* wce_wctomb(const wchar_t* w)
 }
 
 #endif
+
+
+#if !defined(_WIN32_WCE)
+#include <gdiplus.h>
+#include <Gdiplusinit.h>
+using namespace Gdiplus;
+
+#define   SelectBitmap(hdc, hbm)  ((HBITMAP)SelectObject((hdc), (HGDIOBJ)(HBITMAP)(hbm)))
+HBITMAP SHLoadImageFile(  LPCTSTR pszFileName )
+{
+    if ( !pszFileName || !*pszFileName )
+        return 0;
+
+    String strFileName = convertToStringA(pszFileName);
+    if ( String_endsWith(strFileName, ".bmp") )
+    {
+        return (HBITMAP)::LoadImage(NULL, pszFileName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
+    }
+
+    if ( !String_endsWith(strFileName, ".png") )
+        return 0;
+
+    static bool s_GDIInit = false;
+    if ( !s_GDIInit)
+    {
+        Gdiplus::GdiplusStartupInput gdiplusStartupInput;
+        ULONG_PTR gdiplusToken;
+        Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+        s_GDIInit = true;
+    }
+
+    Gdiplus::Image* image = new Gdiplus::Image(convertToStringW(strFileName).c_str());
+    SizeF sizePng;
+    Status res = image->GetPhysicalDimension(&sizePng);
+
+    HDC hDC = GetDC(getMainWnd());
+
+    HDC hdcMem = CreateCompatibleDC(hDC);
+    HBITMAP hBitmap  = ::CreateCompatibleBitmap(hDC, (int)sizePng.Width, (int)sizePng.Height);
+    HBITMAP hbmOld = SelectBitmap(hdcMem, hBitmap);
+
+    CRect rc(0,0,(int)sizePng.Width, (int)sizePng.Height);
+	COLORREF clrOld = ::SetBkColor(hdcMem, RGB(255,255,255));
+	::ExtTextOut(hdcMem, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL);
+	::SetBkColor(hdcMem, clrOld);
+
+    Gdiplus::Graphics grpx(hdcMem);
+    res = grpx.DrawImage(image, 0, 0, (int)sizePng.Width, (int)sizePng.Height);
+
+    SelectBitmap(hdcMem, hbmOld);
+    DeleteDC(hdcMem);
+    DeleteDC(hDC);
+
+    return hBitmap;
+}
+
+#endif

data/platform/wm/rhodes/Rhodes.rc

@@ -114,6 +114,16 @@ BEGIN
     END
 END
 
+IDR_MENU_PC MENU 
+BEGIN
+    MENUITEM "Close",                       IDOK
+END
+
+IDR_MAPVIEW MENU 
+BEGIN
+    MENUITEM "Close",                       IDOK
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -223,6 +233,15 @@ BEGIN
     CTEXT           "Static",IDC_SYNCSTATUS,7,7,143,24
 END
 
+IDD_MAPVIEW DIALOG  0, 0, 172, 186
+STYLE DS_SETFONT | WS_POPUP | WS_SYSMENU
+FONT 8, "Microsoft Sans Serif"
+BEGIN
+    CONTROL         "",IDC_SLIDER_ZOOM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,7,18,17,61
+    PUSHBUTTON      "+",IDC_BUTTON_ZOOM_IN,7,3,15,14
+    PUSHBUTTON      "-",IDC_BUTTON_ZOOM_OUT,7,81,15,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -307,6 +326,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 37
     END
+
+    IDD_MAPVIEW, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 164
+        TOPMARGIN, 3
+        BOTTOMMARGIN, 179
+    END
 END
 #endif    // APSTUDIO_INVOKED
 

data/platform/wm/rhodes/SyncStatusDlg.cpp

@@ -7,6 +7,7 @@ LRESULT CSyncStatusDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 {
     SetDlgItemText(IDC_SYNCSTATUS, m_strStatus );
 
+    SendMessage(WM_SETTEXT, 0, (LPARAM)(LPCTSTR)m_strTitle );
 	bHandled = TRUE;
 	return 1;  // Let the system set the focus
 }

data/platform/wm/rhodes/SyncStatusDlg.h

@@ -5,7 +5,7 @@
 class CSyncStatusDlg : 
 	public CDialogImpl<CSyncStatusDlg>
 {
-    CStringW m_strStatus;
+    CStringW m_strStatus, m_strTitle;
 public:
     CSyncStatusDlg(){}
 	~CSyncStatusDlg(){}
@@ -24,6 +24,7 @@ END_MSG_MAP()
 	LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
     void setStatusText(LPCWSTR szStatus);
+    void setTitle(LPCWSTR szTitle){ m_strTitle = szTitle; }
 };
 
 

data/platform/wm/rhodes/bluetooth/Bluetooth.cpp

@@ -135,7 +135,7 @@ DWORD WINAPI RhoBluetoothManager::runThreadDiscovered(LPVOID data) {
 		return WSAGetLastError ();
 	}
 	int iSize=0, cbBytesRecd=0 ;
-	WCHAR szMessage[MAX_MESSAGE_SIZE];
+	//WCHAR szMessage[MAX_MESSAGE_SIZE];
 	char pbuf[MAX_MESSAGE_SIZE];
 	iSize = sizeof(mManager->m_saClient);
 	BTH_REMOTE_NAME remotename;
@@ -393,10 +393,10 @@ void RhoBluetoothManager::fireRhodeCallback(const char* callback_url, const char
 
 void RhoBluetoothManager::init() {
 	LOG(INFO)  + "RhoBluetoothManager::init()";
-	WORD wVersionRequested;
+/*	WORD wVersionRequested;
 	WSADATA wsaData;
 	wVersionRequested = MAKEWORD( 2, 2 );
-	WSAStartup( wVersionRequested, &wsaData );
+	WSAStartup( wVersionRequested, &wsaData );*/
 
 	m_pDeviceList			= NULL;
 	m_pStart				= NULL;
@@ -407,6 +407,9 @@ void RhoBluetoothManager::init() {
 	m_hReadThread			= NULL;
 	m_socketServer			= INVALID_SOCKET;
 	m_socketClient			= INVALID_SOCKET;
+	mFirstDataBlock = NULL;
+	mLastDataBlock = NULL;
+
 	BthGetMode(&m_dwBluetoothMode);
 	if(m_dwBluetoothMode==BTH_POWER_OFF)
 	{
@@ -486,7 +489,7 @@ void RhoBluetoothManager::freeAll() {
 		mReadedString = NULL;
 	}
 
-	WSACleanup();
+//	WSACleanup();
 
 	freeAllBlocks();
 }

data/platform/wm/rhodes/camera/Camera.cpp

@@ -22,7 +22,7 @@ extern "C" char *strdup(const char * str);
 extern "C" wchar_t* wce_mbtowc(const char* a);
 #endif
 
-#if defined(_WIN32_WCE)
+//#if defined(_WIN32_WCE)
 
 static bool copy_file(LPTSTR from, LPTSTR to);
 static LPTSTR get_file_name(LPTSTR from, LPTSTR to);
@@ -35,8 +35,10 @@ Camera::Camera(void) {
 Camera::~Camera(void) {
 }
 
-HRESULT Camera::takePicture(HWND hwndOwner,LPTSTR pszFilename) {
-    HRESULT         hResult;
+HRESULT Camera::takePicture(HWND hwndOwner,LPTSTR pszFilename) 
+{
+    HRESULT         hResult = S_OK;
+#if defined(_WIN32_WCE)
     SHCAMERACAPTURE shcc;
 
     wchar_t* root  = wce_mbtowc(rho_rhodesapp_getblobsdirpath());
@@ -76,13 +78,19 @@ HRESULT Camera::takePicture(HWND hwndOwner,LPTSTR pszFilename) {
 			hResult = E_INVALIDARG;
 		}
     }
+#endif //_WIN32_WCE
 
     return hResult;
 }
 
-HRESULT Camera::selectPicture(HWND hwndOwner,LPTSTR pszFilename) {
+HRESULT Camera::selectPicture(HWND hwndOwner,LPTSTR pszFilename) 
+{
 	RHO_ASSERT(pszFilename);
+#ifdef _WIN32_WCE
 	OPENFILENAMEEX ofn = {0};
+#else
+    OPENFILENAME ofn = {0};
+#endif
 
 	ofn.lStructSize     = sizeof(ofn);
 	ofn.lpstrFilter     = NULL;
@@ -90,28 +98,37 @@ HRESULT Camera::selectPicture(HWND hwndOwner,LPTSTR pszFilename) {
 	ofn.nMaxFile        = MAX_PATH;
 	ofn.lpstrInitialDir = NULL;
 	ofn.lpstrTitle      = _T("Select an image");
+#ifdef _WIN32_WCE
 	ofn.ExFlags         = OFN_EXFLAG_THUMBNAILVIEW|OFN_EXFLAG_NOFILECREATE|OFN_EXFLAG_LOCKDIRECTORY;
+    if (GetOpenFileNameEx(&ofn))
+#else
+    if (GetOpenFileName(&ofn))
+#endif
 
-	if (GetOpenFileNameEx(&ofn)) {
+    {
 		HRESULT hResult = S_OK;
 
+        /*
 		TCHAR rhoroot[MAX_PATH];
 		wchar_t* root  = wce_mbtowc(rho_rhodesapp_getblobsdirpath());
 		wsprintf(rhoroot,L"%s",root);
 		free(root);
 
-		create_folder(rhoroot);
+		create_folder(rhoroot);*/
+
+        StringW strBlobRoot = convertToStringW( RHODESAPP().getBlobsDirPath() );
 
         LPCTSTR szExt = wcsrchr(pszFilename, '.');
 		TCHAR filename[256];
 		generate_filename(filename, szExt);
 		
-		int len = wcslen(rhoroot) + wcslen(L"\\") + wcslen(filename);
+		int len = strBlobRoot.length() + wcslen(L"\\") + wcslen(filename);
 		wchar_t* full_name = (wchar_t*) malloc((len+2)*sizeof(wchar_t));
-		wsprintf(full_name,L"%s\\%s",rhoroot,filename);
+		wsprintf(full_name,L"%s\\%s",strBlobRoot.c_str(),filename);
 
-		if (copy_file(pszFilename,full_name)) {
-			StringCchCopy(pszFilename, MAX_PATH, filename);	
+		if (copy_file(pszFilename,full_name)) 
+        {
+			wcscpy( pszFilename, filename );
 		} else {
 			hResult = E_INVALIDARG;
 		}
@@ -125,10 +142,11 @@ HRESULT Camera::selectPicture(HWND hwndOwner,LPTSTR pszFilename) {
 	return E_INVALIDARG;
 }
 
-bool copy_file(LPTSTR from, LPTSTR to) {
+bool copy_file(LPTSTR from, LPTSTR to) 
+{
 	RHO_ASSERT(from);
 	RHO_ASSERT(to);
-
+/*
 	SHFILEOPSTRUCT SHFileOp;
 	ATL::CString source(from);
 	ATL::CString destination(to);
@@ -144,8 +162,11 @@ bool copy_file(LPTSTR from, LPTSTR to) {
 	SHFileOp.pFrom = source;
 	SHFileOp.pTo = destination;
 	SHFileOp.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOCONFIRMMKDIR;
-
-	if(SHFileOperation(&SHFileOp) != 0) {
+*/
+	//if(SHFileOperation(&SHFileOp) != 0) {
+    if ( !CopyFile(from, to, TRUE) )
+    {
+        DWORD dwErr = GetLastError();
 		return false;
 	}
 	return true;
@@ -204,7 +225,7 @@ void create_folder(LPTSTR Path)
 	CreateDirectory(DirName, NULL);
 }
 
-#endif //_WIN32_WCE
+//#endif //_WIN32_WCE
 
 void take_picture(char* callback_url) {
 //#if defined(_WIN32_WCE)

data/platform/wm/rhodes/camera/Camera.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#if defined(_WIN32_WCE)
-
 class Camera
 {
 public:
@@ -13,7 +11,5 @@ public:
 	HRESULT selectPicture(HWND hwndOwner,LPTSTR pszFilename);
 };
 
-#endif //_WIN32_WCE
-
 extern "C" void take_picture(char* callback_url);
 extern "C" void choose_picture(char* callback_url);

data/platform/wm/rhodes/resource.h

@@ -15,6 +15,7 @@
 #define IDR_LOGOPTIONSMENUBAR           114
 #define IDR_LOGVIEW_MENU                115
 #define IDD_SIMULATOR_LOGOPTIONS        116
+#define IDR_MAPVIEW                     116
 #define IDI_ICON                        117
 #define IDD_DATETIME_PICKER             118
 #define IDD_TIME_PICKER                 119
@@ -23,6 +24,7 @@
 #define IDD_BLUETOOTH_DISCOVERED        121
 #define IDD_DIALOG1                     122
 #define IDD_SYNCSTATUS                  122
+#define IDD_MAPVIEW                     123
 #define IDC_STATIC_PROMPT               1001
 #define IDC_EDIT_URL                    1002
 #define IDC_LOGEDIT                     1003
@@ -34,14 +36,18 @@
 #define IDC_MSGEXCLUDE                  1008
 #define IDC_SYNCSTATUS                  1009
 #define IDC_BUTTON2                     1010
+#define IDC_BUTTON_ZOOM_IN              1010
 #define IDC_DATE_CTRL                   1012
 #define IDC_TIME_CTRL                   1013
 #define IDC_DATE_STATIC                 1017
 #define IDC_TIME_STATIC                 1019
 #define IDC_BT_LIST                     1020
+#define IDC_SLIDER1                     1020
+#define IDC_SLIDER_ZOOM                 1020
 #define IDC_BUTTON1                     1022
 #define IDC_BT_CANCEL                   1022
 #define IDC_BT_STATIC                   1023
+#define IDC_BUTTON_ZOOM_OUT             1023
 #define IDS_EXIT                        10001
 #define IDS_MENU                        10002
 #define IDS_OK                          10003
@@ -52,6 +58,7 @@
 #define IDM_SK2_MENU                    40002
 #define IDM_BACK                        40003
 #define IDM_NAVIGATE_BACK               40005
+#define IDM_NAVIGATE_FORWARD            40006
 #define IDM_REFRESH                     40007
 #define IDM_POPUP_MENU                  40009
 #define ID_SYNC                         40010
@@ -70,14 +77,15 @@
 #define IDM_SENDLOG                     40027
 #define ID_Menu                         40028
 #define ID_FULLSCREEN                   40029
+#define ID_CANCEL                       40030
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        123
-#define _APS_NEXT_COMMAND_VALUE         40030
-#define _APS_NEXT_CONTROL_VALUE         1020
+#define _APS_NEXT_COMMAND_VALUE         40031
+#define _APS_NEXT_CONTROL_VALUE         1021
 #define _APS_NEXT_SYMED_VALUE           111
 #endif
 #endif

data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp

@@ -3,6 +3,7 @@
 #include "RhoClassfactory.h"
 #include "sync/SyncThread.h"
 #include "sync/ClientRegister.h"
+#include "RhoCryptImpl.h"
 
 namespace rho{
 namespace common{
@@ -10,6 +11,12 @@ IRhoClassFactory* rho_impl_createClassFactory()
 {
     return new rho::common::CRhoClassFactory;
 }
+
+IRhoCrypt* CRhoClassFactory::createRhoCrypt()
+{
+    return new CRhoCryptImpl();
+}
+
 }
 }
 

data/platform/wm/rhodes/rho/common/RhoClassFactory.h

@@ -26,6 +26,7 @@ public:
         return null;
     }
 
+    virtual IRhoCrypt* createRhoCrypt();
 };
 
 }

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

@@ -269,7 +269,15 @@ boolean CNetRequestImpl::readHeaders(Hashtable<String,String>& oHeaders)
         CAtlStringW strValue = strHeader.Mid(nSep+1);
         strValue.Trim();
 
-        oHeaders.put(common::convertToStringA(strName.GetString()),common::convertToStringA(strValue.GetString()));
+        String strFieldName = common::convertToStringA(strName.GetString());
+        String strFieldValue = common::convertToStringA(strValue.GetString());
+        if ( oHeaders.containsKey(strFieldName) )
+        {
+            strFieldValue += ";" + oHeaders.get( strFieldName );
+            oHeaders.put( strFieldName, strFieldValue );
+        }
+        else
+            oHeaders.put( strFieldName, strFieldValue );
     }
 
     return true;
@@ -350,7 +358,7 @@ void CNetRequestImpl::readResponse(CNetResponseImpl* pNetResp)
         }
 	}
 
-    if (pNetResp->isOK())
+    if (pNetResp->isSuccess())
         pNetResp->setCookies(makeClientCookie());
 }