Z991239-1017 #comment fea 添加remotecontroller，删除垃圾文件

Module/CMakeLists.txt

@@ -204,12 +204,7 @@ add_subdirectory(mod_counterconnector)
 #add_subdirectory(mod_ResourceWatcher)
 #add_subdirectory(mod_livenessdetection)
 #add_subdirectory(mod_SalesRecorder)
-
-
-
-
-
-
+add_subdirectory(mod_RomoteController)
 
 
 

Module/mod_RomoteController/MyZip.cpp

@@ -1,5 +1,8 @@
 #include "MyZip.h"
 
+
+#if (defined _WIN32 || defined _WIN64)
+
 #include <cstring>
 #include <windows.h>
 #include <winnt.h>
@@ -157,4 +160,15 @@ std::pair<bool, std::string> ZipVector(const std::string &dstFile, const std::ve
 
 }
 
-}
+}
+#else
+std::pair<bool, std::string> ZipDir(const std::string& dstFile, const std::string& srcDir, void* hz = NULL)
+{
+	return std::make_pair(true, "");
+}
+std::pair<bool, std::string> ZipVector(const std::string& dstFile, const std::vector<std::string>& srcArr)
+{
+	return std::make_pair(true, "");
+}
+
+#endif

Module/mod_RomoteController/RemoteController.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<entity name="RemoteController">
-  <class name="RemoteControllerService" overlap="true" exclusive="false">
-    <!--<oneway name="Unregist" overlap="true">
-        <param name="nReason" type="int"/>
-        <param name="nWay" type="int"/>
-    </oneway>-->
-  </class>
-</entity>
-

Module/mod_RomoteController/RemoteControllerCnn.h

@@ -92,8 +92,8 @@ struct RvcViewDbgReq
     int TaskID;					 // 任务号
     char EntityName[32];    // 实体名
     char ViewDate[10];		// 查看对应日期的日志，空表示当天，如"20131218"
-    __int64 StartPos;          // 起始位移，0表示从头开始
-    __int64 MaxRetBytes;   // 最大返回字节数
+    long long StartPos;          // 起始位移，0表示从头开始
+    long long MaxRetBytes;   // 最大返回字节数
 };
 
 //[StructName("ViewDbgA")]
@@ -102,8 +102,8 @@ struct RvcViewDbgRet
     int TaskID;					// 任务号
 	char EntityName[32];	// 实体名
     char ViewDate[10];		// 查看对应日期的日志，空表示当天，如"20131218"
-    __int64 NextPos;			// 下次开始位移，如果为0表示已结束
-	__int64 FileLength;       // 当前日志文件长度
+    long long NextPos;			// 下次开始位移，如果为0表示已结束
+	long long FileLength;       // 当前日志文件长度
     char LogData[0];          // 日志内容(变长字段)
 };
 
@@ -125,10 +125,21 @@ struct RvcOperateDiskReq
 struct RvcOperateDiskJsonRet
 {
 	int TaskID;
-	__int64 jsonLength;
+	long long jsonLength;
 	char jsonData[0];
 };
 
+#if !(defined _WIN32 || defined _WIN64)
+
+#define _TRUNCATE ((size_t)-1)
+int strncpy_s(char* _Destination, size_t _SizeInBytes, char const* _Source, size_t _MaxCount);
+
+int strncpy_s(char* _Destination, char const* _Source, size_t _MaxCount);
+
+#endif
+
+#include "remoteBase.h"
+
 // [StructName("OprDiskA2")]
 class RvcOperateDiskRet2
 {
@@ -139,8 +150,8 @@ public:
 		ZeroMemory(fileName, sizeof(fileName));
 		ZeroMemory(reserved2, sizeof(reserved2));
 	}
