rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/wm/rhodes/Rhodes.cpp

@@ -7,6 +7,8 @@
 #include "common/rhoparams.h"
 #include "rho/rubyext/GeoLocationImpl.h"
 #include "ruby/ext/rho/rhoruby.h"
+#include "net/NetRequestImpl.h"
+#include "sync/ClientRegister.h"
 
 using namespace rho;
 using namespace rho::common;
@@ -39,9 +41,6 @@ HREGNOTIFY g_hNotify = NULL;
 
 #endif
 
-//BOOL EnumRhodesWindowsProc(HWND hwnd,LPARAM lParam);
-extern "C" void rho_clientregister_create(const char* szDevicePin);
-
 class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
 {
 public :
@@ -120,18 +119,33 @@ public :
 		//Check for bundle directory is exists.
 		HANDLE hFind;
 		WIN32_FIND_DATA wfd;
-		hFind = FindFirstFile(convertToStringW(m_strRootPath.substr(0, m_strRootPath.find_last_of('/'))).c_str(), &wfd);
+		
+		// rootpath + "rho/"
+		if (m_strRootPath.at(m_strRootPath.length()-1) == '/') {
+			hFind = FindFirstFile(convertToStringW(m_strRootPath.substr(0, m_strRootPath.find_last_of('/'))).c_str(), &wfd);
+		} else if (m_strRootPath.at(m_strRootPath.length()-1) == '\\') {
+			//delete all '\' from the end of the pathname
+			int i = m_strRootPath.length();
+			for ( ; i != 1; i--) {
+				if (m_strRootPath.at(i-1) != '\\')
+					break;
+			}
+			hFind = FindFirstFile(convertToStringW(m_strRootPath.substr(0, i)).c_str(), &wfd);
+		}
 
 		if (INVALID_HANDLE_VALUE == hFind || !(wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-			LOG(INFO) + "Bundle directory is  missing\n";
-
 			int last = 0, pre_last = 0;
 			last = getRhoRootPath().find_last_of('\\');
 			pre_last = getRhoRootPath().substr(0, last).find_last_of('\\');
 			String appName = getRhoRootPath().substr(pre_last + 1, last - pre_last - 1);
-	
+
+			String messageText = "Bundle directory \"" + 
+									m_strRootPath.substr(0, m_strRootPath.find_last_of('/')) + 
+									"\" is  missing\n";
+
+			LOG(INFO) + messageText;
 			int msgboxID = MessageBox(NULL,
-										_T("Bundle directory is  missing."),
+										convertToStringW(messageText).c_str(),
 										convertToStringW(appName).c_str(),
 										MB_ICONERROR | MB_OK);
 
@@ -139,6 +153,7 @@ public :
 			return S_FALSE;
 	    }
 
+        rho::common::CRhodesApp::Create(m_strRootPath );
 
         // Create the main application window
         m_appWindow.Create(NULL, CWindow::rcDefault, TEXT("Rhodes"), WS_VISIBLE);
@@ -147,12 +162,8 @@ public :
             return S_FALSE;
         }
 
-        rho::common::CRhodesApp::Create(m_strRootPath );
         RHODESAPP().startApp();
 
-       // m_pServerHost = new CServerHost();
-        // Starting local server
-        //m_pServerHost->Start(m_appWindow.m_hWnd);
         // Navigate to the "loading..." page
 		m_appWindow.Navigate2(_T("about:blank"));
         // Show the main application window
@@ -190,10 +201,6 @@ public :
                 DispatchMessage(&msg);
             }
         }
-        // Stop local server
-        //m_pServerHost->Stop();
-        //delete m_pServerHost;
-        //m_pServerHost = NULL;
 
 #if defined(OS_WINCE)
         CGPSController* pGPS = CGPSController::Instance();
@@ -201,7 +208,13 @@ public :
 #endif
         rho_ringtone_manager_stop();
 
+#if !defined(_WIN32_WCE)
+        rho_clientregister_destroy();
+#endif
+
         rho::common::CRhodesApp::Destroy();
+
+        net::CNetRequestImpl::deinitConnection();
     }
 
     const rho::String& getRhoRootPath()
@@ -228,7 +241,6 @@ public :
 
 private:
     CMainWindow m_appWindow;
-    //CServerHost* m_pServerHost;
     rho::String m_strRootPath;
 	int m_nRestarting;
 };

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

