rhodes 2.0.0.beta1 → 2.0.0.beta2

data/platform/wm/rhodes/Alert.h

@@ -7,10 +7,93 @@
 using namespace rho;
 using namespace rho::common;
 
+#define ID_ALERT_DLG_BUTTON_MAX   (8)
+#define ID_ALERT_DLG_BUTTON_FIRST (1)
+#define ID_ALERT_DLG_BUTTON_LAST  (ID_ALERT_DLG_BUTTON_FIRST + (ID_ALERT_DLG_BUTTON_MAX) - 1)
+
+class CAlertDialog : public CIndirectDialogImpl<CAlertDialog, CMemDlgTemplate>
+{
+public:
+	/**
+	 * Params is a container to pass parameters to UI thread.
+	 */
+	class Params {
+	public:
+		enum {DLG_DEFAULT, DLG_CUSTOM};
+
+		Params (String &message)
+		{
+			m_dlgType  = DLG_DEFAULT;
+			m_message  = message;
+		}
+
+		Params (String &title, String &message, String &icon, String &callback, Hashtable<String, String> &buttons)
+		{
+			m_dlgType  = DLG_CUSTOM;
+			m_title    = title;
+			m_message  = message;
+			m_icon     = icon;
+			m_callback = callback;
+			m_buttons  = buttons;
+		}
+
+		int    m_dlgType;
+		String m_title;
+		String m_message;
+		String m_icon;
+		String m_callback;
+		Hashtable<String, String> m_buttons;
+	};
+	
+	class CustomButton : public CButton {
+	public:
+		CustomButton () {}
+
+		CustomButton (String title, String strId, int numId)
+		{
+			m_title = title;
+			m_strId = strId;
+			m_numId = numId;
+		}
+	public:
+		String m_title;
+		String m_strId;
+		int	   m_numId;
+	};
+
+public:
+	BEGIN_MSG_MAP(CAlertDialog)
+		MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+		COMMAND_RANGE_HANDLER(ID_ALERT_DLG_BUTTON_FIRST, ID_ALERT_DLG_BUTTON_LAST, OnAlertDialogButton)
+	END_MSG_MAP()
+
+	CAlertDialog(Params *msg);
+	~CAlertDialog();
+
+	void DoInitTemplate();
+	void DoInitControls();
+
+	bool findButton(int id, CustomButton &button);
+
+public:
+	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL&bHandled);
+	LRESULT OnAlertDialogButton (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+
+private:
+	String m_title;
+	String m_message;
+	String m_callback;
+	String m_icon;
+
+	CStatic m_messageCtrl;
+	CStatic m_iconCtrl;
+	Vector<CustomButton> m_buttons;
+};
+
 class CAlert {
     DEFINE_LOGCLASS;
   public:
-    static void showPopup(String message);
+	static void showPopup(CAlertDialog::Params *params);
     static void vibrate();
     static void playFile(String fileName);
 };

data/platform/wm/rhodes/MainWindow.cpp

@@ -25,6 +25,7 @@
 #include "sync/SyncThread.h"
 #include "common/RhoFilePath.h"
 
+
 #include <hash_map>
 
 IMPLEMENT_LOGCLASS(CMainWindow,"MainWindow");
@@ -430,7 +431,7 @@ LRESULT CMainWindow::OnTakePicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lPar
 
     RHODESAPP().callCameraCallback( (const char*)lParam, rho::common::convertToStringA(image_uri),
         (status!= S_OK && status != S_FALSE ? "Error" : ""), status == S_FALSE);
-    
+
     free ((void *)lParam);
 #endif    
 	return 0;
@@ -478,16 +479,37 @@ LRESULT CMainWindow::OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lP
 
 LRESULT CMainWindow::OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
 {
+	LOG(INFO) + __FUNCTION__;
     StringW strAppName = getRhodesAppName();
+	CAlertDialog::Params *params = (CAlertDialog::Params *)lParam;
+
+	if (params->m_dlgType == CAlertDialog::Params::DLG_DEFAULT) {
+		MessageBox(convertToStringW(params->m_message).c_str(), strAppName.c_str(), MB_ICONWARNING | MB_OK);
+	} else if (params->m_dlgType == CAlertDialog::Params::DLG_CUSTOM) {
+		if (m_alertDialog == NULL) {
+			m_alertDialog = new CAlertDialog(params);
+			m_alertDialog->DoModal();
+			delete m_alertDialog;
+			m_alertDialog = NULL;
+		} else {
+			LOG(WARNING) + "Trying to show alert dialog while it exists.";
+		}
+	}
 
-    USES_CONVERSION;
-    MessageBox(A2T((const char*)lParam),
-               strAppName.c_str(),
-               MB_ICONWARNING | MB_OK);
-    free ((void *)lParam);
+    delete params;
     return 0;
 }
 