-	RvcOperateDiskRet2(const CSimpleStringA &oldName, const unsigned __int64 &oldSize, const unsigned __int64 &oldCreate, const unsigned __int64 &oldModified, 
-		const unsigned __int64 &oldAccess, const unsigned int &oldAttribute, const unsigned int &oldForbidAttributes, const int &oldReserved1, const CSimpleStringA &oldReserved2)
+	RvcOperateDiskRet2(const CSimpleStringA &oldName, const unsigned long long &oldSize, const unsigned long long &oldCreate, const unsigned long long &oldModified, 
+		const unsigned long long &oldAccess, const unsigned int &oldAttribute, const unsigned int &oldForbidAttributes, const int &oldReserved1, const CSimpleStringA &oldReserved2)
 		:fileSize(oldSize), ftCreate(oldCreate), ftModified(oldModified), ftAccess(oldAccess), fileAttribute(oldAttribute), forbidAttributes(oldForbidAttributes), reserved1(oldReserved1)
 	{
 		ZeroMemory(fileName, sizeof(fileName));
@@ -426,16 +437,16 @@ struct RvcUploadEventLogReq
 	unsigned short evtName;              //0x0000:不筛选，0x0001:应用程序，0x0002:安全，0x0004:Setup，0x0008:系统，0x0100:自定义，0x00FF:全部类型（不包括自定义）
 	unsigned short evtLevel;             //0x0000:不筛选，0x0001:错误，0x0002:警告，0x0004:信息，0x0008：审计成功，0x0010:审计失败，0x00FF:全部类型
 	unsigned short duration;             //0x0000:任何时间，0x0001: 近1小时，0x0002:近12小时，0x0003:近1天，0x0004:近7天，0x0005:近30天，0x000F:自定义
-	unsigned __int64 startTime;            //当 duration == 0x000F 时有效，如下两项有效，startTime存储筛选的开始时间，endTime存储筛选的结束时间，具体到秒，需满足endTime >= startTime
-	unsigned __int64 endTime;
+	unsigned long long startTime;            //当 duration == 0x000F 时有效，如下两项有效，startTime存储筛选的开始时间，endTime存储筛选的结束时间，具体到秒，需满足endTime >= startTime
+	unsigned long long endTime;
 	char cusEvtFileName[260];        //当 evtName == 0x0100 时有效，存储 日志名称
 	char evtSrcEventName[260];			//存储事件日志来源，一般应用程序名称，比较常用的应该是“Application Error”，不指定请置为NULL或“”
 	int reversed1;               //保留字段
 	char reversed2[260];
 
 	char UploadFile[128];		// 第一次传入指定日志文件名， 续传时传入上传后保存文件名
-	__int64 StartPos;				// 起始位移，0表示从头开始
-	__int64 MaxRetBytes;		// 最大返回字节数
+	long long StartPos;				// 起始位移，0表示从头开始
+	long long MaxRetBytes;		// 最大返回字节数
 };
 
 //[StructName("EvtLogA")]
@@ -443,9 +454,9 @@ struct RvcUploadEventLogRet
 {
 	int TaskID;						  // 任务号
 	char UploadFile[128];         // 导出后文件名
-	__int64 ZipFileLen;             // 压缩后长度
-	__int64 StartPos;				 // 起始位移，0表示从头开始
-	__int64 NextPos;               // 下次开始位移，如果为0表示已结束
+	long long ZipFileLen;             // 压缩后长度
+	long long StartPos;				 // 起始位移，0表示从头开始
+	long long NextPos;               // 下次开始位移，如果为0表示已结束
 	char LogData[0];				 // 日志内容(变长字段)
 };
 
@@ -459,8 +470,8 @@ struct RvcUploadLogByDateReq
 	 int TaskID;						// 任务号
 	 char ViewDate[10];		// 查看对应日期的日志，空表示当天，如"20131218"
 	 char UploadFile[128];		// 第一次传入指定日志文件名， 续传时传入上传后保存文件名
-	 __int64 StartPos;				// 起始位移，0表示从头开始
-	 __int64 MaxRetBytes;		// 最大返回字节数
+	 long long StartPos;				// 起始位移，0表示从头开始
+	 long long MaxRetBytes;		// 最大返回字节数
 };
 
 //[StructName("ULogBDA")]
