From 4265f653539baeb466878fc5dfa9582c3aecbfd8 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 29 Jul 2022 11:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BDHGversion=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=BA=93=E5=89=8D=E6=9B=BF=E6=8D=A2=E8=BF=9B=E7=A8=8B=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E8=B0=83=E6=95=B4=E7=BC=96=E8=AF=91=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/VersionDll.cpp | 12 ++++++++++++
 build.bat                  | 19 +++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/scanner/VersionDll.cpp b/app/scanner/VersionDll.cpp
index d0357e31..21749b1b 100644
--- a/app/scanner/VersionDll.cpp
+++ b/app/scanner/VersionDll.cpp
@@ -1,6 +1,7 @@
 #include "VersionDll.h"
 #include "base/HGDef.h"
 #include "base/HGInc.h"
+#include "base/HGUtility.h"
 
 VersionDll::VersionDll()
 {
@@ -41,6 +42,16 @@ HGResult VersionDll::Load()
     {
         return HGBASE_ERR_FAIL;
     }
+
+    HGChar oldDir[256];
+    HGBase_GetCurrentDir(oldDir, 256);
+    HGChar moduleName[256];
+    HGBase_GetModuleName(nullptr, moduleName, 256);
+    HGChar newDir[256];
+    HGBase_GetFilePath(moduleName, newDir, 256);
+
+    HGBase_SetCurrentDir(newDir);
+
 #if defined(HG_CMP_MSC)
     #if defined(OEM_HANWANG)
         HGBase_CreateDll("HwVersion.dll", &m_dll);
@@ -59,6 +70,7 @@ HGResult VersionDll::Load()
     #endif
 #endif
 
+    HGBase_SetCurrentDir(oldDir);
 
     if (NULL == m_dll)
     {
diff --git a/build.bat b/build.bat
index af1911a9..6e9d2b6a 100644
--- a/build.bat
+++ b/build.bat
@@ -1,14 +1,13 @@
-set BUILD_CMD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe"
 
 set OEM=%1
 
 if "%OEM%" == "hw" (
-	%BUILD_CMD% ./build/windows/HGSolution.sln /m:6 /p:Configuration=HWRelease /p:Platform=x86
+	MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=HWRelease /p:Platform=x86
 ) else (
 	if "%OEM%" == "lsc" (
-		%BUILD_CMD% ./build/windows/HGSolution.sln /m:6 /p:Configuration=LSCRelease /p:Platform=x86
+		MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=LSCRelease /p:Platform=x86
 	) else (
-		%BUILD_CMD% ./build/windows/HGSolution.sln /m:6 /p:Configuration=Release /p:Platform=x86
+		MSBuild.exe ./build/windows/HGSolution.sln /m:6 /p:Configuration=Release /p:Platform=x86
 	)
 )
 
@@ -23,7 +22,7 @@ if "%OEM%" == "hw" (
 	sed -i "s/HGImgProc/HWImgProc/g" HGScannerTmp.pro
 	sed -i "s/logo.ico/Hanvon_logo1.ico/g" HGScannerTmp.pro
 	qmake -r -tp vc HGScannerTmp.pro
-	%BUILD_CMD% HanvonScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
+	MSBuild.exe HanvonScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
 ) else (
 	if "%OEM%" == "lsc" (
 		sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGScannerTmp.pro
@@ -34,10 +33,10 @@ if "%OEM%" == "hw" (
 		sed -i "s/HGImgProc/LSCImgProc/g" HGScannerTmp.pro
 		sed -i "s/logo.ico/Lanxum_logo.ico/g" HGScannerTmp.pro
 		qmake -r -tp vc HGScannerTmp.pro
-		%BUILD_CMD% LanxumScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
+		MSBuild.exe LanxumScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
 	) else (
 		qmake -r -tp vc HGScannerTmp.pro
-		%BUILD_CMD% HuaGoScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
+		MSBuild.exe HuaGoScan.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
 	)
 )
 del /f /s /q *.h
@@ -61,7 +60,7 @@ if "%OEM%" == "hw" (
 	sed -i "s/HGVersion/HWVersion/g" HGUpgradeTmp.pro
 	sed -i "s/logo.ico/Hanvon_logo1.ico/g" HGUpgradeTmp.pro
 	qmake -r -tp vc HGUpgradeTmp.pro
-	%BUILD_CMD% HWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
+	MSBuild.exe HWUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
 ) else (
 	if "%OEM%" == "lsc" (
 		sed -i "s/OEM_HUAGAO/OEM_LISICHENG/g" HGUpgradeTmp.pro
@@ -70,10 +69,10 @@ if "%OEM%" == "hw" (
         sed -i "s/HGVersion/LSCVersion/g" HGUpgradeTmp.pro
         sed -i "s/logo.ico/Lanxum_logo.ico/g" HGUpgradeTmp.pro
 		qmake -r -tp vc HGUpgradeTmp.pro
-		%BUILD_CMD% LSCUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
+		MSBuild.exe LSCUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
 	) else (
 		qmake -r -tp vc HGUpgradeTmp.pro
-		%BUILD_CMD% HGUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
+		MSBuild.exe HGUpgradeApp.vcxproj /m:6 /p:Configuration=Release /p:Platform=x86
 	)
 )
 del /f /s /q *.h