ソースを参照

Z991239-5269 #comment 暂时去除判断VS2019的逻辑,影响日志库

80374374 1 年間 前
コミット
e4fd53204f
1 ファイル変更19 行追加19 行削除
  1. 19 19
      Module/include/DevFSMCommBase.hpp

+ 19 - 19
Module/include/DevFSMCommBase.hpp

@@ -216,25 +216,25 @@ private:
 		GetDllVersionInfo(strFullLibPath, d1, d2, d3, d4);
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("dll version: %d.%d.%d.%d", d1, d2, d3, d4);
 
-		do 
-		{
-			toolkit_lib_t libHandle;
-			int res = toolkit_dlopen(strFullLibPath, &libHandle);
-			if (res != 0) {
-				DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("tmp: toolkit_dlopen[%s] failed with error %s.", strFullLibPath.GetData(), toolkit_dlerror(&libHandle));
-				toolkit_dlclose(&libHandle);
-				return result;
-			}
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tmp: try to get GetDevAdapterVersion pointer address...");
-			if ((res = toolkit_dlsym(&libHandle, "GetDevAdapterVersion", (void**)&pFuncGetDevAdapterVer)) != 0) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("try  to get 'GetDevAdapterVersion' Func address failed with error: %s", toolkit_dlerror(&libHandle));
-				toolkit_dlclose(&libHandle);
-			} else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("get 'GetDevAdapterVersion' Func address  succ, seem it as built with vs2019, skip latter procedure");
-				toolkit_dlclose(&libHandle);
-				return result;
-			}
-		} while (false);
+		//do 
+		//{
+		//	toolkit_lib_t libHandle;
+		//	int res = toolkit_dlopen(strFullLibPath, &libHandle);
+		//	if (res != 0) {
+		//		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("tmp: toolkit_dlopen[%s] failed with error %s.", strFullLibPath.GetData(), toolkit_dlerror(&libHandle));
+		//		toolkit_dlclose(&libHandle);
+		//		return result;
+		//	}
+		//	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tmp: try to get GetDevAdapterVersion pointer address...");
+		//	if ((res = toolkit_dlsym(&libHandle, "GetDevAdapterVersion", (void**)&pFuncGetDevAdapterVer)) != 0) {
+		//		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("try  to get 'GetDevAdapterVersion' Func address failed with error: %s", toolkit_dlerror(&libHandle));
+		//		toolkit_dlclose(&libHandle);
+		//	} else {
+		//		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("get 'GetDevAdapterVersion' Func address  succ, seem it as built with vs2019, skip latter procedure");
+		//		toolkit_dlclose(&libHandle);
+		//		return result;
+		//	}
+		//} while (false);
 
 		CSimpleStringA strTest = strFullLibPath.GetData();
 		CSimpleStringA strSelf(true);