rhodes 3.3.3.beta.3 → 3.3.3.beta.4

data/platform/wm/rhodes/Rhodes.cpp

@@ -59,8 +59,17 @@ extern "C" int rho_sys_check_rollback_bundle(const char* szRhoPath);
 
 #ifdef APP_BUILD_CAPABILITY_WEBKIT_BROWSER
 class CEng;
+class CConfig;
 extern "C" CEng* rho_wmimpl_get_webkitbrowser(HWND hParentWnd, HINSTANCE hInstance);
+extern "C" CConfig* rho_wmimpl_get_webkitconfig();
 extern rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance);
+extern "C" WCHAR* rho_wmimpl_get_configfilepath();
+extern "C" void rho_wmimpl_set_configfilepath(const char* path);
+extern "C" TCHAR* rho_wmimpl_get_startpage();
+extern "C" void rho_wmimpl_set_startpage(const char* path);
+extern "C" void rho_wmimpl_set_logpath(const TCHAR* path);
+extern "C" const char* rho_wmimpl_get_logpath();
+extern "C" const char* rho_wmimpl_get_logurl();
 #endif
 
 
@@ -122,11 +131,6 @@ class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
 	int m_nRestarting;
     CExtManager m_oExtManager;
 
-#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
-    static WCHAR g_ConfigFilePath[MAX_PATH + 1];
-    static TCHAR g_StartPage[MAX_PATH + 1];
-#endif // APP_BUILD_CAPABILITY_MOTOROLA
-
 #ifdef OS_WINDOWS
     String m_strHttpProxy;
 #endif
@@ -134,15 +138,6 @@ class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
 public :
     static HINSTANCE GetModuleInstance(){return m_hInstance;}
     static void SetModuleInstance(HINSTANCE hInstance){m_hInstance = hInstance;}
-
-#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
-    static void setConfigFilePath(const char* path);
-    static void setStartPage(const char* path);
-    static void setStartPage(const TCHAR* tpath);
-    static WCHAR* getConfigFilePath();
-    static TCHAR* getStartPage();
-#endif // APP_BUILD_CAPABILITY_MOTOROLA
-
     HWND GetMainWindow() { return m_appWindow.m_hWnd;}
 	CMainWindow* GetMainWindowObject() { return &m_appWindow;}
 	CMainWindow& GetAppWindow() { return m_appWindow; }
@@ -166,33 +161,6 @@ HINSTANCE CRhodesModule::m_hInstance;
 CRhodesModule _AtlModule;
 bool g_restartOnExit = false;
 
-#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
-WCHAR CRhodesModule::g_ConfigFilePath[MAX_PATH + 1] = {0};
-TCHAR CRhodesModule::g_StartPage[MAX_PATH + 1] = {0};
-
-extern "C" WCHAR* rho_wmimpl_get_configfilepath()
-{
-    return CRhodesModule::getConfigFilePath();
-}
-extern "C" TCHAR* rho_wmimpl_get_startpage()
-{
-    return CRhodesModule::getStartPage();
-}
-extern "C" void rho_wmimpl_set_configfilepath(const char* path)
-{
-    CRhodesModule::setConfigFilePath(path);
-}
-extern "C" void rho_wmimpl_set_startpage(const char* path)
-{
-    CRhodesModule::setStartPage(path);
-}
-extern "C" void rho_wmimpl_set_startpage_tchar(const TCHAR* path)
-{
-    CRhodesModule::setStartPage(path);
-}
-#endif // APP_BUILD_CAPABILITY_MOTOROLA
-
-
 #ifndef RHODES_EMULATOR
 rho::IBrowserEngine* rho_wmimpl_createBrowserEngine(HWND hwndParent)
 {
@@ -240,20 +208,8 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 			String token = convertToStringA(lpszToken);
 			char* path = parseToken( token.c_str(), token.length() );
 			if (path) {
-				if ((_strnicmp(path+strlen(path)-1,".html",5)==0) || (_strnicmp(path+strlen(path)-5,".htm",4)==0))
-                {
-					// RhoElements v1.0 compatibility mode
-					rho_wmimpl_set_startpage(path);
-                } else {
-					// RhoElements v2.0 mode
-					m_strRootPath = path;
-                    if (m_strRootPath.substr(0,7).compare("file://")==0)
-                        m_strRootPath.erase(0,7);
-                    ::std::replace(m_strRootPath.begin(), m_strRootPath.end(), '\\', '/');
-                    if (m_strRootPath.at(m_strRootPath.length()-1)!='/')
-                        m_strRootPath.append("/");
-                    m_strRootPath.append("rho/");
-				}
+				// RhoElements v1.0 compatibility mode
+                rho_wmimpl_set_startpage(path);
 				free(path);
 			}
         }
