rhodes 2.3.2 → 2.4.0.beta.1

data/platform/wm/rhodes/RingtoneManager.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "RingtoneManager.h"
 
-#if _WIN32_WCE > 0x501
+#if _WIN32_WCE > 0x501 && !defined( OS_PLATFORM_CE )
 
 IMPLEMENT_LOGCLASS(CRingtoneManager, "RingtoneManager");
 CRingtoneManager *CRingtoneManager::m_pInstance = NULL;
@@ -53,9 +53,9 @@ void CRingtoneManager::play (String ringtone_name)
     
     stop();
     
-    USES_CONVERSION;
-    
-    hr = SndOpen(A2T(ringtone_name.c_str()), &m_hSound);
+    StringW ringtone_nameW = convertToStringW(ringtone_name);
+
+    hr = SndOpen( ringtone_nameW.c_str(), &m_hSound);
     if (hr != S_OK || !m_hSound) {
         //TODO: log extended error
         LOG(ERROR) + "RingtoneManager: failed to open file";
@@ -102,7 +102,7 @@ VALUE rho_ringtone_manager_get_all()
     
     CHoldRubyValue retval(rho_ruby_createHash());
 
-#if _WIN32_WCE > 0x501
+#if _WIN32_WCE > 0x501 && !defined( OS_PLATFORM_CE )
 
     Hashtable<String, String> ringtones;
     CRingtoneManager::getCRingtoneManager().getAllRingtones(ringtones);
@@ -118,7 +118,7 @@ VALUE rho_ringtone_manager_get_all()
 
 void rho_ringtone_manager_stop()
 {
-#if _WIN32_WCE > 0x501
+#if _WIN32_WCE > 0x501 && !defined( OS_PLATFORM_CE )
     LOG(INFO) + __FUNCTION__;
     CRingtoneManager::getCRingtoneManager().stop();
 #endif
@@ -126,7 +126,7 @@ void rho_ringtone_manager_stop()
 
 void rho_ringtone_manager_play(char* file_name)
 {
-#if _WIN32_WCE > 0x501
+#if _WIN32_WCE > 0x501 && !defined( OS_PLATFORM_CE )
     LOG(INFO) + __FUNCTION__;
     CRingtoneManager::getCRingtoneManager().play(String(file_name));
 #endif

data/platform/wm/rhodes/RingtoneManager.h

@@ -3,7 +3,7 @@
 
 #include "ext/rho/rhoruby.h"
 
-#if _WIN32_WCE > 0x501
+#if _WIN32_WCE > 0x501 && !defined( OS_PLATFORM_CE )
 
 #include "logging/RhoLog.h"
 #include "common/RhoMutexLock.h"

data/platform/wm/rhodes/Utils.cpp

@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "common/RhoPort.h"
 
 void UnixTimeToFileTime (const time_t unixTime, LPFILETIME pFileTime)
 {
@@ -40,7 +41,7 @@ time_t SystemTimeToUnixTime (const LPSYSTEMTIME sysTime)
 	atm.tm_isdst = -1; 
 	
 	time_t retVal = -1 ;
-	retVal = ::mktime (&atm);
+	retVal = mktime(&atm);
 
 	return retVal;
 }

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

@@ -1,8 +1,5 @@
 #include "stdafx.h"
 
-
-
-
 #if defined(_WIN32_WCE)
 #include <aygshell.h>
 #endif
@@ -16,7 +13,7 @@
 
 #include "../Utils.h"
 
-#ifndef OS_WINDOWS
+#if defined( OS_WINCE ) && !defined( OS_PLATFORM_CE )
 
 #ifdef _MSC_VER
 // warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)
@@ -25,15 +22,6 @@
 
 extern "C" HWND getMainWnd();
 
-#if defined(_WIN32_WCE)
-// strdup is implemented as part of ruby CE port
-extern "C" char *strdup(const char * str);
-extern "C" wchar_t* wce_mbtowc(const char* a);
-extern "C" char* wce_wctomb(const wchar_t*);
-
-#endif
-
-
 extern "C" int rho_sys_get_screen_height();
 extern "C" int rho_sys_get_screen_width();
 

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

@@ -3,8 +3,7 @@
 
 #include <windows.h>
 
-#ifndef OS_WINDOWS
-
+#if defined( OS_WINCE) && !defined( OS_PLATFORM_CE )
 
 #include <winsock2.h>
 #include <ws2bth.h>

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

@@ -16,12 +16,6 @@
 
 extern "C" HWND getMainWnd();
 
-#if defined(_WIN32_WCE)
-// strdup is implemented as part of ruby CE port
-extern "C" char *strdup(const char * str);
-extern "C" wchar_t* wce_mbtowc(const char* a);
-#endif
-
 //#if defined(_WIN32_WCE)
 
 static bool copy_file(LPTSTR from, LPTSTR to);
@@ -38,12 +32,12 @@ Camera::~Camera(void) {
 HRESULT Camera::takePicture(HWND hwndOwner,LPTSTR pszFilename) 
 {
     HRESULT         hResult = S_OK;
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && !defined( OS_PLATFORM_CE )
     SHCAMERACAPTURE shcc;
 
-    wchar_t* root  = wce_mbtowc(rho_rhodesapp_getblobsdirpath());
-    wsprintf(pszFilename,L"%s",root );
-    free(root);
+    StringW root;
+    convertToStringW(rho_rhodesapp_getblobsdirpath(), root);
+    wsprintf( pszFilename, L"%s", root.c_str() );
 
 	create_folder(pszFilename);
 
@@ -86,7 +80,7 @@ HRESULT Camera::takePicture(HWND hwndOwner,LPTSTR pszFilename)
 HRESULT Camera::selectPicture(HWND hwndOwner,LPTSTR pszFilename) 
 {
 	RHO_ASSERT(pszFilename);
-#ifdef _WIN32_WCE
+#if defined( _WIN32_WCE ) && !defined( OS_PLATFORM_CE )
 	OPENFILENAMEEX ofn = {0};
 #else
     OPENFILENAME ofn = {0};
@@ -98,7 +92,7 @@ HRESULT Camera::selectPicture(HWND hwndOwner,LPTSTR pszFilename)
 	ofn.nMaxFile        = MAX_PATH;
 	ofn.lpstrInitialDir = NULL;
 	ofn.lpstrTitle      = _T("Select an image");
-#ifdef _WIN32_WCE
+#if defined( _WIN32_WCE ) && !defined( OS_PLATFORM_CE )
 	ofn.ExFlags         = OFN_EXFLAG_THUMBNAILVIEW|OFN_EXFLAG_NOFILECREATE|OFN_EXFLAG_LOCKDIRECTORY;
     if (GetOpenFileNameEx(&ofn))
 #else

data/platform/wm/rhodes/phonebook/phonebook.cpp

@@ -12,7 +12,7 @@
 #include "phonebook.h"
 
 void* openPhonebook() {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE) && !defined( OS_PLATFORM_CE )
 	CNativeAddressBook* phonebook = new CNativeAddressBook();
 
 	if (!phonebook->openAB()) {
@@ -27,7 +27,7 @@ void* openPhonebook() {
 }
 
 void  closePhonebook(void* pb) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (pb) {
 		CNativeAddressBook* phonebook = (CNativeAddressBook*)pb;
 		delete phonebook;
@@ -39,7 +39,7 @@ void _addRecordValue(const char* key, const char* value, void* hash) {
 	addStrToHash(*((unsigned long*)hash), key, value);
 }
 
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 static VALUE _getRecord(CABRecord* record) {
 	if (record) {
         CHoldRubyValue hash(rho_ruby_createHash());
@@ -51,7 +51,7 @@ static VALUE _getRecord(CABRecord* record) {
 #endif
 
 VALUE getallPhonebookRecords(void* pb) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (pb) {
 		CNativeAddressBook* phonebook = (CNativeAddressBook*)pb;
         VALUE valGc = rho_ruby_disable_gc();
@@ -78,7 +78,7 @@ VALUE getallPhonebookRecords(void* pb) {
 }
 
 VALUE getPhonebookRecord(void* pb, char* id) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (pb && id) {
 		CNativeAddressBook* phonebook = (CNativeAddressBook*)pb;
 		CABRecord* record = phonebook->getRecord(id);
@@ -104,7 +104,7 @@ VALUE getnextPhonebookRecord(void* pb) {
 //==================================================================================
 
 void* createRecord(void* pb) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	return new CABOutlookRecord(NULL);
 #else
 	return NULL;
@@ -112,7 +112,7 @@ void* createRecord(void* pb) {
 }
 
 void* openPhonebookRecord(void* pb, char* id) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (pb && id) {
 		CNativeAddressBook* phonebook = (CNativeAddressBook*)pb;
 		return phonebook->getRecord(id);
@@ -122,7 +122,7 @@ void* openPhonebookRecord(void* pb, char* id) {
 }
 
 int setRecordValue(void* record, char* prop, char* value) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (record) {
 		CABRecord* r = (CABRecord*)record;
 		r->setValue(prop,value);
@@ -132,7 +132,7 @@ int setRecordValue(void* record, char* prop, char* value) {
 }
 
 int addRecord(void* pb, void* record) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (pb && record) {
 		CNativeAddressBook* phonebook = (CNativeAddressBook*)pb;
 		phonebook->addRecord((CABRecord*)record);
@@ -143,7 +143,7 @@ int addRecord(void* pb, void* record) {
 }
 
 int saveRecord(void* pb, void* record) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (record) {
 		CABRecord* r = (CABRecord*)record;
 		LOGC(INFO,"Phonebook") + "About to save:";
@@ -156,7 +156,7 @@ int saveRecord(void* pb, void* record) {
 }
 
 int deleteRecord(void* pb, void* record) {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	if (record) {
 		CABRecord* r = (CABRecord*)record;
 		r->remove();

data/platform/wm/rhodes/phonebook/phonebook.h

@@ -9,7 +9,7 @@
 #ifndef __LOCAL_PHONEBOOK_H__
 #define __LOCAL_PHONEBOOK_H__
 
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE) && !defined( OS_PLATFORM_CE )
 #include "NativeAddressBook.h"
 #endif
 

data/platform/wm/rhodes/resource.h

@@ -25,6 +25,8 @@
 #define IDD_DIALOG1                     122
 #define IDD_SYNCSTATUS                  122
 #define IDD_MAPVIEW                     123
+#define IDD_DIALOG2                     124
+#define IDD_TAKE_SIGNATURE              124
 #define IDC_STATIC_PROMPT               1001
 #define IDC_EDIT_URL                    1002
 #define IDC_LOGEDIT                     1003
@@ -83,7 +85,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        123
+#define _APS_NEXT_RESOURCE_VALUE        125
 #define _APS_NEXT_COMMAND_VALUE         40031
 #define _APS_NEXT_CONTROL_VALUE         1021
 #define _APS_NEXT_SYMED_VALUE           111

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

@@ -7,7 +7,7 @@
 #include "net/URI.h"
 #include "common/RhoConf.h"
 
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 #include <connmgr.h>
 #endif
 
@@ -282,6 +282,7 @@ boolean CNetRequestImpl::readHeaders(Hashtable<String,String>& oHeaders)
 
         String strFieldName = common::convertToStringA(strName.GetString());
         String strFieldValue = common::convertToStringA(strValue.GetString());
+        LOG(TRACE) + strFieldName + ":" + strFieldValue;
         if ( oHeaders.containsKey(strFieldName) )
         {
             strFieldValue += ";" + oHeaders.get( strFieldName );
@@ -820,14 +821,15 @@ void CNetRequestImpl::free_url_components(URL_COMPONENTS *uri)
 
 bool CNetRequestImpl::initConnection(boolean bLocalHost, LPCTSTR url)
 {
-    common::CMutexLock lock(m_mxInternet);
-
     if (!bLocalHost)
     {
+        common::CMutexLock lock(m_mxInternet);
         if ( !SetupInternetConnection(url) )
             return false;
     }
 
+    common::CMutexLock lock(m_mxInternet);
+
     if (m_hInternet)
         return true;
 
@@ -868,7 +870,7 @@ bool CNetRequestImpl::initConnection(boolean bLocalHost, LPCTSTR url)
         InternetCloseHandle(m_hInternet);
     m_hInternet = NULL;
 
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
     if ( m_hWceConnMgrConnection )
         ConnMgrReleaseConnection(m_hWceConnMgrConnection, FALSE);
 
@@ -879,7 +881,7 @@ bool CNetRequestImpl::initConnection(boolean bLocalHost, LPCTSTR url)
 
 bool CNetRequestImpl::SetupInternetConnection(LPCTSTR url)
 {
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	int iNetwork;
 	HRESULT hResult = E_FAIL;
 	DWORD   dwStatus;

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

@@ -3,7 +3,7 @@
 #include "GeoLocationImpl.h"
 #include "rubyext/GeoLocation.h"
 
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 IMPLEMENT_LOGCLASS(CGPSDevice,"GPSDevice");
 IMPLEMENT_LOGCLASS(CGPSController,"GPSController");
 
@@ -413,7 +413,7 @@ void CGPSController::Unlock() {
 extern "C"{
 double rho_geo_latitude() 
 {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	CGPSController* gps = CGPSController::startInstance();
 	return gps->GetLatitude();
 #else
@@ -423,7 +423,7 @@ double rho_geo_latitude()
 
 double rho_geo_longitude() 
 {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
   CGPSController* gps = CGPSController::startInstance();
 	return gps->GetLongitude();
 #else
@@ -433,7 +433,7 @@ double rho_geo_longitude()
 
 int rho_geo_known_position() 
 {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	CGPSController* gps = CGPSController::startInstance();
 	return gps->IsKnownPosition();
 #else
@@ -447,7 +447,7 @@ void rho_geoimpl_settimeout(int nTimeoutSec)
 
 void rho_geoimpl_turngpsoff()
 {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
 	CGPSController::TurnGpsOff();
 #endif
 
@@ -455,7 +455,7 @@ void rho_geoimpl_turngpsoff()
 
 int rho_geo_is_available()
 {
-#if defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)&& !defined( OS_PLATFORM_CE )
     return CGPSDevice::isAvailable() ? 1 : 0;
 #else
 	return 0;

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined (_WIN32_WCE)
+#if defined (_WIN32_WCE) && !defined( OS_PLATFORM_CE )
 
 #include <gpsapi.h>
 #include "logging/RhoLog.h"

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

@@ -358,7 +358,7 @@ String CNativeToolbar::CToolbarBtn::getDefaultImagePath(const String& strAction)
     else if ( strcasecmp(strAction.c_str(), "forward")==0 )
         strImagePath = "lib/res/forward_btn.png";
 
-        return strImagePath.length() > 0 ? CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath) : String();
+    return strImagePath.length() > 0 ? CFilePath::join( RHODESAPP().getRhoRootPath(), strImagePath) : String();
 }
 
 CNativeToolbar::CToolbarBtn::CToolbarBtn( const char *label, const char *action, const char *icon, int nItemWidth  )
@@ -492,6 +492,11 @@ void nativebar_set_tab_badge(int index,char* val)
 {
 }
 
+int native_tabbar_get_current_tab() 
+{
+	return 0;
+}
+
 void nativebar_switch_tab(int index) {
 	//TODO: Implement me!
 }

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

@@ -6,8 +6,9 @@
 #include "ruby/ext/rho/rhoruby.h"
 #include "MainWindow.h"
 
-#ifdef OS_WINCE
+#if defined( OS_WINCE ) && !defined( OS_PLATFORM_CE )
 #include <cfgmgrapi.h>
+#include <getdeviceuniqueid.h>
 #endif
 
 #ifdef OS_WINCE__
@@ -283,6 +284,49 @@ int rho_wmsys_has_touchscreen()
 #endif
 }
 
+
+int rho_sys_get_screen_width()
+{
+#ifdef OS_WINCE
+	return GetSystemMetrics(SM_CXSCREEN);
+#else
+	return CMainWindow::getScreenWidth();
+#endif
+}
+
+int rho_sys_get_screen_height()
+{
+#ifdef OS_WINCE
+	return GetSystemMetrics(SM_CYSCREEN);
+#else
+	return CMainWindow::getScreenHeight();
+#endif
+}
+
+static void toHexString(int i, String& strRes, int radix)
+{
+    char buf[33];
+	bool neg= false;
+	int f, n;
+	if(i<0) { neg= true; i= -i; };
+	f= 32;
+	buf[f--]= 0;
+	do
+	{
+		n= i%radix;
+		if(n<10) buf[f]= '0'+n;
+		else buf[f]= 'a'+n-10;
+		i= i/radix;
+		f--;
+	}
+	while(i>0);
+
+	if(neg) 
+        buf[f--]= '-';
+
+    strRes += (buf+f+1);
+}
+
 int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 {
 	if (strcasecmp("has_camera",szPropName) == 0) 
@@ -378,26 +422,47 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         *resValue = rho_ruby_create_boolean( rho_wmsys_has_touchscreen() );
         return 1;
     }
+	if (strcasecmp("screen_orientation",szPropName) == 0)
+    {
+        if (rho_sys_get_screen_width() <= rho_sys_get_screen_height()) 
+        {
+		    *resValue = rho_ruby_create_string("portrait");
+	    }
+	    else {
+		    *resValue = rho_ruby_create_string("landscape");
+	    }                                                          
+        return 1;
+    }
 
-    return 0;
-}
+#if defined( OS_WINCE )&& !defined( OS_PLATFORM_CE )
+    if (strcasecmp("device_id",szPropName) == 0) 
+    {
+        rho::String strDeviceID = "";
+        String strAppData = "RHODES_" + RHODESAPP().getAppName() + "_DEVICEID";
+
+        BYTE rgDeviceId[20];
+        DWORD cbDeviceId = sizeof(rgDeviceId);
+        HRESULT hr = GetDeviceUniqueID( (PBYTE)(strAppData.c_str()),
+           strAppData.length(),
+           GETDEVICEUNIQUEID_V1,
+           rgDeviceId,
+           &cbDeviceId);
+
+        if ( SUCCEEDED(hr) )
+        {
+            for( int i = 0; i < cbDeviceId; i++)
+            {
+                toHexString( rgDeviceId[i], strDeviceID, 16);
+            }
+        }
 
-int rho_sys_get_screen_width()
-{
-#ifdef OS_WINCE
-	return GetSystemMetrics(SM_CXSCREEN);
-#else
-	return CMainWindow::getScreenWidth();
-#endif
-}
+        *resValue = rho_ruby_create_string(strDeviceID.c_str());
 
-int rho_sys_get_screen_height()
-{
-#ifdef OS_WINCE
-	return GetSystemMetrics(SM_CYSCREEN);
-#else
-	return CMainWindow::getScreenHeight();
+        return 1;
+    }
 #endif
+
+    return 0;
 }
 
 VALUE rho_sys_makephonecall(const char* callname, int nparams, char** param_names, char** param_values) 
@@ -522,7 +587,7 @@ int rho_sys_is_app_installed(const char *appname)
     strRequest += convertToStringW(strAppName) + L"\"/>"
         L"</characteristic></wap-provisioningdoc>"; 
 
-#ifdef OS_WINCE
+#if defined( OS_WINCE ) && !defined( OS_PLATFORM_CE )
     HRESULT hr         = E_FAIL;
     LPWSTR wszOutput   = NULL;
     hr = DMProcessConfigXML(strRequest.c_str(), CFGFLAG_PROCESS, &wszOutput);
@@ -560,7 +625,7 @@ void rho_sys_app_uninstall(const char *appname)
         L"</characteristic>"
         L"</characteristic></wap-provisioningdoc>";
 
-#ifdef OS_WINCE
+#if defined( OS_WINCE )&& !defined( OS_PLATFORM_CE )
     HRESULT hr         = E_FAIL;
     LPWSTR wszOutput   = NULL;
     hr = DMProcessConfigXML(strRequest.c_str(), CFGFLAG_PROCESS, &wszOutput);