Merge branch 'ST2' into 00UAT

Module/mod_ResourceWatcher/mod_ResourceWatcher.cpp

@@ -668,9 +668,9 @@ void ResourceWatcherEntity::InstallThirdPartyProgram(SpReqAnsContext<ResourceWat
         result = Error_NotSupport;
     }
 
-    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM) ("用户桌面安装：%s. result:%d.", tmpMsg.GetData(), ctx->Ans.result);
+    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM) ("用户桌面安装：%s. result:%d.", tmpMsg.GetData(), tmpResult);
     LogWarn(Severity_Low, Error_Debug, LOG_RESOURCEWATCHE_INSTALL_THIRDPARTY,
-        CSimpleStringA::Format("用户桌面安装：%s. result:%d.", tmpMsg.GetData(), ctx->Ans.result));
+        CSimpleStringA::Format("用户桌面安装：%s. result:%d.", tmpMsg.GetData(), tmpResult));
 
     ctx->Ans.result = tmpResult;
     ctx->Ans.msg = tmpMsg;
@@ -902,9 +902,9 @@ void ResourceWatcherEntity::InstallSogou(SpReqAnsContext<ResourceWatcherService_
         }
     }
 
-    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM) ("用户桌面重装搜狗：%s. result:%d.", tmpMsg.GetData(), ctx->Ans.result);
+    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM) ("用户桌面重装搜狗：%s. result:%d.", tmpMsg.GetData(), tmpResult);
     LogWarn(Severity_Low, Error_Debug, LOG_RESOURCEWATCHE_INSTALL_THIRDPARTY,
-        CSimpleStringA::Format("用户桌面重装搜狗：%s. result:%d.", tmpMsg.GetData(), ctx->Ans.result));
+        CSimpleStringA::Format("用户桌面重装搜狗：%s. result:%d.", tmpMsg.GetData(), tmpResult));
     ctx->Ans.result = tmpResult;
     ctx->Ans.msg = tmpMsg;
     ctx->Answer(result);
@@ -1322,9 +1322,9 @@ void ResourceWatcherEntity::RestartThirdPartyProgram(SpReqAnsContext<ResourceWat
         tmpMsg = CSimpleStringA::Format("接口调用参数错误。");
     }
 
-    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM) ("用户桌面重启：%s. result:%d.", tmpMsg.GetData(), ctx->Ans.result);
+    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM) ("用户桌面重启：%s. result:%d.", tmpMsg.GetData(), tmpResult);
     LogWarn(Severity_Low, Error_Debug, LOG_RESOURCEWATCHE_RESTART_THIRDPARTYPROGRAM,
-        CSimpleStringA::Format("用户桌面重启：%s. result:%d.", tmpMsg.GetData(), ctx->Ans.result));
+        CSimpleStringA::Format("用户桌面重启：%s. result:%d.", tmpMsg.GetData(), tmpResult));
     ctx->Ans.result = tmpResult;
     ctx->Ans.msg = tmpMsg;