@@ -262,7 +218,10 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 			String token = convertToStringA(lpszToken);
             char* path = parseToken( token.c_str(), token.length() );
 			if (path) {
-				rho_wmimpl_set_configfilepath(path);
+                token = path;
+                if (token.substr(0,7).compare("file://")==0)
+                    token.erase(0,7);
+				rho_wmimpl_set_configfilepath(token.c_str());
 				free(path);
 			}
         }
@@ -337,6 +296,23 @@ bool CRhodesModule::ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode ) thr
 				free(port);
 			}
 		} */
+#else
+        else if (wcsnicmp(lpszToken, _T("approot"),7)==0)
+        {
+            String token = convertToStringA(lpszToken);
+			char* path = parseToken( token.c_str(), token.length() );
+			if (path) {
+				// RhoElements v2.0 Shared Runtime command line parameter
+				m_strRootPath = path;
+                if (m_strRootPath.substr(0,7).compare("file://")==0)
+                    m_strRootPath.erase(0,7);
+                ::std::replace(m_strRootPath.begin(), m_strRootPath.end(), '\\', '/');
+                if (m_strRootPath.at(m_strRootPath.length()-1)!='/')
+                    m_strRootPath.append("/");
+                m_strRootPath.append("rho/");
+        	}
+			free(path);
+        }
 #endif
 		lpszToken = FindOneOf(lpszToken, szTokens);
 	}
@@ -356,46 +332,6 @@ extern "C" void rho_sys_impl_exit_with_errormessage(const char* szTitle, const c
 extern "C" void rho_scanner_TEST(HWND hwnd);
 extern "C" void rho_scanner_TEST2();
 
-#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
-
-WCHAR* CRhodesModule::getConfigFilePath()
-{
-    return g_ConfigFilePath;
-}
-
-TCHAR* CRhodesModule::getStartPage()
-{
-    return g_StartPage;
-}
-
-void CRhodesModule::setConfigFilePath(const char* path)
-{
-    USES_CONVERSION;
-    WCHAR* wpath = A2W(path);
-    _tcscpy(g_ConfigFilePath, wpath);
-}
-
-void CRhodesModule::setStartPage(const char* path)
-{
-    USES_CONVERSION;
-    TCHAR* tpath = A2T(path);
-    setStartPage(tpath);
-}
-
-void CRhodesModule::setStartPage(const TCHAR* tpath)
-{
-    _tcscpy(g_StartPage, tpath);
-    // Store command line parameter in the registry
-    HKEY hKey;
-    DWORD Disposition;
-    RegCreateKeyEx( HKEY_CURRENT_USER, L"Software\\Symbol\\SymbolPB\\Temp", 0, NULL, 0, 0, 0, &hKey, &Disposition ); 
-    RegSetValueEx(hKey, L"cmdline", 0, REG_MULTI_SZ, (const BYTE *) tpath, (wcslen(tpath)+1)*2); 
-    RegCloseKey(hKey);
-}
-
-#endif // APP_BUILD_CAPABILITY_MOTOROLA
-
-
 // This method is called immediately before entering the message loop.
 // It contains initialization code for the application.
 // Returns:
@@ -438,7 +374,14 @@ HRESULT CRhodesModule::PreMessageLoop(int nShowCmd) throw()
         return S_FALSE;
     }
 