@@ -468,9 +479,9 @@ struct RvcUploadLogByDateRet
 {
 	int TaskID;						  // 任务号
 	char UploadFile[128];         // 导出后文件名
-	__int64 ZipFileLen;             // 压缩后长度
-	__int64 StartPos;				 // 起始位移，0表示从头开始
-	__int64 NextPos;               // 下次开始位移，如果为0表示已结束
+	long long ZipFileLen;             // 压缩后长度
+	long long StartPos;				 // 起始位移，0表示从头开始
+	long long NextPos;               // 下次开始位移，如果为0表示已结束
 	char LogData[0];				 // 日志内容(变长字段)
 };
 
@@ -482,8 +493,8 @@ struct RvcUploadLogReq
 {
 	 int TaskID;						// 任务号
 	 char UploadFile[128];		// 第一次传入指定日志文件名， 续传时传入上传后保存文件名
-	 __int64 StartPos;				// 起始位移，0表示从头开始
-	 __int64 MaxRetBytes;		// 最大返回字节数
+	 long long StartPos;				// 起始位移，0表示从头开始
+	 long long MaxRetBytes;		// 最大返回字节数
 };
 
 //[StructName("UpldLogA")]
@@ -491,9 +502,9 @@ struct RvcUploadLogRet
 {
 	int TaskID;						  // 任务号
 	char UploadFile[128];         // 导出后文件名
-	__int64 ZipFileLen;             // 压缩后长度
-	__int64 StartPos;				 // 起始位移，0表示从头开始
-	__int64 NextPos;               // 下次开始位移，如果为0表示已结束
+	long long ZipFileLen;             // 压缩后长度
+	long long StartPos;				 // 起始位移，0表示从头开始
+	long long NextPos;               // 下次开始位移，如果为0表示已结束
 	char LogData[0];				 // 日志内容(变长字段)
 };
 
@@ -507,8 +518,8 @@ struct RvcBatchUploadLogsByDateReq
 	char ViewDate[10];		// 查看对应日期的日志，空表示当天，如"20131218"
 	char UploadFile[1024];		// 批量导出日志名，以;分隔
 	char ZipFileName[128];		 // 压缩文件包名
-	__int64 StartPos;				// 起始位移，0表示从头开始
-	__int64 MaxRetBytes;			// 最大返回字节数
+	long long StartPos;				// 起始位移，0表示从头开始
+	long long MaxRetBytes;			// 最大返回字节数
 };
 
 struct RvcBatchUploadLogsByDateReq2
@@ -517,8 +528,8 @@ struct RvcBatchUploadLogsByDateReq2
 	char ViewDate[10];		// 查看对应日期的日志，空表示当天，如"20131218"
 	char UploadFile[512];		// 批量导出日志名，以;分隔
 	char ZipFileName[128];		 // 压缩文件包名
-	__int64 StartPos;				// 起始位移，0表示从头开始
-	__int64 MaxRetBytes;			// 最大返回字节数
+	long long StartPos;				// 起始位移，0表示从头开始
+	long long MaxRetBytes;			// 最大返回字节数
 };
 
 //[StructName("ULogsBDA")]
@@ -526,9 +537,9 @@ struct RvcBatchUploadLogsByDateRet
 {
 	int TaskID;						  // 任务号
 	char ZipFileName[128];		 // 压缩文件包名
-	__int64 ZipFileLen;             // 压缩后长度
-	__int64 StartPos;				 // 起始位移，0表示从头开始
-	__int64 NextPos;               // 下次开始位移，如果为0表示已结束
+	long long ZipFileLen;             // 压缩后长度
+	long long StartPos;				 // 起始位移，0表示从头开始
+	long long NextPos;               // 下次开始位移，如果为0表示已结束
 	char LogData[0];				// 日志内容(变长字段)
 };
 