+LRESULT CMainWindow::OnAlertHidePopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
+{
+	if (m_alertDialog != NULL) {
+		m_alertDialog->EndDialog(0);
+		m_alertDialog = NULL;
+	}
+
+	return 0;
+}
+
 LRESULT CMainWindow::OnDateTimePicker (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
 {
 	CDateTimeMessage *msg = (CDateTimeMessage *)lParam;

data/platform/wm/rhodes/MainWindow.h

@@ -10,6 +10,7 @@
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"
 #include "common/RhodesApp.h"
+#include "Alert.h"
 
 #if defined(OS_WINDOWS)
 #include "menubar.h"
@@ -24,7 +25,8 @@ 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_CONNECTIONSNETWORKCOUNT = ::RegisterWindowMessage(L"RHODES_WM_CONNECTIONSNETWORKCOUNT");
-static UINT WM_ALERT_SHOWPOPUP         = ::RegisterWindowMessage(L"RHODES_WM_ALERT_SHOWPOPUP");
+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");
 static UINT WM_DATETIME_PICKER         = ::RegisterWindowMessage(L"RHODES_WM_DATETIME_PICKER");
 
 
@@ -87,7 +89,8 @@ public:
 		MESSAGE_HANDLER(WM_TAKEPICTURE, OnTakePicture)
 		MESSAGE_HANDLER(WM_SELECTPICTURE, OnSelectPicture)
 		MESSAGE_HANDLER(WM_CONNECTIONSNETWORKCOUNT, OnConnectionsNetworkCount)
-        MESSAGE_HANDLER(WM_ALERT_SHOWPOPUP, OnAlertShowPopup);
+        MESSAGE_HANDLER(WM_ALERT_SHOW_POPUP, OnAlertShowPopup)
+		MESSAGE_HANDLER(WM_ALERT_HIDE_POPUP, OnAlertHidePopup);
 		MESSAGE_HANDLER(WM_DATETIME_PICKER, OnDateTimePicker);
     END_MSG_MAP()
 	
@@ -118,6 +121,7 @@ private:
 	LRESULT OnSelectPicture(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*/);
 	LRESULT OnDateTimePicker (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	
 public:
@@ -188,4 +192,5 @@ private:
 	int m_pageCounter;
 
     rho::Vector<rho::common::CAppMenuItem> m_arAppMenuItems;
+	CAlertDialog *m_alertDialog;
 };

data/platform/wm/rhodes/Rhodes.cpp

@@ -117,6 +117,29 @@ public :
 
         ::SetThreadPriority(GetCurrentThread(),10);
 
+		//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);
+
+		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);
+	
+			int msgboxID = MessageBox(NULL,
+										_T("Bundle directory is  missing."),
+										convertToStringW(appName).c_str(),
+										MB_ICONERROR | MB_OK);
+
+
+			return S_FALSE;
+	    }
+
+
         // Create the main application window
         m_appWindow.Create(NULL, CWindow::rcDefault, TEXT("Rhodes"), WS_VISIBLE);
         if (NULL == m_appWindow.m_hWnd)

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

@@ -305,7 +305,8 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
 		if (!GetVersionEx(&osv))
 			return 0;
 		char buf[50];
-		snprintf(buf, sizeof(buf), "%u.%u.%u", (unsigned)osv.dwMajorVersion,
+		buf[sizeof(buf) - 1] = '\0';
+		snprintf(buf, sizeof(buf) - 1, "%u.%u.%u", (unsigned)osv.dwMajorVersion,
 			(unsigned)osv.dwMinorVersion, (unsigned)osv.dwBuildNumber);
 		*resValue = rho_ruby_create_string(&buf[0]);
 		return 1;

data/platform/wm/rhodes/stdafx.h

@@ -89,6 +89,7 @@
 #include <atlframe.h>
 #include <atlmisc.h>
 #include <atlctrls.h>
+#include <atldlgs.h>
 #define _WTL_CE_NO_ZOOMSCROLL
 #include <atlwince.h>
 

data/platform/wm/tools/detool/detool.cpp

@@ -212,6 +212,7 @@ void wceDisconnect(void)
 
 #define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))
 
+
 bool wcePutFile(const char *host_file, const char *wce_file)
 {
 	TCHAR tszSrcFile[MAX_PATH];
@@ -299,6 +300,7 @@ bool wcePutFile(const char *host_file, const char *wce_file)
 			_tprintf( TEXT("."));                                        
 		} while (dwNumRead);
 		//_tprintf( TEXT("\n"));
+
 		CeCloseHandle( hDest);
 		CloseHandle (hSrc);
 	}