-	rho_logconf_Init(m_strRootPath.c_str(), m_logPort.c_str());
+#if defined(APP_BUILD_CAPABILITY_MOTOROLA)
+    CConfig* conf = rho_wmimpl_get_webkitconfig();
+    rho_logconf_Init((rho_wmimpl_get_logpath()[0]==0 ? m_strRootPath.c_str() : rho_wmimpl_get_logpath()), m_strRootPath.c_str(), m_logPort.c_str());
+    if (rho_wmimpl_get_logurl()[0]!=0)
+        RHOCONF().setString("rhologurl", rho_wmimpl_get_logurl(), false);
+#else
+    rho_logconf_Init(m_strRootPath.c_str(), m_strRootPath.c_str(), m_logPort.c_str());
+#endif // APP_BUILD_CAPABILITY_MOTOROLA
 
 #ifdef RHODES_EMULATOR
     RHOSIMCONF().setAppConfFilePath(CFilePath::join( m_strRootPath, RHO_EMULATOR_DIR"/rhosimconfig.txt").c_str());

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

@@ -64,7 +64,9 @@ CRhoExtData CExtManager::makeExtData()
     CRhoExtData oData;
     oData.m_hWnd = getMainWnd();
     oData.m_hInstance = rho_wmimpl_get_appinstance();
+#ifndef RHODES_EMULATOR
     oData.m_hBrowserWnd = getAppWindow().getWebKitEngine()->GetHTMLWND();
+#endif
 
     oData.m_iTabIndex = rho_webview_active_tab();
     return oData;
@@ -105,7 +107,7 @@ void CExtManager::onDocumentComplete(const wchar_t* szUrlOfDocument)
 {
     for ( HashtablePtr<String, IRhoExtension*>::iterator it = m_hashExtensions.begin(); it != m_hashExtensions.end(); ++it )
     {
-        (it->second)->onNavigateComplete( szUrlOfDocument, makeExtData() );
+        (it->second)->onDocumentComplete( szUrlOfDocument, makeExtData() );
     }
 }
 
@@ -119,6 +121,26 @@ void CExtManager::executeRubyCallback( const char* szCallback, const char* szCal
     RHODESAPP().callCallbackWithData(szCallback, szCallbackBody, szCallbackData, bWaitForResponse );
 }
 
+void CExtManager::executeRubyCallbackWithJsonBody( const char* szCallback, const char* szCallbackBody, const char* szCallbackData, bool bWaitForResponse)
+{
+    RHODESAPP().callCallbackWithJsonBody(szCallback, szCallbackBody, szCallbackData, bWaitForResponse );
+}
+
+extern "C" VALUE rjson_tokener_parse(const char *str, char** pszError );
+unsigned long CExtManager::parseJsonToRubyHash(const char* szJson)
+{
+    char* szError = 0;
+    unsigned long valBody = rjson_tokener_parse(szJson, &szError);
+    if ( valBody != 0 )
+        return valBody;
+
+    LOG(ERROR) + "Incorrect json body.Error:" + (szError ? szError : "");
+    if ( szError )
+        free(szError);
+
+    return rho_ruby_get_NIL();
+}
+
 void CExtManager::navigate(const wchar_t* szUrl)
 {
     ::PostMessage( getMainWnd(), WM_COMMAND, IDM_NAVIGATE, (LPARAM)_wcsdup(szUrl) );

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

@@ -89,7 +89,16 @@ const char* rho_webview_execute_js(const char* js, int index)
     //rho_webview_navigate(strJS.c_str(), index);
     StringW strJsW;
     convertToStringW(js, strJsW);
+
+#ifdef RHODES_EMULATOR
+    TNavigateData* nd = (TNavigateData*)malloc(sizeof(TNavigateData));
+    nd->index = index;
+    nd->url = _tcsdup(strJsW.c_str());
+    ::PostMessage( getMainWnd(), WM_COMMAND, IDM_EXECUTEJS, (LPARAM)nd );
+#else
     ::PostMessage( getMainWnd(), WM_COMMAND, IDM_EXECUTEJS, (LPARAM)_tcsdup(strJsW.c_str()) );
+#endif
+
 	return "";
 }
 

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

@@ -33,7 +33,7 @@
 #include "LogServer.h"
 
 #define RHOSETUP_DLL "rhosetup.dll"
-
+#define RE2_RUNTIME TEXT("\\Program Files\\RhoElements2\\RhoElements2.exe")
 
 TCHAR *app_name = NULL;
 
