From 2e7d5f781f17cf23b7509222c3e9bfb14ab98ae1 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 1 Aug 2024 17:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=97=A5=E5=BF=97=E5=BA=93=E7=BC=96=E8=AF=91=E4=B8=8D?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/fwupgrade/main.cpp | 2 +- app/scanner2/main.cpp | 2 +- app/upgrade/main.cpp | 25 +++++++++++++++++++++++++ build2/qt/HGUpgrade/HGUpgrade.pro | 3 +++ modules/base/dllmain.cpp | 4 ++-- modules/imgfmt/dllmain.cpp | 4 ++-- modules/imgproc/dllmain.cpp | 4 ++-- modules/twainui/dllmain.cpp | 18 +++++++++--------- modules/version/dllmain.cpp | 4 ++-- sdk/scannerlib/dllmain.cpp | 4 ++-- sdk/webservice/main.cpp | 6 +++--- 11 files changed, 52 insertions(+), 24 deletions(-) diff --git a/app/fwupgrade/main.cpp b/app/fwupgrade/main.cpp index 8a611610..f9a3c1a7 100644 --- a/app/fwupgrade/main.cpp +++ b/app/fwupgrade/main.cpp @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - g_hLog = EnableLog(NULL, appName, "app"); + g_hLog = EnableLog(nullptr, appName, "app"); HGChar cfgPath[256]= {0}; GetConfigPath(cfgPath, 256); diff --git a/app/scanner2/main.cpp b/app/scanner2/main.cpp index fb76c4dd..b74807c4 100644 --- a/app/scanner2/main.cpp +++ b/app/scanner2/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); lang_initialize(nullptr); QString appLang = getCfgValue("global", "language", QString("chinese")); diff --git a/app/upgrade/main.cpp b/app/upgrade/main.cpp index 6aae11fa..98c7f66d 100644 --- a/app/upgrade/main.cpp +++ b/app/upgrade/main.cpp @@ -7,9 +7,32 @@ #include #include #include "version/HGVersion.h" +#include "log/log.h" + +HLOG g_hLog = nullptr; + +#if defined(OEM_HANWANG) +const char* oem = "HanvonScan"; +#elif defined(OEM_LISICHENG) +const char* oem = "LanxumScan"; +#elif defined(OEM_CANGTIAN) +const char* oem = "CumtennScan"; +#elif defined(OEM_ZHONGJING) +const char* oem = "MicrotekScan"; +#elif defined(OEM_ZIGUANG) +const char* oem = "UniScan"; +#elif defined(OEM_NEUTRAL) +const char* oem = "NeuScan"; +#elif defined(OEM_DELI) +const char* oem = "DeliScan"; +#else +const char* oem = "HuaGoScan"; +#endif int main(int argc, char *argv[]) { + g_hLog = EnableLog(nullptr, oem, "app"); + std::string type; std::string appName; std::string oemName; @@ -116,5 +139,7 @@ int main(int argc, char *argv[]) } } + DisableLog(g_hLog); + g_hLog = nullptr; return 0; } diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro index ac639f9d..d88ed23f 100644 --- a/build2/qt/HGUpgrade/HGUpgrade.pro +++ b/build2/qt/HGUpgrade/HGUpgrade.pro @@ -53,6 +53,7 @@ win32 { LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 -ladvapi32 LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}Version + LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lcommonlog } unix { @@ -94,9 +95,11 @@ unix { LIBS += -lpthread -ldl LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}Version + LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -lcommonlog } INCLUDEPATH += $$PWD/../../../modules +INCLUDEPATH += $$PWD/../../../../sdk/include DESTDIR = $$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} UI_DIR = $$PWD/../../temp/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE}/$${TARGET} diff --git a/modules/base/dllmain.cpp b/modules/base/dllmain.cpp index d986f115..4941376e 100644 --- a/modules/base/dllmain.cpp +++ b/modules/base/dllmain.cpp @@ -30,7 +30,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser { case DLL_PROCESS_ATTACH: { - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } break; case DLL_THREAD_ATTACH: @@ -55,7 +55,7 @@ void __attribute__((destructor)) global_unload(void); void global_load(void) { - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } void global_unload(void) diff --git a/modules/imgfmt/dllmain.cpp b/modules/imgfmt/dllmain.cpp index 467eb841..95cd4e25 100644 --- a/modules/imgfmt/dllmain.cpp +++ b/modules/imgfmt/dllmain.cpp @@ -26,7 +26,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); break; case DLL_THREAD_ATTACH: break; @@ -48,7 +48,7 @@ void __attribute__((destructor)) global_unload(void); void global_load(void) { - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } void global_unload(void) diff --git a/modules/imgproc/dllmain.cpp b/modules/imgproc/dllmain.cpp index 467eb841..95cd4e25 100644 --- a/modules/imgproc/dllmain.cpp +++ b/modules/imgproc/dllmain.cpp @@ -26,7 +26,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); break; case DLL_THREAD_ATTACH: break; @@ -48,7 +48,7 @@ void __attribute__((destructor)) global_unload(void); void global_load(void) { - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } void global_unload(void) diff --git a/modules/twainui/dllmain.cpp b/modules/twainui/dllmain.cpp index 810c34fe..724505f5 100644 --- a/modules/twainui/dllmain.cpp +++ b/modules/twainui/dllmain.cpp @@ -6,20 +6,14 @@ #include "base/HGMsgPump.h" #include #include "lang/app_language.h" -#include "log/log.h" #include "Manager.h" +#include "log/log.h" HLOG g_hLog = nullptr; HGEvent g_event = NULL; HGThread g_hThread = NULL; Manager* g_manager = NULL; -#if defined (HG_CMP_MSC) -#include "qmfcapp.hpp" -#include "qwinwidget.hpp" - -HINSTANCE g_hInst = NULL; - #if defined(OEM_HANWANG) const char* oem = "HanvonScan"; #elif defined(OEM_LISICHENG) @@ -38,12 +32,18 @@ const char* oem = "DeliScan"; const char* oem = "HuaGoScan"; #endif +#if defined (HG_CMP_MSC) +#include "qmfcapp.hpp" +#include "qwinwidget.hpp" + +HINSTANCE g_hInst = NULL; + BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpvReserved*/) { if (dwReason == DLL_PROCESS_ATTACH) { g_hInst = hInstance; - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } else if (dwReason == DLL_PROCESS_DETACH) { @@ -61,7 +61,7 @@ void __attribute__((destructor)) global_unload(void); void global_load(void) { - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } void global_unload(void) diff --git a/modules/version/dllmain.cpp b/modules/version/dllmain.cpp index 467eb841..95cd4e25 100644 --- a/modules/version/dllmain.cpp +++ b/modules/version/dllmain.cpp @@ -26,7 +26,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); break; case DLL_THREAD_ATTACH: break; @@ -48,7 +48,7 @@ void __attribute__((destructor)) global_unload(void); void global_load(void) { - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } void global_unload(void) diff --git a/sdk/scannerlib/dllmain.cpp b/sdk/scannerlib/dllmain.cpp index 467eb841..95cd4e25 100644 --- a/sdk/scannerlib/dllmain.cpp +++ b/sdk/scannerlib/dllmain.cpp @@ -26,7 +26,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); break; case DLL_THREAD_ATTACH: break; @@ -48,7 +48,7 @@ void __attribute__((destructor)) global_unload(void); void global_load(void) { - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); } void global_unload(void) diff --git a/sdk/webservice/main.cpp b/sdk/webservice/main.cpp index 519ede1a..714cd4dc 100644 --- a/sdk/webservice/main.cpp +++ b/sdk/webservice/main.cpp @@ -188,7 +188,7 @@ void WINAPI ServiceMain(DWORD dwNumServicesArgs, LPTSTR* lpServiceArgVectors) int main() { HGBase_RegisterCrashFunc(CrashFunc, NULL); - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); TCHAR serviceName[128]; lstrcpy(serviceName, SERVICE_NAME); @@ -215,7 +215,7 @@ int main() assert(0 == ret); curl_global_init(CURL_GLOBAL_ALL); - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); //HGBase_CreateMsgPump(&msgPumpV1); //HGThread threadV1 = NULL; @@ -252,7 +252,7 @@ int main() HGBase_RegisterCrashFunc(CrashFunc, NULL); curl_global_init(CURL_GLOBAL_ALL); - g_hLog = EnableLog(NULL, oem, "app"); + g_hLog = EnableLog(nullptr, oem, "app"); //HGBase_CreateMsgPump(&msgPumpV1); //HGThread threadV1 = NULL;