lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

解决国产系统日志库编译不过的问题

This commit is contained in:
yangjiaxuan 2024-08-01 17:31:44 +08:00
parent 572a0ce409
commit 2e7d5f781f
11 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/fwupgrade/main.cpp
View File

@ -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);

2
app/scanner2/main.cpp
View File

@ -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"));

25
app/upgrade/main.cpp
View File

@ -7,9 +7,32 @@
#include <QTranslator>
#include <QMessageBox>
#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;
}

3
build2/qt/HGUpgrade/HGUpgrade.pro
View File

@ -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}

4
modules/base/dllmain.cpp
View File

@ -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)

4
modules/imgfmt/dllmain.cpp
View File

@ -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)

4
modules/imgproc/dllmain.cpp
View File

@ -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)

18
modules/twainui/dllmain.cpp
View File

@ -6,20 +6,14 @@
#include "base/HGMsgPump.h"
#include <QTranslator>
#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)

4
modules/version/dllmain.cpp
View File

@ -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)

4
sdk/scannerlib/dllmain.cpp
View File

@ -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)

6
sdk/webservice/main.cpp
View File

@ -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;