@@ -338,7 +340,6 @@ bool wceRunProcess(const char *process, const char *args)
 			_tprintf( TEXT("CreateProcess failed with Errorcode = %ld\n"), CeGetLastError());
 			return false;
 		}
-		WaitForSingleObject(pi.hProcess, INFINITE);
 		CeCloseHandle( pi.hProcess);
 		CeCloseHandle( pi.hThread);
 	}
@@ -381,47 +382,356 @@ bool wceInvokeCabSetup(const char *wceload_params)
 //#define EMU "USA Windows Mobile 6.5 Professional Portrait QVGA Emulator"
 
 /**
- * detool emu "<emu_name|vmid>" app.cab "app-name"
+ * detool emu "<emu_name|vmid>" "app-name" rhobundle_path exe_name
+ * or
+ * detool emucab "<emu_name|vmid>" app.cab "app-name"
  * or
- * detool dev app.cab "app-name"
+   detool dev "app-name" rhobundle_path exe_name
+   or 
+ * detool devcab app.cab "app-name"
  */
 void usage(void)
 {
 printf 
-	("Rhodes deployment tool for Windows Mobile:               \n  \
+	("Rhodes deployment tool for Windows Mobile:          \n  \
 	  detool emu \"<emu_name|vmid>\" app.cab \"app-name\" \n  \
-	  or                                                       \n  \
-	  detool dev app.cab \"app-name\"                       \n"
+	  or                                                  \n  \
+	  detool dev app.cab \"app-name\"                     \n"
 	 );
 }
 enum {
+	DEPLOY_EMUCAB,
+	DEPLOY_DEVCAB,
 	DEPLOY_EMU,
 	DEPLOY_DEV
 };
 