@@ -543,8 +554,8 @@ struct RvcBatchUploadLogsReq
 	int TaskID;						// 任务号
 	char UploadFile[1024];		// 批量导出日志名，以;分隔
 	char ZipFileName[128];		 // 压缩文件包名
-	__int64 StartPos;				// 起始位移，0表示从头开始
-	__int64 MaxRetBytes;			// 最大返回字节数
+	long long StartPos;				// 起始位移，0表示从头开始
+	long long MaxRetBytes;			// 最大返回字节数
 };
 
 struct RvcBatchUploadLogsReq2
@@ -552,8 +563,8 @@ struct RvcBatchUploadLogsReq2
 	int TaskID;						// 任务号
 	char UploadFile[512];		// 批量导出日志名，以;分隔
 	char ZipFileName[128];		 // 压缩文件包名
-	__int64 StartPos;				// 起始位移，0表示从头开始
-	__int64 MaxRetBytes;			// 最大返回字节数
+	long long StartPos;				// 起始位移，0表示从头开始
+	long long MaxRetBytes;			// 最大返回字节数
 };
 
 //[StructName("UpdLogsA")]
@@ -561,9 +572,9 @@ struct RvcBatchUploadLogsRet
 {
 	int TaskID;						  // 任务号
 	char ZipFileName[128];		 // 压缩文件包名
-	__int64 ZipFileLen;             // 压缩后长度
-	__int64 StartPos;				 // 起始位移，0表示从头开始
-	__int64 NextPos;               // 下次开始位移，如果为0表示已结束
+	long long ZipFileLen;             // 压缩后长度
+	long long StartPos;				 // 起始位移，0表示从头开始
+	long long NextPos;               // 下次开始位移，如果为0表示已结束
 	char LogData[0];				// 日志内容(变长字段)
 };
 

Module/mod_RomoteController/RemoteControllerFSM.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "RemoteControllerFSM.h"
 
 

Module/mod_RomoteController/RemoteController_client_g.h

@@ -1,56 +0,0 @@
-
-#ifndef __REMOTECONTROLLER_CLIENT_G_H
-#define __REMOTECONTROLLER_CLIENT_G_H
-
-#pragma once
-
-// This code is generated by spgen tool!
-
-#include "RemoteController_def_g.h"
-
-namespace RemoteController {
-class RemoteControllerService_ClientBase : public CClientSessionBase {
-public:
-	RemoteControllerService_ClientBase(CEntityBase *pEntity) : m_pEntityBase(pEntity), m_bSysManaged(false) {}
-
-protected:
-	virtual ~RemoteControllerService_ClientBase() {}
-public:
-
-	ErrorCodeEnum Connect(CSmartPointer<IAsynWaitSp> &spAsyncWait)
-	{
-		CSmartPointer<IEntityFunction> pFunc = m_pEntityBase->GetFunction();
-		ErrorCodeEnum Error = pFunc->ConnectRemoteEntity(this, "RemoteController", "RemoteControllerService", spAsyncWait);
-		if (Error == Error_Succeed) {
-			m_bSysManaged = true;
-		}
-		return Error;
-	}
-	ErrorCodeEnum Connect()
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Connect(spAsyncWait);
-		if (Error == Error_Succeed) {
-			Error = spAsyncWait->WaitAnswer();
-		}
-		return Error;
-	}
-
-
-	bool SafeDelete()
-	{
-		if (!m_bSysManaged) {
-			delete this;
-		}
-		return m_bSysManaged;
-	}
-
-protected:
-	bool m_bSysManaged;
-	CEntityBase *m_pEntityBase;
-};
-
-///////////////////////////
-
-} // namespace RemoteController
-#endif // __REMOTECONTROLLER_CLIENT_G_H

Module/mod_RomoteController/RemoteController_def_g.h