@@ -492,7 +492,7 @@ enum {
     DEPLOY_EMU_WEBKIT
 };
 
-int copyExecutable (TCHAR *file_name, TCHAR *app_dir)
+int copyExecutable (TCHAR *file_name, TCHAR *app_dir, bool use_re_runtime)
 {
 	TCHAR exe_fullpath[MAX_PATH];
 	int retval = 0;
@@ -505,7 +505,7 @@ int copyExecutable (TCHAR *file_name, TCHAR *app_dir)
 	_tcscpy(exe_fullpath, app_dir);
 	_tcscat(exe_fullpath, _T("\\"));
 	_tcscat(exe_fullpath, app_name);
-	_tcscat(exe_fullpath, _T(".exe"));
+	_tcscat(exe_fullpath, (use_re_runtime ? _T(".lnk") : _T(".exe")));
 
 	hSrc = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 	if (INVALID_HANDLE_VALUE == hSrc) {
@@ -764,6 +764,20 @@ void connectWMDC() {
 	}
 }
 
+bool str_ends_with(const TCHAR* str, const TCHAR* suffix)
+{
+	if( str == NULL || suffix == NULL )
+		return 0;
+
+	size_t str_len = wcslen(str);
+	size_t suffix_len = wcslen(suffix);
+
+	if(suffix_len > str_len)
+		return 0;
+
+	return (_wcsnicmp( str + str_len - suffix_len, suffix, suffix_len ) == 0);
+}
+
 int _tmain(int argc, _TCHAR* argv[])
 {
 	TCHAR *emu_name = NULL;
@@ -778,6 +792,7 @@ int _tmain(int argc, _TCHAR* argv[])
 	//WIN32_FIND_DATAW findData;
 	int new_copy = 0;
 	int deploy_type;
+	bool use_re_runtime = false;
 
 	USES_CONVERSION;
 
@@ -794,7 +809,9 @@ int _tmain(int argc, _TCHAR* argv[])
 			emu_name = argv[2];
 			cab_file = argv[3];
 			app_name = argv[4];
-			log_port = argv[5];
+			//log_port = argv[5];
+			if (strcmp(T2A(argv[5]), "1") == 0)
+				use_re_runtime = true;
 			deploy_type = DEPLOY_EMUCAB;
 		}
 
@@ -815,7 +832,9 @@ int _tmain(int argc, _TCHAR* argv[])
         else {
             cab_file = argv[2];
             app_name = argv[3];
-            log_port = argv[4];
+            //log_port = argv[4];
+			if (strcmp(T2A(argv[4]), "1") == 0)
+				use_re_runtime = true;
             deploy_type = DEPLOY_DEVCAB;
         }
 	} else if (argc == 4) { // log
@@ -828,13 +847,15 @@ int _tmain(int argc, _TCHAR* argv[])
         else if (strcmp(T2A(argv[1]), "wk-dev") == 0)  {
             deploy_type = DEPLOY_DEV_WEBKIT;
             src_path = argv[2];
-            app_name = argv[3];            
+            app_name = argv[3];
         }
 	}
 	else {
 		usage();
 		return EXIT_FAILURE;
 	}
+	if ((!use_re_runtime) && app_exe)
+		use_re_runtime = str_ends_with(app_exe, L".lnk");
 
 	TCHAR app_dir[MAX_PATH];
 	_tcscpy(app_dir, TEXT("\\Program Files\\"));
