#IQRV #comment 框架跨平台点的改造

Framework/spbase/CMakeLists.txt

@@ -55,6 +55,7 @@ if(WIN32)
         Version WinTrust Crypt32 # for CodeSignVerify
         DbgHelp #for SpBase.cpp
         GdiPlus #for GUI
+        dbghelp
         )
  else()
     list(APPEND ${MODULE_PREFIX}_LIBS winpr)

Framework/spbase/SpBase.cpp

@@ -28,8 +28,6 @@
 
 #ifdef RVC_OS_WIN
 #include "sp_checkEntity.h"
-
-#pragma comment(lib, "dbghelp.lib")
 #include <DbgHelp.h>
 #else
 #include <exception>

Framework/spbase/SpEntity.cpp

@@ -2331,7 +2331,7 @@ ErrorCodeEnum SpEntity::GetEntityLastError(const char* pszEntityName, CEntityLas
 	if (strlen(pszEntityName) == 0) {
 
 		errInfo.eSysCode = (ErrorCodeEnum)m_ent->last_err.sys_code;
-        errInfo.dwUserCode = (DWORD)m_ent->last_err.sys_code;
+        errInfo.dwUserCode = (DWORD)m_ent->last_err.usr_code;
 		errInfo.strErrMsg = (const char*)m_ent->last_err.msg;
 
 	} else {

Framework/spbase/SpSecureClient.cpp

@@ -364,6 +364,7 @@ bool SpSecureClient::setConnectInfo(const ENTITY_CONNECT_INFO *connectInfo)
 	return entityConnect->setEntityInfo(connectInfo);
 }
 
+//TODO: is still useing now?  [Gifur@202572]
 // 使用集中配置项连接
 bool SpSecureClient::ConnectFromCentralSetting()
 {

Framework/spbase/sp_cfg.cpp

@@ -588,7 +588,7 @@ SPBASE_API int sp_cfg_getVer(char *ver)
 
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("read active.txt, version[%s]", s_terminalVer.GetData());
 	}
-	
+	//TODO: CrossPlaform  [Gifur@202572]
 #ifdef RVC_OS_LINUX
 	sprintf(ver, "%s", s_terminalVer.GetData());
 #else
@@ -729,6 +729,7 @@ int sp_tryReadFromCacheConfig(int cfgType, const char* section, const char* key,
 		return ErrorCodeEnum::Error_NoDefine;
 	else
 	{
+		//TODO: CrossPlaform  [Gifur@202572]
 #ifdef RVC_OS_LINUX
 		sprintf(dst, "%s", curSection[key].c_str());
 #else
@@ -779,6 +780,7 @@ int sp_tryReadFromCenterSetting(const char* section, const char* key, char *dst,
 		return ErrorCodeEnum::Error_NoDefine;
 	else
 	{
+		//TODO: CrossPlaform  [Gifur@202572]
 #ifdef RVC_OS_LINUX
 		sprintf(dst, "%s", curSection[key].c_str());
 #else

Framework/spshell/app.cpp

@@ -571,6 +571,7 @@ int app_init(const sp_cfg_start_args_t* args, std::function<void(const char* msg
 	}
 
 #ifdef RVC_OS_WIN
+	//TODO: 如果是SLV相关的内容，是否可以移除  [Gifur@202572]
 	rc = sp_sps_create(&g_app.sps);
 	if (rc != 0) {
 		/*slv内容，不作为关键依赖项*/
@@ -676,6 +677,7 @@ int app_term()
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("terminate all entity ok!");
 	}
 
+	//TODO: 如果是SLV的内容，是否可以移除？  [Gifur@202572]
 #ifdef RVC_OS_WIN
 	if (g_app.sps)
 	{

Framework/spshell/spshell.cpp

@@ -24,7 +24,6 @@
 
 #ifdef RVC_OS_WIN
 #include <io.h>
-#pragma comment(lib, "dbghelp.lib")
 #else
 #include <unistd.h>
 #include <sys/syscall.h>
@@ -369,37 +368,6 @@ const char *GetMachineType()
 	return env->cfg->root_ini->machine_type;
 }
 
-
-
-#ifdef RVC_OS_WIN
-
-const char *GetCenterSettingNameBySite(const char *pszSite)
-{
-	///*TODO(80374374@3/23/2023): CenterSettings */
-#if defined(_MSC_VER)
-	return  "CenterSetting.ini";
-#else
-	if (pszSite == NULL || strlen(pszSite) == 0)
-		return "CenterSetting.ini";
-
-	if ((stricmp(pszSite, "CMB.LIB") == 0)
-		|| (stricmp(pszSite, "CMB.SSB") == 0)) {
-		return  "CenterSetting.LAN.ini";
-	} else if ((stricmp(pszSite, "CMB.LSS") == 0)
-		|| (stricmp(pszSite, "CMB.FLB") == 0)
-		|| (stricmp(pszSite, "CMB.OSB") == 0)
-		|| (stricmp(pszSite, "CMB.SMM") == 0)) {
-		return   "CenterSetting.DMZ.ini";
-	} else {
-		return  "CenterSetting.DMZ.ini";
-	}
-#endif //_MSC_VER
-}
-
-
-
-#endif //RVC_OS_WIN
-
 static bool SpTerminateProcess(HANDLE hProc, DWORD dwProcID)
 {
 	if (!TerminateProcess(hProc, -1))