rhodes 3.0.2 → 3.1.0.beta.1

data/platform/wm/sqlite3/sqlite3.vcproj

@@ -608,7 +608,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Pocket PC 2003 (ARMV4)"
+			Name="SimulatorDebug|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -683,7 +683,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Smartphone 2003 (ARMV4)"
+			Name="SimulatorDebug|Smartphone 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -758,7 +758,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="SimulatorDebug|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -834,7 +834,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Win32"
+			Name="SimulatorDebug|Win32"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -901,7 +901,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Pocket PC 2003 (ARMV4)"
+			Name="SimulatorRelease|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -975,7 +975,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Smartphone 2003 (ARMV4)"
+			Name="SimulatorRelease|Smartphone 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1049,7 +1049,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="SimulatorRelease|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1124,7 +1124,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Win32"
+			Name="SimulatorRelease|Win32"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"

data/platform/wm/syncengine/syncengine.vcproj

@@ -65,6 +65,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -139,6 +140,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -214,6 +216,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -288,6 +291,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -353,6 +357,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -426,6 +431,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -500,6 +506,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -573,6 +580,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -608,7 +616,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Pocket PC 2003 (ARMV4)"
+			Name="SimulatorDebug|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -640,6 +648,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -683,7 +692,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Smartphone 2003 (ARMV4)"
+			Name="SimulatorDebug|Smartphone 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -715,6 +724,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -758,7 +768,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="SimulatorDebug|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -791,6 +801,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -834,7 +845,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorDebug|Win32"
+			Name="SimulatorDebug|Win32"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -866,6 +877,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -901,7 +913,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Pocket PC 2003 (ARMV4)"
+			Name="SimulatorRelease|Pocket PC 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -932,6 +944,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -975,7 +988,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Smartphone 2003 (ARMV4)"
+			Name="SimulatorRelease|Smartphone 2003 (ARMV4)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1006,6 +1019,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1049,7 +1063,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="SimulatorRelease|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1081,6 +1095,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1124,7 +1139,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="EmulatorRelease|Win32"
+			Name="SimulatorRelease|Win32"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -1155,6 +1170,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1222,6 +1238,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1297,6 +1314,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1372,6 +1390,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1446,6 +1465,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1520,6 +1540,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1594,6 +1615,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -1660,15 +1682,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\shared\json\debug.c"
+				RelativePath="..\..\shared\json\json.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\shared\json\debug.h"
+				RelativePath="..\..\shared\json\json_debug.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\shared\json\json.h"
+				RelativePath="..\..\shared\json\json_debug.h"
 				>
 			</File>
 			<File

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

@@ -1,14 +1,42 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "stdafx.h"
 #include "LogServer.h"
 #include <vector>
 
 #define DEFAULT_BUFLEN 1024
 #define DEFAULT_PORT "11000"
-#define DEFAULT_HOST "localhost"
+#define DEFAULT_HOST _T("localhost")
 
-LogServer::LogServer(TCHAR* logFilePath) 
+LogServer::LogServer(TCHAR* logFilePath, TCHAR* log_port) 
 	: m_logFilePath(logFilePath)
 	, m_hLogFile(INVALID_HANDLE_VALUE)
+	, m_logPort(log_port)
+    , m_logHost(DEFAULT_HOST)
 {
 }
 