@@ -871,7 +892,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
 				hFind = CeFindFirstFile(app_dir, &findData);
 				if (INVALID_HANDLE_VALUE == hFind) {
-					_tprintf( TEXT("Application directory on device was no found\n"));
+					_tprintf( TEXT("Application directory on device was not found\n"));
 					
 					new_copy = 1;
 
@@ -895,7 +916,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
 				hFind = CeFindFirstFile(remote_bundle_path, &findData);
 				if (INVALID_HANDLE_VALUE == hFind) {
-					_tprintf( TEXT("Bundle directory on device was no found\n"));
+					_tprintf( TEXT("Bundle directory on device was not found\n"));
 	
 					if (!CeCreateDirectory(remote_bundle_path, NULL)) {
 						printf ("Failed to create bundle directory\n");
@@ -904,7 +925,7 @@ int _tmain(int argc, _TCHAR* argv[])
 				}
 				FindClose( hFind);
 
-				int retval = copyExecutable (app_exe, app_dir);
+				int retval = copyExecutable (app_exe, app_dir, use_re_runtime);
 				if (retval != EXIT_SUCCESS) {
 					printf ("Failed to copy application executable\n");
 					if (retval == 32) {
@@ -924,15 +945,23 @@ int _tmain(int argc, _TCHAR* argv[])
 				emuBringToFront(emu_name);
 
 				_tprintf( TEXT("Starting application..."));
-				_tcscpy(params_buf, TEXT("\\Program Files\\"));
-				_tcscat(params_buf, app_name);
-				_tcscat(params_buf, _T("\\"));
-				_tcscat(params_buf, app_name);
-				_tcscat(params_buf, _T(".exe"));
-
-				TCHAR params[128];
-				_tcscpy(params, _T("-log="));
-				_tcscat(params, log_port);
+				TCHAR params[MAX_PATH];
+				params[0] = 0;
+				if (use_re_runtime) {
+					_tcscpy(params_buf, RE2_RUNTIME);
+					_tcscpy(params, _T("-approot='\\Program Files\\"));
+					_tcscat(params, app_name);
+					_tcscat(params, _T("'"));
+				} else {
+					_tcscpy(params_buf, TEXT("\\Program Files\\"));
+					_tcscat(params_buf, app_name);
+					_tcscat(params_buf, _T("\\"));
+					_tcscat(params_buf, app_name);
+					_tcscat(params_buf, _T(".exe"));
+				}
+				//_tcscpy(params, _T("-log="));
+				//_tcscat(params, log_port);
+				_tprintf( TEXT("%s %s\n"), params_buf, params);
 
 				if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 					_tprintf( TEXT("FAILED\n"));
@@ -1007,15 +1036,23 @@ int _tmain(int argc, _TCHAR* argv[])
 			emuBringToFront(emu_name);
 
 			_tprintf( TEXT("Starting application..."));
-			_tcscpy(params_buf, TEXT("\\Program Files\\"));
-			_tcscat(params_buf, app_name);
-			_tcscat(params_buf, _T("\\"));
-			_tcscat(params_buf, app_name);
-			_tcscat(params_buf, _T(".exe"));
-
-			TCHAR params[128];
-			_tcscpy(params, _T("-log="));
-			_tcscat(params, log_port);
+			TCHAR params[MAX_PATH];
+			params[0] = 0;
+			if (use_re_runtime) {
+				_tcscpy(params_buf, RE2_RUNTIME);
+				_tcscpy(params, _T("-approot='\\Program Files\\"));
+				_tcscat(params, app_name);
+				_tcscat(params, _T("'"));
+			} else {
+				_tcscpy(params_buf, TEXT("\\Program Files\\"));
+				_tcscat(params_buf, app_name);
+				_tcscat(params_buf, _T("\\"));
+				_tcscat(params_buf, app_name);
+				_tcscat(params_buf, _T(".exe"));
+			}
+			//_tcscat(params, _T("-log="));
+			//_tcscat(params, log_port);
+			_tprintf( TEXT("%s %s\n"), params_buf, params);
 
 			if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));
@@ -1050,7 +1087,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
 		hFind = CeFindFirstFile(app_dir, &findData);
 		if (INVALID_HANDLE_VALUE == hFind) {
-			_tprintf( TEXT("Application directory on device was no found\n"));
+			_tprintf( TEXT("Application directory on device was not found\n"));
 					
 			new_copy = 1;
 
@@ -1074,7 +1111,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
 		hFind = CeFindFirstFile(remote_bundle_path, &findData);
 		if (INVALID_HANDLE_VALUE == hFind) {
-			_tprintf( TEXT("Bundle directory on device was no found\n"));
+			_tprintf( TEXT("Bundle directory on device was not found\n"));
 	
 			if (!CeCreateDirectory(remote_bundle_path, NULL)) {
 				printf ("Failed to create bundle directory\n");
@@ -1083,8 +1120,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		}
 		FindClose( hFind);
 
-		
-		int retval = copyExecutable (app_exe, app_dir);
+		int retval = copyExecutable (app_exe, app_dir, use_re_runtime);
 		if (retval != EXIT_SUCCESS) {
 			printf ("Failed to copy application executable\n");
 			if (retval == 32) {
@@ -1104,16 +1140,23 @@ int _tmain(int argc, _TCHAR* argv[])
 		Sleep(2 * 1000);
 
 		_tprintf( TEXT("Starting application..."));
-		_tcscpy(params_buf, TEXT("\\Program Files\\"));
-		_tcscat(params_buf, app_name);
-		_tcscat(params_buf, _T("\\"));
-		_tcscat(params_buf, app_name);
-		_tcscat(params_buf, _T(".exe"));
-		_tprintf( TEXT("%s\n"), params_buf);
-
-		TCHAR params[128];
-		_tcscpy(params, _T("-log="));
-		_tcscat(params, log_port);
+		TCHAR params[MAX_PATH];
+		params[0] = 0;
+		if (use_re_runtime) {
+			_tcscpy(params_buf, RE2_RUNTIME);
+			_tcscpy(params, _T("-approot='\\Program Files\\"));
+			_tcscat(params, app_name);
+			_tcscat(params, _T("'"));
+		} else {
+			_tcscpy(params_buf, TEXT("\\Program Files\\"));
+			_tcscat(params_buf, app_name);
+			_tcscat(params_buf, _T("\\"));
+			_tcscat(params_buf, app_name);
+			_tcscat(params_buf, _T(".exe"));
+		}
+		//_tcscat(params, _T("-log="));
+		//_tcscat(params, log_port);
+		_tprintf( TEXT("%s %s\n"), params_buf, params);
 
 		if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 			_tprintf( TEXT("FAILED\n"));
@@ -1183,15 +1226,23 @@ int _tmain(int argc, _TCHAR* argv[])
 			connectWMDC();
 
 			_tprintf( TEXT("Starting application..."));
-			_tcscpy(params_buf, TEXT("\\Program Files\\"));
-			_tcscat(params_buf, app_name);
-			_tcscat(params_buf, _T("\\"));
-			_tcscat(params_buf, app_name);
-			_tcscat(params_buf, _T(".exe"));
-
-            TCHAR params[128];
-            _tcscpy(params, _T("-log="));
-			_tcscat(params, log_port);
+			TCHAR params[MAX_PATH];
+			params[0] = 0;
+			if (use_re_runtime) {
+				_tcscpy(params_buf, RE2_RUNTIME);
+				_tcscpy(params, _T("-approot='\\Program Files\\"));
+				_tcscat(params, app_name);
+				_tcscat(params, _T("'"));
+			} else {
+				_tcscpy(params_buf, TEXT("\\Program Files\\"));
+				_tcscat(params_buf, app_name);
+				_tcscat(params_buf, _T("\\"));
+				_tcscat(params_buf, app_name);
+				_tcscat(params_buf, _T(".exe"));
+			}
+			//_tcscat(params, _T("-log="));
+			//_tcscat(params, log_port);
+			_tprintf( TEXT("%s %s\n"), params_buf, params);
 
 			if(!wceRunProcess (T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));
@@ -1224,7 +1275,7 @@ int _tmain(int argc, _TCHAR* argv[])
 
         hFind = CeFindFirstFile(app_dir, &findData);
         if (INVALID_HANDLE_VALUE == hFind) {
-            _tprintf( TEXT("Application directory on device was no found\n"));
+            _tprintf( TEXT("Application directory on device was not found\n"));
 
             new_copy = 1;
 
@@ -1284,7 +1335,7 @@ int _tmain(int argc, _TCHAR* argv[])
             } else {
                 hFind = CeFindFirstFile(app_dir, &findData);
                 if (INVALID_HANDLE_VALUE == hFind) {
-                    _tprintf( TEXT("Application directory on device was no found\n"));
+                    _tprintf( TEXT("Application directory on device was not found\n"));
 
                     new_copy = 1;