pcacc 5 лет назад
Родитель
Сommit
f6cdf9228d
4 измененных файлов с 1 добавлено и 16 удалено
  1. 1 3
      RVCComm/ClientComm.cpp
  2. 0 4
      spshell/app.cpp
  3. 0 3
      spshell/log.cpp
  4. 0 6
      spshell/spshell.cpp

+ 1 - 3
RVCComm/ClientComm.cpp

@@ -178,7 +178,7 @@ WaitRetPkg:
 		return false;
 	}
 
-	auto pkg = ReceivePackage(1000);
+	auto pkg = ReceivePackage(10);
 	if (pkg == NULL)
 	{		
 		if (m_eState == State_Connecting)
@@ -756,9 +756,7 @@ CSmartPointer<IPackage> CClientComm::ReceivePackage(int nWaitSecond)
 	::InterlockedExchange(&m_nSyncWaitResult, 1);
 
 	if (m_RecvPackages.size() == 0)
-	{
 		dwWaitResult = WaitForSingleObject(m_hRecvEvent, nWaitSecond * 1000);
-	}
 	
 	if (dwWaitResult == WAIT_OBJECT_0 && (m_eState == State_OK || m_eState == State_Connecting))
 	{

+ 0 - 4
spshell/app.cpp

@@ -13,7 +13,6 @@
 #include "sp_svc.h"
 #include "sp_dbg_export.h"
 #include "sp_var.h"
-#include "sp_mod.h"
 #include "sp_def.h"
 #include "sp_env.h"
 #include "sp_pst.h"
@@ -113,10 +112,7 @@ static int kickoff_startlist()
 	}
 	return Error_Resource;
 }
-
-#include "shm_mem.h"
 #include "sp_runTask.h"
-
 int  RenameLightPacks(const char *pszAdPath)
 {
 	int nRet = 0;

+ 0 - 3
spshell/log.cpp

@@ -1,13 +1,10 @@
 #include "precompile.h"
 #include "SpBase.h"
-
-#include "log.h"
 #include "app.h"
 
 #include "sp_log.h"
 #include "sp_dbg_export.h"
 #include "sp_svc.h"
-#include "sp_iom.h"
 #include "sp_cfg.h"
 #include "sp_env.h"
 

+ 0 - 6
spshell/spshell.cpp

@@ -1,7 +1,6 @@
 #include "precompile.h"
 #include "app.h"
 #include "osutil.h"
-#include "sp_def.h"
 #include "sp_dbg_export.h"
 #ifdef _WIN32
 #include <DbgHelp.h>
@@ -14,22 +13,17 @@
 #include "fileutil.h"
 #include "iniutil.h"
 #include "SimpleString.h"
-#include "md5file.h"
 
 #ifdef _WIN32
 #include <io.h>
 #endif //_WIN32
 
-#include <map> 
 #include <iterator>
-#include <fstream>
-
 #include <locale.h>
 #include <winpr/library.h>
 #include <winpr/environment.h>
 #include <winpr/registry.h>
 #include <winpr/sysinfo.h>
-
 using namespace std;
 
 //let CMake do it.