rhodes 2.4.1 → 3.0.0.beta.1

data/platform/wm/tcmalloc/tcmalloc.vcproj

@@ -14,9 +14,6 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="RhodesCE6 (ARMV4I)"
-		/>
 		<Platform
 			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 		/>
@@ -309,157 +306,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|RhodesCE6 (ARMV4I)"
-			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../shared/tcmalloc;../../shared/tcmalloc/windows;../../shared/ruby/wince;../../shared"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions=" /subsystem:windowsce,5.02"
-				OutputFile="$(OutDir)/tcmalloc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|RhodesCE6 (ARMV4I)"
-			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="1"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				ExecutionBucket="7"
-				Optimization="2"
-				AdditionalIncludeDirectories="../../shared/tcmalloc;../../shared/tcmalloc/windows;../../shared/ruby/wince;../../shared"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions=" /subsystem:windowsce,5.02"
-				OutputFile="$(OutDir)/tcmalloc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCCodeSignTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-			<DeploymentTool
-				ForceDirty="-1"
-				RemoteDirectory=""
-				RegisterOutput="0"
-				AdditionalFiles=""
-			/>
-			<DebuggerTool
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"

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

@@ -0,0 +1,150 @@
+#include "stdafx.h"
+#include "LogServer.h"
+#include <vector>
+
+#define DEFAULT_BUFLEN 1024
+#define DEFAULT_PORT "11000"
+#define DEFAULT_HOST "localhost"
+
+LogServer::LogServer(TCHAR* logFilePath) 
+	: m_logFilePath(logFilePath)
+	, m_hLogFile(INVALID_HANDLE_VALUE)
+{
+}
+
+LogServer::~LogServer(void)
+{
+	::CloseHandle(m_hLogFile);
+
+	closesocket(m_listenSocket);
+	m_listenSocket = INVALID_SOCKET;
+}
+
+//
+bool LogServer::init()
+{
+	addrinfo *result = NULL, hints;
+
+	memset(&hints, 0, sizeof (hints));
+	hints.ai_family   = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+	hints.ai_flags    = AI_PASSIVE;
+
+	createFile();
+
+	// Resolve the local address and port to be used by the server
+	int iResult = getaddrinfo(DEFAULT_HOST, DEFAULT_PORT, &hints, &result);
+	
+	if (iResult != 0) 
+	{
+		printf("getaddrinfo failed: %d\n", iResult);
+		return false;
+	}
+
+	// Create a SOCKET for the server to listen for client connections
+	m_listenSocket = socket(result->ai_family, result->ai_socktype, result->ai_protocol);
+
+	if (m_listenSocket == INVALID_SOCKET) {
+		printf("Error at socket(): %ld\n", WSAGetLastError());
+		freeaddrinfo(result);
+		return false;
+	}
+
+	    // Setup the TCP listening socket
+    iResult = bind( m_listenSocket, result->ai_addr, (int)result->ai_addrlen);
+    if (iResult == SOCKET_ERROR) {
+        printf("bind failed with error: %d\n", WSAGetLastError());
+        freeaddrinfo(result);
+        closesocket(m_listenSocket);
+        return false;
+    }
+
+	if ( listen( m_listenSocket, SOMAXCONN ) == SOCKET_ERROR ) {
+		printf( "Listen failed with error: %ld\n", WSAGetLastError() );
+		closesocket(m_listenSocket);
+		return false;
+	}
+
+	return true;
+}
+
+//
+void LogServer::run()
+{
+	char recvbuf[DEFAULT_BUFLEN];
+	int iResult = 0;
+	int recvbuflen = DEFAULT_BUFLEN;
+	SOCKET clientSocket = INVALID_SOCKET;
+	recvbuf[0] = 0;
+
+	// Accept a client socket
+	clientSocket = accept(m_listenSocket, NULL, NULL);
+
+	if (clientSocket == INVALID_SOCKET) 
+	{
+		printf("accept failed: %d\n", WSAGetLastError());
+		closesocket(m_listenSocket);
+		return;
+	}
+
+	// Receive until the peer shuts down the connection
+	do 
+	{
+		iResult = recv(clientSocket, recvbuf, recvbuflen, 0);
+
+		if (iResult > 0)
+		{
+			recvbuf[iResult - 1] = 0;
+			printf("%s\n", recvbuf);
+			writeToFile(recvbuf, iResult);
+		}
+		else if (iResult == 0)
+		{
+			printf("Connection closing...\n");
+		}
+		else 
+		{
+			printf("recv failed: %d\n", WSAGetLastError());
+			closesocket(clientSocket);
+			return;
+		}
+
+	} 
+	while (iResult > 0);
+}
+
+bool LogServer::createFile()
+{
+	m_hLogFile = CreateFile(m_logFilePath, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, 
+		CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+
+	if (INVALID_HANDLE_VALUE == m_hLogFile) {
+		_tprintf( TEXT("Unable to open host file\n"));
+		return false;
+	}
+	
+	return true;
+}
+
+bool LogServer::writeToFile(const char* dataBuf, const int dataLen)
+{
+	static char crlfBuf[] = "\n";
+
+	if (m_hLogFile != INVALID_HANDLE_VALUE)
+	{
+		DWORD dwNumWritten = 0;
+		if (!WriteFile(m_hLogFile, dataBuf, dataLen, &dwNumWritten, NULL)) {
+			_tprintf( TEXT("Error !!! writing log file\n"));
+			return false;
+		}
+
+		if (!WriteFile(m_hLogFile, crlfBuf, sizeof(crlfBuf), &dwNumWritten, NULL)) {
+			_tprintf( TEXT("Error !!! writing log file\n"));
+			return false;
+		}
+
+	}
+
+	return true;
+}

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

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <ws2tcpip.h>
+#include <winsock2.h>
+
+class LogServer
+{
+	SOCKET m_listenSocket;
+	TCHAR* m_logFilePath;
+	HANDLE m_hLogFile;
+public:
+	LogServer(TCHAR* logFilePath);
+	~LogServer(void);
+	//
+	bool init();
+	//
+	void run();
+
+private:
+	bool createFile();
+
+	bool writeToFile(const char*, const int );
+};

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

@@ -4,6 +4,7 @@
 #include <strsafe.h>
 
 #include "detool.h"
+#include "LogServer.h"
 
 #define RHOSETUP_DLL "rhosetup.dll"
 
@@ -418,7 +419,8 @@ enum {
 	DEPLOY_EMUCAB,
 	DEPLOY_DEVCAB,
 	DEPLOY_EMU,
-	DEPLOY_DEV
+	DEPLOY_DEV,
+	DEPLOY_LOG
 };
 
 int copyExecutable (TCHAR *file_name, TCHAR *app_dir)
@@ -436,7 +438,6 @@ int copyExecutable (TCHAR *file_name, TCHAR *app_dir)
 	_tcscat(exe_fullpath, app_name);
 	_tcscat(exe_fullpath, _T(".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"));
@@ -603,12 +604,35 @@ copyBundleFailure:
 	return EXIT_FAILURE;
 }
 
