From ecd94407da1e1786e2fe5bd844aacb27155c95f0 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 20 Apr 2023 15:09:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E6=80=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.bat | 23 +++++++++++++++++++++++ build_base.bat | 7 ++++++- build_ds.bat | 6 ++++++ sane/scanner.cpp | 5 +++-- sln/Release/hgsetver.exe | Bin 85504 -> 84992 bytes sln/hgsetver/hgsetver.cpp | 16 +++++++++++++++- 6 files changed, 53 insertions(+), 4 deletions(-) diff --git a/build_all.bat b/build_all.bat index d27089a..49c3708 100644 --- a/build_all.bat +++ b/build_all.bat @@ -9,6 +9,7 @@ set BUILD_LSC=false set BUILD_CTS=false set BUILD_ZJ=false set BUILD_ZG=false +set BUILD_HGNEU=false set BUILD_X86=true set BUILD_X64=true @@ -24,6 +25,8 @@ if "%OEM%"=="hw" ( set BUILD_ZJ=true )else if "%OEM%" == "zg" ( set BUILD_ZG=true +)else if "%OEM%" == "hgneu" ( + set BUILD_HGNEU=true )else if "%OEM%" == "all" ( set BUILD_HG=true set BUILD_HW=true @@ -31,6 +34,7 @@ if "%OEM%"=="hw" ( set BUILD_CTS=true set BUILD_ZJ=true set BUILD_ZG=true + set BUILD_HGNEU=true )else ( set BUILD_HG=true set OEM=hg @@ -98,6 +102,12 @@ if "%BUILD_HG%"=="true" ( if %ERRORLEVEL% neq 0 goto end if "%BUILD_X64%"=="true" call :compile_hg hg x64 ) +if "%BUILD_HGNEU%"=="true" ( + if "%BUILD_X86%"=="true" call :compile_hgneu hgneu x86 + if %ERRORLEVEL% neq 0 goto end + if "%BUILD_X64%"=="true" call :compile_hgneu hgneu x64 + if %ERRORLEVEL% neq 0 goto end +) goto end @@ -117,6 +127,19 @@ REM parameters for all OEM compiling procedure are: oem cpu if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% EXIT /B 0 +:compile_hgneu + call build_base.bat %1 %2 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 100 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 200 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 300 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 400 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% +EXIT /B 0 + :compile_hw call build_base.bat %1 %2 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% diff --git a/build_base.bat b/build_base.bat index e9de426..793c5e8 100644 --- a/build_base.bat +++ b/build_base.bat @@ -1,5 +1,5 @@ @echo off -echo "Parameter 1:hg | lsc| hw | zj | cts" +echo "Parameter 1:hg | lsc| hw | zj | cts | hgneu" echo "Parameter 2:x86 | x64 " set OEM=%1 @@ -42,6 +42,11 @@ if "%OEM%" equ "cts" ( set CL=/DOEM_CANGTIAN /DBACKEND_NAME=ctssane goto oem ) +if "%OEM%" equ "hgneu" ( + set OEM_DIR=huagaoneu + set CL=/DOEM_HUAGAO_NEU /DBACKEND_NAME=hgsane + goto oem +) echo "Parameter 1:oem is fail" exit 1 :oem diff --git a/build_ds.bat b/build_ds.bat index 6084456..4cfa020 100644 --- a/build_ds.bat +++ b/build_ds.bat @@ -50,6 +50,12 @@ if "%OEM%" equ "cts" ( set NAME=cumtenn%NAME% goto oem ) +if "%OEM%" equ "hgneu" ( + set OEM_DIR=huagaoneu + set CL=/DOEM_HUAGAO_NEU /DPRODUCT_ID=%PID% + set NAME=%NAME% + goto oem +) echo "Parameter 1:oem is fail" exit 1 :oem diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 6393e89..bbec3c7 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -347,8 +347,9 @@ namespace callback std::string root(hg_sane_middleware::sane_path()); HMODULE mod = NULL; - root += "twainui.dll"; - mod = LoadLibraryA(root.c_str()); + root += "HGTwainUI.dll"; + + mod = LoadLibraryExA(root.c_str(), NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!mod) { std::wstring info(L"Load '" + local_trans::a2u(root.c_str(), CP_UTF8)); diff --git a/sln/Release/hgsetver.exe b/sln/Release/hgsetver.exe index 1a6847a510fcb7b5b816f96b4d164bd1e9aa3a1c..260f06106837a80a017ccef6d1049239abcb280f 100644 GIT binary patch delta 16062 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 ogK_KA3}`N3eoHXF*4O8%r3Z6Y+*ps2JVfejik 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"-oem"), L"zg") == 0) vendor = OEM_ZIGUANG; + else if (wcsicmp(cmd->parameter(L"-oem"), L"hgneu") == 0) + vendor = OEM_HUAGAO_NEU; + else std::wcout << L" OEM '" << cmd->parameter(L"-oem") << L"' is not supported! set as OEM_NONE.\r\n"; } @@ -148,6 +152,7 @@ static std::wstring oem_str(oem o) GET_ENUM_NAME_W(OEM_CANGTIAN, o); GET_ENUM_NAME_W(OEM_ZHONGJING, o); GET_ENUM_NAME_W(OEM_ZIGUANG, o); + GET_ENUM_NAME_W(OEM_HUAGAO_NEU, o); } static oem from_str(const wchar_t* str) { @@ -158,6 +163,7 @@ static oem from_str(const wchar_t* str) GET_ENUM_VALUE_W(OEM_CANGTIAN, s); GET_ENUM_VALUE_W(OEM_ZHONGJING, s); GET_ENUM_VALUE_W(OEM_ZIGUANG, s); + GET_ENUM_VALUE_W(OEM_HUAGAO_NEU, s); return OEM_NOT; } static int oem_code(oem o) @@ -756,6 +762,8 @@ namespace rc os = L"microtek"; else if (o == OEM_ZIGUANG) os = L"unis"; + else if (o == OEM_HUAGAO_NEU) + os = L"huagaoneu"; while (len > bgn) { bgn += first.length(); @@ -787,6 +795,8 @@ namespace rc os = L"microtek"; else if (o == OEM_ZIGUANG) os = L"unis"; + else if (o == OEM_HUAGAO_NEU) + os = L"huagaoneu"; while (len > bgn) { bgn += first.length(); @@ -1135,6 +1145,8 @@ namespace rc target += L"microtek\\"; else if (o == OEM_ZIGUANG) target += L"unis\\"; + else if (o == OEM_HUAGAO_NEU) + target += L"huagaoneu\\"; else target += L"huagao\\"; @@ -1170,6 +1182,8 @@ namespace rc target = L"microtek"; else if (param->o == OEM_ZIGUANG) target = L"unis"; + else if (param->o == OEM_HUAGAO_NEU) + target = L"huagaoneu"; target += tail; while ((bgn = cont.find(first, bgn)) != std::wstring::npos)