From eb6125da517c305d90de9d774a073798e62d271e Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Tue, 17 Jan 2023 15:08:39 +0800 Subject: [PATCH] cts --- device/win_usb/win_usb.cpp | 12 ++++++------ sln/hgscanner.sln | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/device/win_usb/win_usb.cpp b/device/win_usb/win_usb.cpp index e6c6e14..f3e4d0e 100644 --- a/device/win_usb/win_usb.cpp +++ b/device/win_usb/win_usb.cpp @@ -17,13 +17,13 @@ #pragma comment(lib, "rpcrt4.lib") #pragma comment(lib, "advapi32.lib") // for Reg... -#if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG) +#if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG) || defined(OEM_CANGTIAN) #include "../wrapper/hg_log.h" #else -#define VLOG_MINI_1(l, f, d) printf(f, d) -#define VLOG_MINI_2(l, f, d1, d2) printf(f, d1, d2) -#define VLOG_MINI_3(l, f, d1, d2, d3) printf(f, d1, d2, d3) -#define VLOG_MINI_4(l, f, d1, d2, d3, d4) printf(f, d1, d2, d3, d4) + #define VLOG_MINI_1(l, f, d) printf(f, d) + #define VLOG_MINI_2(l, f, d1, d2) printf(f, d1, d2) + #define VLOG_MINI_3(l, f, d1, d2, d3) printf(f, d1, d2, d3) + #define VLOG_MINI_4(l, f, d1, d2, d3, d4) printf(f, d1, d2, d3, d4) #endif #include "usbview/enum.h" #include "../../../sdk/include/huagao/brand.h" @@ -47,7 +47,7 @@ void usb_callback::notify(libusb_context* ctx, usb_device* dev, int ev) } std::string u2utf8(const wchar_t* u) { -#if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG) +#if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG)|| defined(OEM_CANGTIAN) return hg_log::u2utf8(u); #else int len = WideCharToMultiByte(CP_UTF8, 0, u, lstrlenW(u), NULL, 0, NULL, NULL); diff --git a/sln/hgscanner.sln b/sln/hgscanner.sln index f328b43..91d5809 100644 --- a/sln/hgscanner.sln +++ b/sln/hgscanner.sln @@ -47,8 +47,8 @@ Global {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.Build.0 = Release|x64 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.ActiveCfg = Release|Win32 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.Build.0 = Release|Win32 - {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.ActiveCfg = Debug|x64 - {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.Build.0 = Debug|x64 + {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.ActiveCfg = Debug|Win32 + {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.Build.0 = Debug|Win32 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.ActiveCfg = Debug|Win32 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.Build.0 = Debug|Win32 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.ActiveCfg = Release|x64