rhodes 2.3.2 → 2.4.0.beta.1

data/platform/wm/rhodes/DateTimePicker.cpp

@@ -220,3 +220,6 @@ void  choose_datetime(char* callback, char* title,
 {
 	choose_datetime_with_range( callback, title, initial_time, format, data, 0, 0);
 }
+
+void set_change_value_callback_datetime(char* callback) {
+}

data/platform/wm/rhodes/DateTimePicker.h

@@ -116,4 +116,6 @@ extern "C" void  choose_datetime(char* callback, char* title,
 extern "C" void  choose_datetime_with_range(char* callback, char* title, 
 								 long initial_time, int format, char* data, long min_time, long max_time);
 
+extern "C" void set_change_value_callback_datetime(char* callback);
+
 #endif //__DATETIMEPICKER_H__

data/platform/wm/rhodes/MainWindow.cpp

@@ -19,6 +19,7 @@
 #include "ext/rho/rhoruby.h"
 #include "rubyext/WebView.h"
 #include "camera/Camera.h"
+#include "signature/Signature.h"
 #include "sync/SyncThread.h"
 #include "common/RhoFilePath.h"
 #include "common/RhoFile.h"
@@ -178,7 +179,7 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
         m_spIWebBrowser2->put_StatusBar(VARIANT_FALSE);
 
     //m_spIWebBrowser2->put_Offline(VARIANT_TRUE);
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && !defined( OS_PLATFORM_CE )
     // Create a menubar
     // (mbi was initialized above)
     mbi.hwndParent = m_hWnd;
@@ -220,7 +221,7 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
 
     MoveWindow(&rcMainWindow);
 
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && !defined( OS_PLATFORM_CE )
 	//Set fullscreen after window resizing
 	if ( RHOCONF().getBool("full_screen"))
    	    SetFullScreen(true);
@@ -557,7 +558,7 @@ LRESULT CMainWindow::OnSettingChange(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam
 
 LRESULT CMainWindow::OnExitCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if ( g_hNotify )
 		RegistryCloseNotification(g_hNotify);
 #endif
@@ -612,7 +613,7 @@ LRESULT CMainWindow::OnLogCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWn
 
 LRESULT CMainWindow::OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND hwnd, BOOL& /*bHandled*/)
 {
-#if defined (_WIN32_WCE) 
+#if defined (_WIN32_WCE) && !defined( OS_PLATFORM_CE )
 	SetFullScreen(!m_bFullScreen);
 #endif
 	return 0;
@@ -699,6 +700,22 @@ LRESULT CMainWindow::OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lP
 	return 0;
 }
 
+LRESULT CMainWindow::OnTakeSignature(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) 
+{
+	TCHAR signature_uri[MAX_PATH];
+    HRESULT status = S_OK;
+	Signature::Params* params = (Signature::Params *)lParam;
+	Signature signature;
+	status = signature.takeSignature(this->m_hWnd, signature_uri, convertToStringW(params->m_image_format).c_str());
+
+    RHODESAPP().callSignatureCallback(params->m_callback_url.c_str(), rho::common::convertToStringA(signature_uri),
+        (status!= S_OK && status != S_FALSE ? "Error" : ""), status == S_FALSE);
+    
+    free ((void *)lParam);
+    
+	return 0;
+}
+
 LRESULT CMainWindow::OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
 {
 	//LOG(INFO) + __FUNCTION__;
@@ -759,7 +776,7 @@ LRESULT CMainWindow::OnAlertHidePopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
 }
 
 LRESULT CMainWindow::OnBluetoothDiscover (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
-#ifndef OS_WINDOWS
+#if defined( OS_WINCE) && !defined( OS_PLATFORM_CE )
 	RhoDiscoverDlg* dlg = RhoBluetoothManager::getInstance()->getDiscoverDlg();
 	dlg->openDialog(RhoBluetoothManager::getInstance());
 #endif // OS_WINDOWS
@@ -767,7 +784,7 @@ LRESULT CMainWindow::OnBluetoothDiscover (UINT /*uMsg*/, WPARAM /*wParam*/, LPAR
 }
 
 LRESULT CMainWindow::OnBluetoothDiscovered (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
-#ifndef OS_WINDOWS
+#if defined( OS_WINCE) && !defined( OS_PLATFORM_CE )
 	RhoDiscoveredDlg* dlg = RhoBluetoothManager::getInstance()->getDiscoveredDlg();
 	dlg->openDialog(RhoBluetoothManager::getInstance());
 #endif // OS_WINDOWS
@@ -905,7 +922,7 @@ BSTR loadLoadingHtml()
 }
 
 void writeToTheDoc (
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && !defined( OS_PLATFORM_CE )
 					IPIEHTMLDocument2 *document
 #else
 					IHTMLDocument2 *document
@@ -947,7 +964,7 @@ void CMainWindow::ShowLoadingPage(LPDISPATCH pDisp, VARIANT* URL)
     hr = m_spIWebBrowser2->get_Document( &pHtmlDoc );
     if ( SUCCEEDED(hr) )
     {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 		IPIEHTMLDocument2* pDoc;
 		hr = pHtmlDoc->QueryInterface(__uuidof(IPIEHTMLDocument2),  (void**)&pDoc );
 #else
@@ -1039,7 +1056,7 @@ BOOL CMainWindow::SetToolbarButtonEnabled(UINT uTbbID, BOOL bEnable)
 // **************************************************************************
 BOOL CMainWindow::TranslateAccelerator(MSG* pMsg)
 {
-#ifdef OS_WINCE
+#if defined( OS_WINCE) && !defined( OS_PLATFORM_CE )
 	if (pMsg->message == WM_CONTEXTMENU){
 		/*
 		CMenuHandle menu;
@@ -1139,9 +1156,13 @@ void CMainWindow::createCustomMenu()
         CAppMenuItem& oItem = m_arAppMenuItems.elementAt(i);
         if (oItem.m_eType == CAppMenuItem::emtSeparator) 
 			popup.InsertMenu(0, MF_BYPOSITION | MF_SEPARATOR, (UINT_PTR)0, (LPCTSTR)0);
-		else 
+		else
+        {
+            StringW strLabelW = convertToStringW(oItem.m_strLabel);
+
 			popup.InsertMenu(0, MF_BYPOSITION, ID_CUSTOM_MENU_ITEM_FIRST + i, 
-                oItem.m_eType == CAppMenuItem::emtClose ? _T("Exit") : A2T(oItem.m_strLabel.c_str()) );
+                oItem.m_eType == CAppMenuItem::emtClose ? _T("Exit") : strLabelW.c_str() );
+        }
     }
 
 	RECT  rect; 
@@ -1154,10 +1175,7 @@ void CMainWindow::createCustomMenu()
 						m_hWnd);
 	sub.Detach();
 }
-
-#endif//OS_WINDOWS
-
-#if defined (OS_WINCE)
+#else
 
 void CMainWindow::createCustomMenu()
 {
@@ -1175,10 +1193,12 @@ void CMainWindow::createCustomMenu()
     for ( int i = m_arAppMenuItems.size() - 1; i >= 0; i--)
     {
         CAppMenuItem& oItem = m_arAppMenuItems.elementAt(i);
+        StringW strLabelW = convertToStringW(oItem.m_strLabel);
+
 		if (oItem.m_eType == CAppMenuItem::emtSeparator) 
 			InsertMenu(hMenu, 0, MF_BYPOSITION | MF_SEPARATOR, 0, 0);
 		else if (oItem.m_eType != CAppMenuItem::emtExit && oItem.m_eType != CAppMenuItem::emtClose)
-    		InsertMenu(hMenu, 0, MF_BYPOSITION, ID_CUSTOM_MENU_ITEM_FIRST + i, A2T(oItem.m_strLabel.c_str()));
+    		InsertMenu(hMenu, 0, MF_BYPOSITION, ID_CUSTOM_MENU_ITEM_FIRST + i, strLabelW.c_str() );
 	}
 }
 #endif //OS_WINCE

data/platform/wm/rhodes/MainWindow.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#if !defined(_WIN32_WCE)
+#if !defined(_WIN32_WCE) || defined( OS_PLATFORM_CE )
 #include <exdispid.h>
 #include <exdisp.h>
 #endif
@@ -29,6 +29,7 @@ static const UINT ID_BROWSER = 1;
 
 static UINT WM_TAKEPICTURE             = ::RegisterWindowMessage(L"RHODES_WM_TAKEPICTURE");
 static UINT WM_SELECTPICTURE           = ::RegisterWindowMessage(L"RHODES_WM_SELECTPICTURE");
+static UINT WM_TAKESIGNATURE           = ::RegisterWindowMessage(L"RHODES_WM_TAKESIGNATURE");
 static UINT WM_CONNECTIONSNETWORKCOUNT = ::RegisterWindowMessage(L"RHODES_WM_CONNECTIONSNETWORKCOUNT");
 static UINT WM_ALERT_SHOW_POPUP        = ::RegisterWindowMessage(L"RHODES_WM_ALERT_SHOW_POPUP");
 static UINT WM_ALERT_HIDE_POPUP        = ::RegisterWindowMessage(L"RHODES_WM_ALERT_HIDE_POPUP");
@@ -40,7 +41,7 @@ static UINT WM_EXECUTE_COMMAND		   = ::RegisterWindowMessage(L"RHODES_WM_EXECUTE
 static UINT WM_EXECUTE_RUNNABLE		   = ::RegisterWindowMessage(L"RHODES_WM_EXECUTE_RUNNABLE");
 
 class CMainWindow :
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	public CFrameWindowImpl<CMainWindow>, 
 	public CFullScreenFrame<CMainWindow>,
 #else
@@ -111,6 +112,7 @@ public:
 #endif
 		MESSAGE_HANDLER(WM_TAKEPICTURE, OnTakePicture)
 		MESSAGE_HANDLER(WM_SELECTPICTURE, OnSelectPicture)
+		MESSAGE_HANDLER(WM_TAKESIGNATURE, OnTakeSignature)
 		MESSAGE_HANDLER(WM_CONNECTIONSNETWORKCOUNT, OnConnectionsNetworkCount)
         MESSAGE_HANDLER(WM_ALERT_SHOW_POPUP, OnAlertShowPopup)
 		MESSAGE_HANDLER(WM_ALERT_HIDE_POPUP, OnAlertHidePopup);
@@ -152,6 +154,7 @@ private:
 
 	LRESULT OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+	LRESULT OnTakeSignature(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnConnectionsNetworkCount(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
     LRESULT OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnAlertHidePopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
@@ -251,6 +254,6 @@ private:
     CSyncStatusDlg m_SyncStatusDlg;
 };
 
-#if !defined(_WIN32_WCE)
+#if !defined(_WIN32_WCE) || defined( OS_PLATFORM_CE ) 
 HBITMAP SHLoadImageFile (  LPCTSTR pszFileName );
 #endif

data/platform/wm/rhodes/OutlookApp.cpp

@@ -1,7 +1,7 @@
 #include "StdAfx.h"
 #include "OutlookApp.h"
 
-#ifdef _WIN32_WCE
+#if defined( _WIN32_WCE ) && !defined( OS_PLATFORM_CE )
 #define INITGUID
 #include <pimstore.h>
 #endif //_WIN32_WCE
@@ -30,7 +30,7 @@ COutlookApp::COutlookApp(void)
 {
     HRESULT hr = CoInitializeEx( NULL, 0);
 
-#ifdef _WIN32_WCE
+#if defined( _WIN32_WCE ) && !defined( OS_PLATFORM_CE )
     IUnknown* pUnknown = NULL;
     hr = CoCreateInstance(__uuidof(Application),//CLSID_Application, 
         NULL, CLSCTX_INPROC_SERVER, 
@@ -62,7 +62,7 @@ COutlookApp::COutlookApp(void)
 
 COutlookApp::~COutlookApp(void)
 {
-#ifdef _WIN32_WCE
+#if defined( _WIN32_WCE ) && !defined( OS_PLATFORM_CE )
 	if(m_outlookApp) 
 		m_outlookApp->Release();
 #endif //_WIN32_WCE

data/platform/wm/rhodes/Rhodes.cpp

@@ -23,8 +23,6 @@ typedef unsigned long VALUE;
 char* parseToken( const char* start, int len );
 #endif
 
-extern "C" char* wce_wctomb(const wchar_t* w);
-extern "C" wchar_t* wce_mbtowc(const char* a);
 extern "C" void rho_ringtone_manager_stop();
 
 #if defined(_WIN32_WCE)
@@ -41,10 +39,6 @@ HREGNOTIFY g_hNotify = NULL;
 
 #endif
 
-#ifdef OS_WINDOWS
-String httpProxy;
-#endif
-
 static String g_strCmdLine;
 
 class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
@@ -66,22 +60,24 @@ public :
 			}
 
 #if defined(OS_WINDOWS)
-			if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) {
-				char *token = wce_wctomb(lpszToken);
-				char *proxy =parseToken(token,strlen(token));
+			if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) 
+            {
+				String token = convertToStringA(lpszToken);
+                char *proxy = parseToken( token.c_str(), token.length() );
 				
 				if (proxy)
-					httpProxy = proxy;
+                {
+					m_strHttpProxy = proxy;
+                    free(proxy);
+                }
 				else 
 					LOG(WARNING) + "invalid value for \"http_proxy_url\" cmd parameter";
 
-				if (proxy) free(proxy);
-				if (token) free(token);
-
-			} else if (wcsncmp(lpszToken, _T("approot"),7)==0) {
-				char* token = wce_wctomb(lpszToken);
+			} 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, strlen(token) );
+                char* path = parseToken( token.c_str(), token.length() );
 				if (path) {
 					int len = strlen(path);
 					if (!(path[len]=='\\' || path[len]=='/')) {
@@ -91,7 +87,6 @@ public :
 					m_strRootPath = path;
 					free(path);
 				}
-				free(token);
 			}
 #endif
 			lpszToken = FindOneOf(lpszToken, szTokens);
@@ -144,8 +139,8 @@ public :
 
 		LOG(INFO) + "Rhodes started";
 #ifdef OS_WINDOWS
-		if (httpProxy.length() > 0) {
-			parseHttpProxyURI(httpProxy);
+		if (m_strHttpProxy.length() > 0) {
+			parseHttpProxyURI(m_strHttpProxy);
 		} else {
 			if (RHOCONF().isExist("http_proxy_url")) {
 				parseHttpProxyURI(RHOCONF().getString("http_proxy_url"));
@@ -213,7 +208,7 @@ public :
         // Show the main application window
         m_appWindow.ShowWindow(nShowCmd);
 
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 		// Register for changes in the number of network connections
 		hr = RegistryNotifyWindow(SN_CONNECTIONSNETWORKCOUNT_ROOT,
 			SN_CONNECTIONSNETWORKCOUNT_PATH, 
@@ -258,7 +253,7 @@ public :
             }
         }
 
-#if defined(OS_WINCE)
+#if defined(OS_WINCE)&& !defined( OS_PLATFORM_CE )
         CGPSController* pGPS = CGPSController::Instance();
         pGPS->DeleteInstance();
 #endif
@@ -425,6 +420,10 @@ private:
     CMainWindow m_appWindow;
     rho::String m_strRootPath;
 	int m_nRestarting;
+
+#ifdef OS_WINDOWS
+    String m_strHttpProxy;
+#endif
 };
 
 CRhodesModule _AtlModule;
@@ -590,17 +589,17 @@ char* parseToken( const char* start, int len ) {
 
 	return value;
 }
-
+/*
 // char -> wchar_t 
 wchar_t* wce_mbtowc(const char* a)
 {
 	int length;
 	wchar_t *wbuf;
 
-	length = MultiByteToWideChar(CP_ACP, 0, 
+	length = MultiByteToWideChar(CP_UTF8, 0, 
 		a, -1, NULL, 0);
 	wbuf = (wchar_t*)malloc( (length+1)*sizeof(wchar_t) );
-	MultiByteToWideChar(CP_ACP, 0,
+	MultiByteToWideChar(CP_UTF8, 0,
 		a, -1, wbuf, length);
 
 	return wbuf;
@@ -612,17 +611,37 @@ char* wce_wctomb(const wchar_t* w)
 	DWORD charlength;
 	char* pChar;
 
-	charlength = WideCharToMultiByte(CP_ACP, 0, w,
+	charlength = WideCharToMultiByte(CP_UTF8, 0, w,
 					-1, NULL, 0, NULL, NULL);
 	pChar = (char*)malloc(charlength+1);
-	WideCharToMultiByte(CP_ACP, 0, w,
+	WideCharToMultiByte(CP_UTF8, 0, w,
 		-1, pChar, charlength, NULL, NULL);
 
 	return pChar;
-}
+}*/
 
 #endif
 
+#if defined( OS_PLATFORM_CE )
+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;
+    //TODO: show png file
+
+    return 0;
+}
+
+#endif
 
 #if !defined(_WIN32_WCE)
 #include <gdiplus.h>

data/platform/wm/rhodes/Rhodes.rc

@@ -155,7 +155,7 @@ CAPTION "Log"
 MENU IDR_LOGVIEW_MENU
 FONT 10, "Courier"
 BEGIN
-    CONTROL         "",IDC_LOGEDIT,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,3,4,137,110
+    CONTROL         "",IDC_LOGEDIT,"RichEdit20W",WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x9c4,3,4,137,110
 END
 
 IDD_LOGVIEW_WIDE DIALOG  0, 0, 210, 129
@@ -226,7 +226,7 @@ BEGIN
     CTEXT           "Wait for connection ...",IDC_STATIC,10,49,130,16
 END
 
-IDD_SYNCSTATUS DIALOG 2, 50, 157, 44
+IDD_SYNCSTATUS DIALOG  2, 50, 157, 44
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -242,6 +242,12 @@ BEGIN
     PUSHBUTTON      "-",IDC_BUTTON_ZOOM_OUT,7,81,15,14
 END
 
+IDD_TAKE_SIGNATURE DIALOG  0, 0, 135, 105
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -322,7 +328,6 @@ BEGIN
     IDD_SYNCSTATUS, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 180
         TOPMARGIN, 7
         BOTTOMMARGIN, 37
     END
@@ -334,6 +339,14 @@ BEGIN
         TOPMARGIN, 3
         BOTTOMMARGIN, 179
     END
+
+    IDD_TAKE_SIGNATURE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 128
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 98
+    END
 END
 #endif    // APSTUDIO_INVOKED