+void startLogServer( TCHAR * log_file ) 
+{
+	// Declare and initialize variables
+	WSADATA wsaData;
+	int iResult;
+	LogServer logSrv(log_file);
+
+	// Initialize Winsock
+	iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
+	if (iResult != 0) {
+		printf("WSAStartup failed: %d\n", iResult);
+		return;
+	}
+	
+	if (logSrv.init())
+	{
+		logSrv.run();
+	}
+
+	WSACleanup();
+}
+
 int _tmain(int argc, _TCHAR* argv[])
 {
 	TCHAR *emu_name = NULL;
 	TCHAR *cab_file = NULL;
 	TCHAR *bundle_path = NULL;
 	TCHAR *app_exe = NULL;
+	TCHAR *log_file = NULL;
 	TCHAR params_buf[MAX_PATH + 16];
 	WIN32_FIND_DATAW findData;
 	int new_copy = 0;
@@ -641,7 +665,14 @@ int _tmain(int argc, _TCHAR* argv[])
 		cab_file = argv[2];
 		app_name = argv[3];
 		deploy_type = DEPLOY_DEVCAB;
-	} else {
+	} else if (argc == 3) { // log
+		if (strcmp(T2A(argv[1]), "log") == 0) {
+			log_file = argv[2];
+			app_name = _T("");
+			deploy_type = DEPLOY_LOG;
+		}
+	}
+	else {
 		usage();
 		return EXIT_FAILURE;
 	}
@@ -744,7 +775,7 @@ int _tmain(int argc, _TCHAR* argv[])
 			}
 	
 			CoUninitialize();
-	
+
 			ExitProcess(EXIT_SUCCESS);
 		}
 	}
@@ -969,5 +1000,12 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tprintf( TEXT("DONE\n"));
 	}
 
+	if (deploy_type == DEPLOY_LOG)
+	{
+		if (log_file != NULL) {
+			startLogServer(log_file);
+		}
+	}
+	
 	return EXIT_SUCCESS;
 }

data/platform/wm/tools/detool/detool.vcproj

@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="rapi.lib"
+				AdditionalDependencies="rapi.lib Ws2_32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -136,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="rapi.lib Ws2_32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -178,6 +179,10 @@
 				RelativePath=".\detool.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\LogServer.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\stdafx.cpp"
 				>
@@ -208,6 +213,10 @@
 				RelativePath=".\detool.h"
 				>
 			</File>
+			<File
+				RelativePath=".\LogServer.h"
+				>
+			</File>
 			<File
 				RelativePath=".\stdafx.h"
 				>