+int copyExecutable (TCHAR *file_name, TCHAR *app_dir)
+{
+	TCHAR exe_fullpath[MAX_PATH];
+	int retval = 0;
+	HANDLE hDest, hSrc;
+	BYTE  buffer[5120];
+	DWORD dwNumRead, dwNumWritten;
+
+	USES_CONVERSION;
+	
+	_tcscpy(exe_fullpath, app_dir);
+	_tcscat(exe_fullpath, _T("\\"));
+	_tcscat(exe_fullpath, _T("rhodes.exe"));
+
+
+	hSrc = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (INVALID_HANDLE_VALUE == hSrc) {
+		_tprintf( TEXT("Unable to open host file\n"));
+		return EXIT_FAILURE;
+	}
+
+	hDest = CeCreateFile(exe_fullpath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (INVALID_HANDLE_VALUE == hDest ) {
+		_tprintf( TEXT("Unable to open target WinCE file\n"));
+		return CeGetLastError();
+	}
+
+	do {
+		if(ReadFile(hSrc, &buffer, sizeof(buffer), &dwNumRead, NULL)) {
+			if (!CeWriteFile(hDest, &buffer, dwNumRead, &dwNumWritten, NULL)) {
+				_tprintf( TEXT("Error !!! Writing WinCE file\n"));
+				goto copyFailure;
+				}
+			} else {
+				_tprintf( TEXT("Error !!! Reading host file\n"));
+				goto copyFailure;
+		}
+		_tprintf( TEXT("."));                                        
+	} while (dwNumRead);
+	_tprintf( TEXT("\n"));
+
+	CeCloseHandle( hDest);
+	CloseHandle (hSrc);
+
+	return EXIT_SUCCESS;
+
+copyFailure:
+	CeCloseHandle( hDest);
+	CloseHandle (hSrc);
+/*
+
+	if (wcePutFile (T2A(file_name), T2A(exe_fullpath)))
+		return EXIT_SUCCESS;
+*/
+	return EXIT_FAILURE;
+}
+
+int copyBundle (TCHAR *parent_dir, TCHAR *file, TCHAR *app_dir)
+{
+	HANDLE           fileHandle;
+	WIN32_FIND_DATAW findData;
+	DWORD			 dwError;
+	TCHAR			 new_app_item[MAX_PATH];
+	TCHAR			 host_file[MAX_PATH];
+	HANDLE hFind;
+	CE_FIND_DATA wceFindData;
+
+	USES_CONVERSION;
+
+	TCHAR wildcard[MAX_PATH + 16];
+	TCHAR fullpath[MAX_PATH];
+
+	_tcscpy(fullpath, parent_dir);
+	_tcscat(fullpath, _T("\\"));
+	_tcscat(fullpath, file);
+
+	//TODO: check for fullpath is a dir
+
+	_tcscpy(wildcard, fullpath);
+	_tcscat(wildcard, _T("\\*.*"));
+
+	//wceConnect ();
+
+	fileHandle = FindFirstFile(wildcard, &findData);
+
+	if (fileHandle == INVALID_HANDLE_VALUE) {
+		printf ("Failed to open file\n");
+		wceDisconnect();
+		return EXIT_FAILURE;
+	}
+
+	/*
+	if (_tcscmp (_T("."), findData.cFileName) != 0 && _tcscmp (_T(".."), findData.cFileName) != 0) {
+		printf("-- %s\n", T2A(findData.cFileName));
+		if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+			copyBundle (fullpath, findData.cFileName, NULL);
+		}
+	}
+	*/
+
+	HANDLE hDest, hSrc;
+	BYTE  buffer[5120];
+	DWORD dwNumRead, dwNumWritten;
+
+	while (FindNextFile(fileHandle, &findData)) {
+		if (_tcscmp (_T("."), findData.cFileName) == 0 || _tcscmp (_T(".."), findData.cFileName) == 0)
+			continue;
+
+		_tcscpy(new_app_item, app_dir);
+		_tcscat(new_app_item, _T("\\"));
+		_tcscat(new_app_item, findData.cFileName);
+
+		if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) 
+		{	
+			//Check and create dir on device
+			hFind = CeFindFirstFile(new_app_item, &wceFindData);
+			if (INVALID_HANDLE_VALUE == hFind) {
+				if (!CeCreateDirectory(new_app_item, NULL)) {
+					_tprintf( TEXT("Create directory \"%s\" on device\n"), new_app_item);
+					printf ("Failed to create new directory on device\n");
+					return EXIT_FAILURE;
+				}
+			}
+			FindClose( hFind);
+			
+			copyBundle (fullpath, findData.cFileName, new_app_item);
+		} 
+		else 
+		{
+			_tcscpy(host_file, fullpath);
+			_tcscat(host_file, _T("\\"));
+			_tcscat(host_file, findData.cFileName);
+
+			_tprintf( TEXT("Copy file \"%s\" to device"), new_app_item);
+
+			hSrc = CreateFile(host_file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+			if (INVALID_HANDLE_VALUE == hSrc) {
+				_tprintf( TEXT("Unable to open host file\n"));
+				return false;
+			}
+
+			hDest = CeCreateFile(new_app_item, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+			if (INVALID_HANDLE_VALUE == hDest ) {
+				_tprintf( TEXT("Unable to open target WinCE file\n"));
+				return false;
+			}
+
+			do {
+				if(ReadFile(hSrc, &buffer, sizeof(buffer), &dwNumRead, NULL)) {
+					if (!CeWriteFile(hDest, &buffer, dwNumRead, &dwNumWritten, NULL)) {
+						_tprintf( TEXT("Error !!! Writing WinCE file\n"));
+						goto copyBundleFailure;
+					}
+				} else {
+					_tprintf( TEXT("Error !!! Reading host file\n"));
+					goto copyBundleFailure;
+				}
+				_tprintf( TEXT("."));                                        
+			} while (dwNumRead);
+			_tprintf( TEXT("\n"));
+
+			CeCloseHandle( hDest);
+			CloseHandle (hSrc);
+			/*
+			if(!wcePutFile (T2A(host_file), T2A(new_app_item))) {
+				printf("Failed to copy file.");
+				return EXIT_FAILURE;
+			}
+			*/
+		}
+
+	}
+
+	return EXIT_SUCCESS;
+
+copyBundleFailure:
+	CeCloseHandle( hDest);
+	CloseHandle (hSrc);
+	return EXIT_FAILURE;
+}
+
 int _tmain(int argc, _TCHAR* argv[])
 {
 	TCHAR *emu_name = NULL;
 	TCHAR *cab_file = NULL;
 	TCHAR *app_name = NULL;
+	TCHAR *bundle_path = NULL;
+	TCHAR *app_exe = NULL;
 	TCHAR params_buf[MAX_PATH + 16];
+	WIN32_FIND_DATAW findData;
+	int new_copy = 0;
 	int deploy_type;
 
-	if (argc == 5) {        //assuming that need to start emulator
-		emu_name = argv[2];
-		cab_file = argv[3];
-		app_name = argv[4];
-		deploy_type = DEPLOY_EMU;
+	USES_CONVERSION;
+
+	if (argc >= 5) {        //assuming that need to start emulator
+		if (strcmp(T2A(argv[1]), "emu") == 0) {
+			emu_name    = argv[2];
+			app_name    = argv[3];
+			bundle_path = argv[4];
+			app_exe     = argv[5];
+			deploy_type = DEPLOY_EMU;
+		}
+		if (strcmp(T2A(argv[1]), "emucab") == 0) {
+			emu_name = argv[2];
+			cab_file = argv[3];
+			app_name = argv[4];
+			deploy_type = DEPLOY_EMUCAB;
+		}
+
+		if (strcmp(T2A(argv[1]), "dev") == 0) {
+			app_name = argv[2];
+			bundle_path = argv[3];
+			app_exe = argv[4];
+			deploy_type = DEPLOY_DEV;
+		}
 	} else if (argc == 4) { //assuming that need to deploy and start on device
 		cab_file = argv[2];
 		app_name = argv[3];
-		deploy_type = DEPLOY_DEV;
+		deploy_type = DEPLOY_DEVCAB;
 	} else {
 		usage();
 		return EXIT_FAILURE;
 	}
 
+	TCHAR app_dir[MAX_PATH];
+	_tcscpy(app_dir, TEXT("\\Program Files\\"));
+	_tcscat(app_dir, app_name);
+	_tprintf( TEXT("%s\n"), app_dir);
+
 	if (deploy_type == DEPLOY_EMU) {
+		if (SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED))) {
+			HANDLE hFind;
+			CE_FIND_DATA findData;
+
+			CreateThread(NULL, 0, startDEM, NULL, 0, NULL);
+
+			_tprintf( TEXT("Starting emulator... "));
+			if (!emuConnect (emu_name)) {
+				_tprintf( TEXT("FAILED\n"));
+				goto stop_emu_deploy;
+			}
+			_tprintf( TEXT("DONE\n"));
+				
+			_tprintf( TEXT("Cradle emulator... "));
+			if(!emuCradle (emu_name)) {
+				_tprintf( TEXT("FAILED\n"));
+				goto stop_emu_deploy;
+			}
+			_tprintf( TEXT("DONE\n"));
+	
+			if (!wceConnect ()) {
+				printf ("Failed to connect to remote device.\n");
+				goto stop_emu_deploy;
+			} else {
+
+				hFind = CeFindFirstFile(app_dir, &findData);
+				if (INVALID_HANDLE_VALUE == hFind) {
+					_tprintf( TEXT("Application directory on device was no found\n"));
+					
+					new_copy = 1;
+
+					if (!CeCreateDirectory(app_dir, NULL)) {
+						printf ("Failed to create app directory\n");
+						goto stop_emu_deploy;
+					}
+				}
+				FindClose( hFind);
+
+				if (!findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+					_tprintf( TEXT("Error: target directory is file\n"));
+					goto stop_emu_deploy;
+				}
+				
+
+				TCHAR remote_bundle_path[MAX_PATH];
+
+				_tcscpy(remote_bundle_path, app_dir);
+				_tcscat(remote_bundle_path, _T("\\rho"));
+
+				hFind = CeFindFirstFile(remote_bundle_path, &findData);
+				if (INVALID_HANDLE_VALUE == hFind) {
+					_tprintf( TEXT("Bundle directory on device was no found\n"));
+	
+					if (!CeCreateDirectory(remote_bundle_path, NULL)) {
+						printf ("Failed to create bundle directory\n");
+						goto stop_emu_deploy;
+					}
+				}
+				FindClose( hFind);
+
+				int retval = copyExecutable (app_exe, app_dir);
+				if (retval != EXIT_SUCCESS) {
+					printf ("Failed to copy application executable\n");
+					if (retval == 32) {
+						printf ("Please, stop application on device and try again.\n");
+					}
+					goto stop_emu_deploy;
+				}
+
+				if (copyBundle(bundle_path, _T("/"), remote_bundle_path) == EXIT_FAILURE) {
+					printf ("Failed to copy bundle\n");
+					goto stop_emu_deploy;
+				}
+
+				emuBringToFront(emu_name);
+
+				_tprintf( TEXT("Starting application..."));
+				_tcscpy(params_buf, TEXT("\\Program Files\\"));
+				_tcscat(params_buf, app_name);
+				_tcscat(params_buf, TEXT("\\rhodes.exe"));
+				if(!wceRunProcess(T2A(params_buf), NULL)) {
+					_tprintf( TEXT("FAILED\n"));
+					goto stop_emu_deploy;
+				}
+				_tprintf( TEXT("DONE\n"));
+
+				wceDisconnect();
+			}
+	
+			CoUninitialize();
+	
+			ExitProcess(EXIT_SUCCESS);
+		}
+	}
+	if (deploy_type == DEPLOY_EMUCAB) {
 		if (SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED))) {
 			CreateThread(NULL, 0, startDEM, NULL, 0, NULL);
 
@@ -440,7 +750,6 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tprintf( TEXT("DONE\n"));
 
 			_tprintf( TEXT("Loading cab file..."));		
-			USES_CONVERSION;
 			if (!wcePutFile (T2A(cab_file), "")) {
 				_tprintf( TEXT("FAILED\n"));
 				goto stop_emu_deploy;
@@ -484,14 +793,96 @@ int _tmain(int argc, _TCHAR* argv[])
 
 
 			CoUninitialize();
-
 			ExitProcess(EXIT_SUCCESS);
 	stop_emu_deploy:
+			CoUninitialize();
 			ExitProcess(EXIT_FAILURE);
 		}
 	}
 
 	if (deploy_type == DEPLOY_DEV) {
+		HANDLE hFind;
+		CE_FIND_DATA findData;
+
+		_tprintf( TEXT("Searching for Windows CE device..."));
+
+		HRESULT hRapiResult;
+		hRapiResult = CeRapiInit();
+		if (FAILED(hRapiResult)) {
+			_tprintf( TEXT("FAILED\n"));
+			return false;
+		}
+		_tprintf( TEXT("DONE\n"));
+
+		hFind = CeFindFirstFile(app_dir, &findData);
+		if (INVALID_HANDLE_VALUE == hFind) {
+			_tprintf( TEXT("Application directory on device was no found\n"));
+					
+			new_copy = 1;
+
+			if (!CeCreateDirectory(app_dir, NULL)) {
+				printf ("Failed to create app directory\n");
+				goto stop_emu_deploy;
+			}
+		}
+		FindClose( hFind);
+
+		if (!findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+			_tprintf( TEXT("Error: target directory is file\n"));
+			goto stop_emu_deploy;
+		}
+				
+
+		TCHAR remote_bundle_path[MAX_PATH];
+
+		_tcscpy(remote_bundle_path, app_dir);
+		_tcscat(remote_bundle_path, _T("\\rho"));
+
+		hFind = CeFindFirstFile(remote_bundle_path, &findData);
+		if (INVALID_HANDLE_VALUE == hFind) {
+			_tprintf( TEXT("Bundle directory on device was no found\n"));
+	
+			if (!CeCreateDirectory(remote_bundle_path, NULL)) {
+				printf ("Failed to create bundle directory\n");
+				goto stop_emu_deploy;
+			}
+		}
+		FindClose( hFind);
+
+		
+		int retval = copyExecutable (app_exe, app_dir);
+		if (retval != EXIT_SUCCESS) {
+			printf ("Failed to copy application executable\n");
+			if (retval == 32) {
+				printf ("Please, stop application on device and try again.\n");
+			}
+			goto stop_emu_deploy;
+		}
+
+		if (copyBundle(bundle_path, _T("/"), remote_bundle_path) == EXIT_FAILURE) {
+			printf ("Failed to copy bundle\n");
+			goto stop_emu_deploy;
+		}
+
+		Sleep(2 * 1000);
+
+		_tprintf( TEXT("Starting application..."));
+		_tcscpy(params_buf, TEXT("\\Program Files\\"));
+		_tcscat(params_buf, app_name);
+		_tcscat(params_buf, TEXT("\\rhodes.exe"));
+		_tprintf( TEXT("%s\n"), params_buf);
+
+		
+		if(!wceRunProcess(T2A(params_buf), NULL)) {
+			_tprintf( TEXT("FAILED\n"));
+			goto stop_emu_deploy;
+		}
+		_tprintf( TEXT("DONE\n"));
+
+		ExitProcess(EXIT_SUCCESS);
+	}
+
+	if (deploy_type == DEPLOY_DEVCAB) {
 			_tprintf( TEXT("Searching for Windows CE device..."));
 
 			HRESULT hRapiResult;