@@ -2,13 +2,18 @@
 
 #include "ext/phonebook/phonebook.h" 
 #include "NativeAddressBook.h"
+#include <common/RhoStd.h>
 
 #define INITGUID
 #include <pimstore.h>
 #include <comutil.h>
 
+using namespace rho;
+using namespace rho::common;
+
 IMPLEMENT_LOGCLASS(CABRecord,"ABRecord");
 IMPLEMENT_LOGCLASS(CABOutlookRecord,"ABOutlookRecord");
+IMPLEMENT_LOGCLASS(CABSimRecord,"ABSimRecord");
 IMPLEMENT_LOGCLASS(CNativeAddressBook,"NativeAddressBook");
 
 // Note that return type is std::string, not LPCSTR!!!
@@ -179,30 +184,38 @@ int CABOutlookRecord::remove() {
 //=============================================================================
 
 CNativeAddressBook::CNativeAddressBook() :
-m_openedOutlookAB(false), m_outlookApp(NULL), m_outlookItems(NULL) {
+m_openedOutlookAB(false), m_outlookApp(NULL), m_outlookItems(NULL), m_hSim(0) {
 }
 
 CNativeAddressBook::~CNativeAddressBook() {
-	if (m_openedOutlookAB) {
+	if (m_openedOutlookAB)
 		closeOutlookAB();
-	}
+
+	if (m_hSim)
+		closeSimAB();
 }
 
 int CNativeAddressBook::openAB() {
+	initSimAB();
 	return initOutlookAB();
 }
 
 int CNativeAddressBook::getAllRecords(std::vector<CABRecord*>& records) {
+	getAllSimPhonebookRecords(records);
+
 	return getAllOutlookRecords(records);
 }
 
-CABRecord* CNativeAddressBook::getRecord(char* id) {
+CABRecord* CNativeAddressBook::getRecord(char* id) 
+{
 	char recordType[20];
 	long recordId;
 	if ( sscanf(id, "{%s %ld}", recordType, &recordId) == 2 ) {
 		LOG(INFO) + "get Record " + recordId + " of " + recordType +" type";
 		if (strcmp(recordType,"outlook")==0) {
 			return getOutlookRecord(recordId);
+		} else if (strcmp(recordType,"sim")==0) {
+			return getSimRecord(recordId);
 		}
 	}
 	return NULL;
@@ -345,4 +358,115 @@ int CNativeAddressBook::addOutlookRecord(CABOutlookRecord* record) {
 		}
 	}
 	return 1;
+}
+
+bool CNativeAddressBook::initSimAB()
+{
+	HRESULT h = SimInitialize(0, NULL, 0, &m_hSim);
+	if (SUCCEEDED(h))
+	{
+		if (SUCCEEDED(SimGetDevCaps(m_hSim, SIM_CAPSTYPE_ALL, &m_SimCaps))) 
+		{
+				return true;				
+		}
+		LOG(ERROR) + "Failed to get SIM capabilities.";
+		SimDeinitialize(m_hSim);
+		m_hSim = NULL;
+	}
+	LOG(ERROR) + "Failed to init SIM. Error=" + (int)h;
+
+	return false;
+}
+
+bool CNativeAddressBook::closeSimAB()
+{
+	SimDeinitialize(m_hSim);
+	return false;
+}
+
+CABRecord* CNativeAddressBook::getSimRecord(int id)
+{
+	CABSimRecord *pRecord;
+	HRESULT hr = 0;
+
+	pRecord = new CABSimRecord(id, m_hSim);
+
+	if(pRecord) {
+		if (SUCCEEDED(hr = pRecord->load())) {
+			return pRecord;
+		} else {
+			if (SIM_E_NOTFOUND)
+				LOG(ERROR) + "Failed to get SIM entry";
+		}
+	} else {
+		LOG(ERROR) + "No more memory";
+	}
+	return NULL;
+}
+
+int CNativeAddressBook::getAllSimPhonebookRecords(std::vector<CABRecord*>& records)
+{
+	CABSimRecord *pRecord;
+	HRESULT hr = 0;
+
+	for(DWORD i = m_SimCaps.dwMinPBIndex; i <= m_SimCaps.dwMaxPBIndex; i++) {
+		pRecord = new CABSimRecord(i, m_hSim);
+		if(pRecord) {
+			if (SUCCEEDED(hr = pRecord->load()))
+				records.push_back(pRecord);
+			else {
+				if (SIM_E_NOTFOUND)
+					break;
+				LOG(ERROR) + "Failed to get SIM entry";
+			}
+		} else {
+			LOG(ERROR) + "No more memory";
+		}
+	}
+
+	
+	return SUCCEEDED(hr) ? 1 : 0;
+}
+
+CABSimRecord::CABSimRecord(int index, HSIM hSim)
+{
+	m_hSim = hSim;
+	m_index = index;
+}
+
+CABSimRecord::~CABSimRecord()
+{
+}
+
+int CABSimRecord::load()
+{
+	SIMPHONEBOOKENTRY entry;
+	
+	String name, address;
+	HRESULT hr = SimReadPhonebookEntry(m_hSim, SIM_PBSTORAGE_SIM, m_index, &entry);
+	if (SUCCEEDED(hr))
+	{
+		char buf[128];
+		sprintf(buf,"{sim %ld}", m_index);
+		setValue(RUBY_PB_ID,buf);
+
+		setValue(RUBY_PB_FIRST_NAME, convertToStringA(entry.lpszText));
+		setValue(RUBY_PB_MAIN_MUMBER, convertToStringA(entry.lpszAddress));
+	}
+
+	return hr;
+}
+
+int CABSimRecord::save()
+{
+	return 0;
+}
+
+int CABSimRecord::remove()
+{
+	return 0;
+}
+
+void CABSimRecord::saveValues()
+{
 }

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

@@ -5,6 +5,7 @@
 #include <vector>
 
 #include <pimstore.h>
+#include <simmgr.h>
 #include "logging/RhoLog.h"
 
 typedef void (*ab_callback_t)(const char*, const char*, void*);
@@ -33,11 +34,12 @@ public:
 
 protected:
 	ContactType m_type;
-	bool	m_modifyed;
+	bool		m_modifyed;
 
 	std::map<std::string,std::string> m_props;
 };
 
+
 class CABOutlookRecord : public CABRecord {
     DEFINE_LOGCLASS;
 public:
@@ -57,6 +59,26 @@ private:
 	friend class CNativeAddressBook;
 };
 
+class CABSimRecord : public CABRecord {
+	DEFINE_LOGCLASS;
+public:
+	CABSimRecord(int index, HSIM hSim);
+	virtual ~CABSimRecord();
+
+	virtual int load();
+	virtual int save();
+	virtual int remove();
+
+protected:
+	void saveValues();
+
+private:
+	int m_index;
+	HSIM m_hSim;
+
+	friend class CNativeAddressBook;
+};
+
 class CNativeAddressBook
 {
     DEFINE_LOGCLASS;
@@ -73,6 +95,7 @@ public:
 	int deleteRecord(CABRecord* record);
 
 protected:
+	//outlook
 	bool m_openedOutlookAB;
 	IPOutlookApp* m_outlookApp;
 	IPOutlookItemCollection* m_outlookItems;
@@ -84,6 +107,13 @@ protected:
 	CABRecord* getOutlookRecord(long oid);
 	int addOutlookRecord(CABOutlookRecord* record);
 
-	/*int initSimAB();
-	int closeSimAB();*/
+
+	//sim
+	HSIM	m_hSim;
+	SIMCAPS	m_SimCaps;
+
+	bool initSimAB();
+	bool closeSimAB();
+	int getAllSimPhonebookRecords(std::vector<CABRecord*>& records);
+	CABRecord* getSimRecord(int id);
 };

data/platform/wm/rhodes/resource.h

@@ -17,7 +17,7 @@
 #define IDD_SIMULATOR_LOGOPTIONS        116
 #define IDI_ICON                        117
 #define IDD_DATETIME_PICKER             118
-#define IDD_DATEPICKER                  119
+//#define IDD_DATEPICKER                  119
 #define IDD_TIME_PICKER                 119
 #define IDC_STATIC_PROMPT               1001
 #define IDC_EDIT_URL                    1002

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

@@ -24,5 +24,10 @@ void rho_clientregister_create(const char* szDevicePin)
     rho::sync::CClientRegister::Create(rho::common::createClassFactory(), szDevicePin);
 }
 
+void rho_clientregister_destroy()
+{
+    rho::sync::CClientRegister::Destroy();
+}
+
 };