diff --git a/build.bat b/build.bat index 35c90c79..bcffe4ab 100644 --- a/build.bat +++ b/build.bat @@ -103,7 +103,7 @@ if "%OEM%" == "hw" ( cd /d ZGScanner32 %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGScanner.pro ) - MSBuild.exe UniscanScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% + MSBuild.exe UniScan.vcxproj /m:8 /p:Configuration=Release /p:Platform=%ARCH% cd /d ../ ) else ( mkdir HGScanner32 diff --git a/build/windows/HGScannerLib/HGScannerLib.vcxproj b/build/windows/HGScannerLib/HGScannerLib.vcxproj index 7534e639..ceec4997 100644 --- a/build/windows/HGScannerLib/HGScannerLib.vcxproj +++ b/build/windows/HGScannerLib/HGScannerLib.vcxproj @@ -380,7 +380,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x86\Release\true false HGScannerLib.def - ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;%(AdditionalDependencies) + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) @@ -592,7 +592,7 @@ copy $(OutDir)HWScannerLib.dll $(SolutionDir)..\..\..\release\win\x64\Release\true false HGScannerLib.def - ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;%(AdditionalDependencies) + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;%(AdditionalDependencies) /LTCG %(AdditionalOptions) diff --git a/build/windows/HGWebScan/HGWebScan.vcxproj b/build/windows/HGWebScan/HGWebScan.vcxproj index 6cd527e9..d38cc833 100644 --- a/build/windows/HGWebScan/HGWebScan.vcxproj +++ b/build/windows/HGWebScan/HGWebScan.vcxproj @@ -370,7 +370,7 @@ true true true - ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) RequireAdministrator @@ -538,7 +538,7 @@ true true true - ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) RequireAdministrator diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj index 47975577..4b8824f9 100644 --- a/build/windows/HGWebService/HGWebService.vcxproj +++ b/build/windows/HGWebService/HGWebService.vcxproj @@ -391,7 +391,7 @@ true true true - ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../ZGRelease/ZGBase.lib;../ZGRelease/ZGImgFmt.lib;../ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x86/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/libcurl/windows/lib/x86/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) RequireAdministrator @@ -559,7 +559,7 @@ true true true - ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/uniscan/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) + ../x64/ZGRelease/ZGBase.lib;../x64/ZGRelease/ZGImgFmt.lib;../x64/ZGRelease/ZGImgProc.lib;../../../../sdk/lib/win/x64/OEM/unis/sane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/libcurl/windows/lib/x64/libcurl.lib;wldap32.lib;ws2_32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) RequireAdministrator diff --git a/modules/version/HGVersion.h b/modules/version/HGVersion.h index 996c28e2..a1d19ae4 100644 --- a/modules/version/HGVersion.h +++ b/modules/version/HGVersion.h @@ -13,7 +13,7 @@ HG_DECLARE_HANDLE(HGVersionMgr); #define HGVERSION_OEMNAME_LANXUM "Lanxum" #define HGVERSION_OEMNAME_CUMTENN "Cumtenn" #define HGVERSION_OEMNAME_MICROTEK "Microtek" -#define HGVERSION_OEMNAME_UNISCAN "Uniscan" +#define HGVERSION_OEMNAME_UNIS "Unis" #pragma pack(push) #pragma pack(4) diff --git a/modules/version/HGVersionImpl.cpp b/modules/version/HGVersionImpl.cpp index 1ac2572e..ad0519de 100644 --- a/modules/version/HGVersionImpl.cpp +++ b/modules/version/HGVersionImpl.cpp @@ -419,6 +419,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string& regName = "SOFTWARE\\CumtennScan"; else if (oemName == HGVERSION_OEMNAME_MICROTEK) regName = "SOFTWARE\\MicrotekScan"; + else if (oemName == HGVERSION_OEMNAME_UNIS) + regName = "SOFTWARE\\UniScan"; else regName = "SOFTWARE\\HuaGoScan"; @@ -448,6 +450,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string& appName = "com.cumtennchina.cumtennscan"; else if (oemName == HGVERSION_OEMNAME_MICROTEK) appName = "com.microtekchina.microtekscan"; + else if (oemName == HGVERSION_OEMNAME_UNIS) + appName = "com.unischina.uniscan"; else appName = "com.huagaochina.huagoscan"; } @@ -461,6 +465,8 @@ static std::string GetCurrVersion(const std::string& appName, const std::string& appName = "scanner-driver-cumtenn"; else if (oemName == HGVERSION_OEMNAME_MICROTEK) appName = "scanner-driver-microtek"; + else if (oemName == HGVERSION_OEMNAME_UNIS) + appName = "scanner-driver-unis"; else appName = "scanner-driver-huagao"; }