@@ -23,6 +51,8 @@ LogServer::~LogServer(void)
 //
 bool LogServer::init()
 {
+	USES_CONVERSION;
+
 	addrinfo *result = NULL, hints;
 
 	memset(&hints, 0, sizeof (hints));
@@ -34,7 +64,7 @@ bool LogServer::init()
 	createFile();
 
 	// Resolve the local address and port to be used by the server
-	int iResult = getaddrinfo(DEFAULT_HOST, DEFAULT_PORT, &hints, &result);
+	int iResult = getaddrinfo(T2A(m_logHost), T2A(m_logPort), &hints, &result);
 	
 	if (iResult != 0) 
 	{

data/platform/wm/tools/detool/LogServer.h

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #pragma once
 
 #include <ws2tcpip.h>
@@ -7,9 +33,11 @@ class LogServer
 {
 	SOCKET m_listenSocket;
 	TCHAR* m_logFilePath;
+	TCHAR* m_logPort;
+	TCHAR* m_logHost;
 	HANDLE m_hLogFile;
 public:
-	LogServer(TCHAR* logFilePath);
+	LogServer(TCHAR* logFilePath, TCHAR* log_port);
 	~LogServer(void);
 	//
 	bool init();

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

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 #include "stdafx.h"
 
 #include <rapi.h>
@@ -217,6 +243,45 @@ bool wceConnect (void)
     //_tprintf( TEXT("Success\n"));
 
 	return true;
+
+	/*
+	RAPIINIT riCopy = {sizeof(RAPIINIT), 0, 0};
+    bool fInitialized = false;
+	DWORD dwTimeOut = 5000;
+
+    CeRapiUninit();
+
+    hRapiResult = CeRapiInitEx(&riCopy);
+
+	if (FAILED(hRapiResult)) {
+		return false;
+	}
+
+    DWORD dwRapiInit = 0;
+
+    dwRapiInit = WaitForSingleObject(
+		riCopy.heRapiInit,
+		dwTimeOut);
+
+    if (WAIT_OBJECT_0 == dwRapiInit) {
+        // heRapiInit signaled:
+        // set return error code to return value of RAPI Init function
+        hRapiResult = riCopy.hrRapiInit;  
+    } else if (WAIT_TIMEOUT == dwRapiInit) {
+        // timed out: device is probably not connected
+        // or not responding
+        hRapiResult = HRESULT_FROM_WIN32(ERROR_TIMEOUT);
+    } else {
+        // WaitForSingleObject failed
+        hRapiResult = HRESULT_FROM_WIN32(GetLastError());
+    }
+
+	if (FAILED(hRapiResult)) {
+        CeRapiUninit();
+		return false;
+	}
+	return true;
+	*/
 }
 
 void wceDisconnect(void)
@@ -484,7 +549,7 @@ int copyBundle (TCHAR *parent_dir, TCHAR *file, TCHAR *app_dir)
 {
 	HANDLE           fileHandle;
 	WIN32_FIND_DATAW findData;
-	DWORD			 dwError;
+	//DWORD			 dwError;
 	TCHAR			 new_app_item[MAX_PATH];
 	TCHAR			 host_file[MAX_PATH];
 	HANDLE hFind;
@@ -604,12 +669,12 @@ copyBundleFailure:
 	return EXIT_FAILURE;
 }
 
-void startLogServer( TCHAR * log_file ) 
+void startLogServer( TCHAR * log_file, TCHAR* log_port ) 
 {
 	// Declare and initialize variables
 	WSADATA wsaData;
 	int iResult;
-	LogServer logSrv(log_file);
+	LogServer logSrv(log_file, log_port);
 
 	// Initialize Winsock
 	iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
@@ -633,8 +698,9 @@ int _tmain(int argc, _TCHAR* argv[])
 	TCHAR *bundle_path = NULL;
 	TCHAR *app_exe = NULL;
 	TCHAR *log_file = NULL;
+	TCHAR *log_port = NULL;
 	TCHAR params_buf[MAX_PATH + 16];
-	WIN32_FIND_DATAW findData;
+	//WIN32_FIND_DATAW findData;
 	int new_copy = 0;
 	int deploy_type;
 
@@ -646,28 +712,33 @@ int _tmain(int argc, _TCHAR* argv[])
 			app_name    = argv[3];
 			bundle_path = argv[4];
 			app_exe     = argv[5];
+			log_port    = argv[6];
 			deploy_type = DEPLOY_EMU;
 		}
 		if (strcmp(T2A(argv[1]), "emucab") == 0) {
 			emu_name = argv[2];
 			cab_file = argv[3];
 			app_name = argv[4];
+			log_port = argv[5];
 			deploy_type = DEPLOY_EMUCAB;
 		}
 
 		if (strcmp(T2A(argv[1]), "dev") == 0) {
-			app_name = argv[2];
+			app_name    = argv[2];
 			bundle_path = argv[3];
-			app_exe = argv[4];
+			app_exe     = argv[4];
+			log_port    = argv[5];
 			deploy_type = DEPLOY_DEV;
 		}
-	} else if (argc == 4) { //assuming that need to deploy and start on device
+	} else if (argc == 5) { //assuming that need to deploy and start on device
 		cab_file = argv[2];
 		app_name = argv[3];
+		log_port = argv[4];
 		deploy_type = DEPLOY_DEVCAB;
-	} else if (argc == 3) { // log
+	} else if (argc == 4) { // log
 		if (strcmp(T2A(argv[1]), "log") == 0) {
 			log_file = argv[2];
+			log_port = argv[3];
 			app_name = _T("");
 			deploy_type = DEPLOY_LOG;
 		}
@@ -765,7 +836,12 @@ int _tmain(int argc, _TCHAR* argv[])
 				_tcscat(params_buf, _T("\\"));
 				_tcscat(params_buf, app_name);
 				_tcscat(params_buf, _T(".exe"));
-				if(!wceRunProcess(T2A(params_buf), NULL)) {
+
+				TCHAR params[128];
+				_tcscpy(params, _T("-log="));
+				_tcscat(params, log_port);
+
+				if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 					_tprintf( TEXT("FAILED\n"));
 					goto stop_emu_deploy;
 				}
@@ -778,6 +854,8 @@ int _tmain(int argc, _TCHAR* argv[])
 
 			ExitProcess(EXIT_SUCCESS);
 		}
+
+//		emu "Windows Mobile 6 Professional Emulator" RhodesApplication1 c:/android/runtime-rhostudio.product/RhodesApplication1/bin/RhoBundle "C:/Android/rhodes/platform/wm/bin/Windows Mobile 6 Professional SDK (ARMV4I)/rhodes/Release/RhodesApplication1.exe" 11000
 	}
 	if (deploy_type == DEPLOY_EMUCAB) {
 		if (SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED))) {
@@ -835,7 +913,12 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tcscat(params_buf, _T("\\"));
 			_tcscat(params_buf, app_name);
 			_tcscat(params_buf, _T(".exe"));
-			if(!wceRunProcess(T2A(params_buf), NULL)) {
+
+			TCHAR params[128];
+			_tcscpy(params, _T("-log="));
+			_tcscpy(params, log_port);
+
+			if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));
 				goto stop_emu_deploy;
 			}