@@ -1,22 +0,0 @@
-#ifndef __REMOTECONTROLLER_DEF_G_H
-#define __REMOTECONTROLLER_DEF_G_H
-
-#pragma once
-
-// This code is generated by spgen tool!
-
-#include "SpHelper.h"
-
-namespace RemoteController {
-//
-// const goes here
-//
-
-
-
-
-///////////////////////////
-
-} // namespace RemoteController
-
-#endif // __REMOTECONTROLLER_DEF_G_H

Module/mod_RomoteController/RemoteController_server_g.h

@@ -1,77 +0,0 @@
-
-#ifndef __REMOTECONTROLLER_SERVER_G_H
-#define __REMOTECONTROLLER_SERVER_G_H
-
-#pragma once
-
-// This code is generated by spgen tool!
-
-#include "RemoteController_def_g.h"
-
-namespace RemoteController {
-class RemoteControllerService_ServerSessionBase : public CServerSessionBase
-{
-public:
-	RemoteControllerService_ServerSessionBase() { }
-
-	virtual ~RemoteControllerService_ServerSessionBase() { }
-
-	virtual bool IsExclusive() { return false; }
-
-	virtual bool IsSessionOverlap() { return true; }
-
-	virtual ErrorCodeEnum GetMessageAttr(DWORD dwMessageID, DWORD dwSignature, bool &bOverlap)
-	{
-		ErrorCodeEnum Error = Error_Succeed;
-		switch (dwMessageID) {
-		default:
-			Error = Error_MethodNotFound;
-			break;
-		}
-		return Error;
-	}
-
-	int CheckMessageSignature(DWORD dwMessageID, DWORD dwSignature)
-	{
-		ErrorCodeEnum Error = Error_Succeed;
-		switch (dwMessageID) {
-		default:
-			Error = Error_MethodNotFound;
-			break;
-		}
-		return Error;
-	}
-
-	virtual void OnRequest(CSmartPointer<ITransactionContext> pTransactionContext)
-	{
-		CAutoBuffer Buf;
-		DWORD dwMessageID;
-		DWORD dwMessageSignature;
-		ErrorCodeEnum Error = pTransactionContext->GetReceiveBuffer(dwMessageID, dwMessageSignature, Buf);
-		if (Error == Error_Succeed) {
-#ifdef DEBUG
-			assert(CheckMessageSignature(dwMessageID, dwMessageSignature) == Error_Succeed);
-#else
-			if (CheckMessageSignature(dwMessageID, dwMessageSignature) != Error_Succeed) {
-				pTransactionContext->SendAnswer(Error_MethodSignatureFailed);
-				return;
-			}
-#endif
-			switch (dwMessageID) {
-				default:
-					assert(0);
-					break;
-			}
-			
-		} else {
-			pTransactionContext->SendAnswer(Error);
-		}
-	}
-
-};
-
-
-///////////////////////////
-
-} // namespace RemoteController
-#endif // __REMOTECONTROLLER_SERVER_G_H

Module/mod_RomoteController/digital_conv.h

@@ -6,7 +6,6 @@
 *********************************************************************/
 
 #pragma once
-#include "stdafx.h"
 #include "string_util.h"
 
 

Module/mod_RomoteController/mod_RemoteController.cpp

@@ -1,24 +1,10 @@
-#include "stdafx.h"
 #include "SpBase.h"
 #include "Event.h"
-
-#include "RemoteController_server_g.h"
-using namespace RemoteController;
-
 #include "RemoteControllerFSM.h"
 
 // Ô¶³Ì¿ØÖÆ 0x504
 class CRemoteControllerEntity;
 
-class CRemoteControllerSession : public RemoteControllerService_ServerSessionBase
-{
-public:
-	CRemoteControllerSession(CRemoteControllerEntity *pEntity) : m_pEntity(pEntity) {}
-	virtual ~CRemoteControllerSession() {}
-
-private:
-	CRemoteControllerEntity *m_pEntity;
-};
 
 //class PinPadClass;
 class CRemoteControllerEntity : public CEntityBase, public ILogListener
@@ -33,13 +19,8 @@ public:
 	virtual void OnStarted()
 	{
 		m_FSM.Init(this);
-
 		// subscribe heartbeat entity event for create remote control channel
 		GetFunction()->SubscribeLog(m_LogSubID, this, Log_Event,  Severity_None, Error_IgnoreAll, EVENT_START_REMOTE_CONTROL, "HeartBeat", true);
-
-		// {TEST}+
-		//m_FSM.PostEventFIFO(new FSMEvent(CRemoteControllerFSM::Event_CreateChannel));		
-		// {TEST}-
 	}	
 
 	virtual void OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartPointer<ITransactionContext> pTransactionContext)
@@ -50,16 +31,11 @@ public:
 		pTransactionContext->SendAnswer(Error_Succeed);
 	}
 		
-	virtual CServerSessionBase *OnNewSession(const char* /*pszRemoteEntityName*/, const char * /*pszClass*/)
-	{
-		return new CRemoteControllerSession(this);
-	}
 
 	virtual void OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 		const DWORD dwSysError,const DWORD dwUserCode,const DWORD dwEntityInstanceID, const WORD wEntityDevelID, 
 		const CAutoArray<DWORD> &Param, const char *pszEntityName, const char *pszModuleName,const char *pszMessage)
 	{
-		//assert(dwUserCode == EVENT_START_REMOTE_CONTROL);
 		Dbg("recv log event: %d", dwUserCode);
 		if (dwUserCode == EVENT_START_REMOTE_CONTROL)
 		{

Module/mod_RomoteController/mod_RomoteController.vcxproj

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="RemoteController.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(FrameworkHeadRoot)\Common\stdafx.h" />
-    <ClInclude Include="base64.h" />
-    <ClInclude Include="Event.h" />
-    <ClInclude Include="MyZip.h" />
-    <ClInclude Include="RemoteControllerCnn.h" />
-    <ClInclude Include="RemoteControllerFSM.h" />
-    <ClInclude Include="RemoteController_client_g.h" />
-    <ClInclude Include="RemoteController_def_g.h" />
-    <ClInclude Include="RemoteController_server_g.h" />
-    <ClInclude Include="XZip.h" />
-    <ClInclude Include="$(ThirdPartyHeadRoot)\CJson\cJson.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(FrameworkHeadRoot)\Common\stdafx.cpp" />
-    <ClCompile Include="base64.cpp" />
-    <ClCompile Include="mod_RemoteController.cpp" />
-    <ClCompile Include="MyZip.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <TreatWChar_tAsBuiltInType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TreatWChar_tAsBuiltInType>
-    </ClCompile>
-    <ClCompile Include="RemoteControllerCnn.cpp" />
-    <ClCompile Include="RemoteControllerFSM.cpp" />
-    <ClCompile Include="$(ThirdPartyHeadRoot)\CJson\cJson.c" />
-    <ClCompile Include="XZip.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8D091091-063E-48B4-9673-FA9CA4A4F3FE}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mod_RomoteController</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\modmake.setting" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_ROMOTECONTROLLER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(FrameworkHeadRoot)\libtoolkit;$(ThirdPartyHeadRoot)\CJson</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(FrameworkLib)\RVCComm.lib;$(FrameworkLib)\SpBase.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_ROMOTECONTROLLER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(FrameworkHeadRoot)\Common;$(FrameworkHeadRoot)\libtoolkit</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(FrameworkLib)\RVCComm.lib;$(FrameworkLib)\SpBase.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

Module/mod_RomoteController/mod_RomoteController.vcxproj.filters

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="RemoteController.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="RemoteController_client_g.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RemoteController_def_g.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RemoteController_server_g.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RemoteControllerFSM.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="RemoteControllerCnn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(FrameworkHeadRoot)\Common\stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="XZip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cJson.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="base64.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="mod_RemoteController.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RemoteControllerFSM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RemoteControllerCnn.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(FrameworkHeadRoot)\Common\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="XZip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cJson.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="base64.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\Version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>