@@ -924,8 +1007,11 @@ int _tmain(int argc, _TCHAR* argv[])
 		_tcscat(params_buf, _T(".exe"));
 		_tprintf( TEXT("%s\n"), params_buf);
 
-		
-		if(!wceRunProcess(T2A(params_buf), NULL)) {
+		TCHAR params[128];
+		_tcscpy(params, _T("-log="));
+		_tcscpy(params, log_port);
+
+		if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 			_tprintf( TEXT("FAILED\n"));
 			goto stop_emu_deploy;
 		}
@@ -993,7 +1079,12 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tcscat(params_buf, _T("\\"));
 			_tcscat(params_buf, app_name);
 			_tcscat(params_buf, _T(".exe"));
-			if(!wceRunProcess (T2A(params_buf), NULL)) {
+
+            TCHAR params[128];
+            _tcscpy(params, _T("-log="));
+			_tcscpy(params, log_port);
+
+			if(!wceRunProcess (T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));
 				goto stop_emu_deploy;
 			}
@@ -1003,7 +1094,7 @@ int _tmain(int argc, _TCHAR* argv[])
 	if (deploy_type == DEPLOY_LOG)
 	{
 		if (log_file != NULL) {
-			startLogServer(log_file);
+			startLogServer(log_file, log_port);
 		}
 	}