From 5783bdc412bbd9c33ce7e16b4e01e2b68aab12b7 Mon Sep 17 00:00:00 2001 From: qyt <486179@qq.com> Date: Thu, 5 Aug 2021 13:05:29 +0800 Subject: [PATCH] modify:match xengine v7.18 version fixed:linux build error fixed:tab switch show --- .../AuthorizeModule_Configure/pch.h | 3 +++ XEngine_Source/AuthorizeModule_Protocol/pch.h | 1 + .../Authorize_Task/Authorize_TaskEvent.cpp | 4 ++-- .../XEngineAuthorizeApp.aps | Bin 116924 -> 99956 bytes .../XEngine_AuthorizeAppDlg.cpp | 2 ++ .../AuthComponents_SQLPacket/pch.h | 7 +++++++ .../AuthComponents_Session/pch.h | 6 ++++++ 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/XEngine_Source/AuthorizeModule_Configure/pch.h b/XEngine_Source/AuthorizeModule_Configure/pch.h index 58e7f4e..a8a78b3 100644 --- a/XEngine_Source/AuthorizeModule_Configure/pch.h +++ b/XEngine_Source/AuthorizeModule_Configure/pch.h @@ -14,7 +14,10 @@ #endif #endif //PCH_H +#include #include +#include +#include #include #include #include diff --git a/XEngine_Source/AuthorizeModule_Protocol/pch.h b/XEngine_Source/AuthorizeModule_Protocol/pch.h index 97460ff..20b3162 100644 --- a/XEngine_Source/AuthorizeModule_Protocol/pch.h +++ b/XEngine_Source/AuthorizeModule_Protocol/pch.h @@ -15,6 +15,7 @@ #endif //PCH_H #include +#include #include #include #include diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Task/Authorize_TaskEvent.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Task/Authorize_TaskEvent.cpp index f9bb33f..dace259 100644 --- a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Task/Authorize_TaskEvent.cpp +++ b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Task/Authorize_TaskEvent.cpp @@ -21,7 +21,7 @@ void __stdcall XEngine_TaskEvent_Client(LPCSTR lpszUserAddr, LPCSTR lpszUserName _i64tot(nLeftTimer, tszTimeLeft, 10); pClass_This->m_DlgUser.m_ListCtrlOnlineClient.SetItemText(i, 3, tszTimeONLine); - if ((ENUM_HELPCOMPONENTS_AUTHORIZE_SERIAL_TYPE_MINUTE == en_SerialType) || (ENUM_HELPCOMPONENTS_AUTHORIZE_SERIAL_TYPE_TIME == en_SerialType)) + if ((ENUM_HELPCOMPONENTS_AUTHORIZE_SERIAL_TYPE_MINUTE == en_AuthRegSerialType) || (ENUM_HELPCOMPONENTS_AUTHORIZE_SERIAL_TYPE_TIME == en_AuthRegSerialType)) { pClass_This->m_DlgUser.m_ListCtrlOnlineClient.SetItemText(i, 4, tszTimeLeft); } @@ -29,7 +29,7 @@ void __stdcall XEngine_TaskEvent_Client(LPCSTR lpszUserAddr, LPCSTR lpszUserName { pClass_This->m_DlgUser.m_ListCtrlOnlineClient.SetItemText(i, 4, lpszLeftDate); } - pClass_This->m_DlgUser.m_ListCtrlOnlineClient.SetItemText(i, 5, lpszKeyType[en_SerialType]); + pClass_This->m_DlgUser.m_ListCtrlOnlineClient.SetItemText(i, 5, lpszKeyType[en_AuthRegSerialType]); if (nLeftTimer <= 0) { diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps index 8f63d7df2a1e0fc7d4e31d6eb6ea1d1282640ae0..556f5363ca69465d28197e70c38d6a5d1f47034e 100644 GIT binary patch delta 2893 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 #include +#include using namespace std; #include #include @@ -43,6 +44,12 @@ using namespace std; extern BOOL SQLPacket_IsErrorOccur; extern DWORD SQLPacket_dwErrorCode; +#ifdef _UNICODE +typedef std::wstring tstring; +#else +typedef std::string tstring; +#endif + #ifdef _WINDOWS #ifdef _WIN64 #pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib.lib") diff --git a/XEngine_Source/XEngine_AuthComponents/AuthComponents_Session/pch.h b/XEngine_Source/XEngine_AuthComponents/AuthComponents_Session/pch.h index 98763f0..8625f6b 100644 --- a/XEngine_Source/XEngine_AuthComponents/AuthComponents_Session/pch.h +++ b/XEngine_Source/XEngine_AuthComponents/AuthComponents_Session/pch.h @@ -46,6 +46,12 @@ using namespace std; extern BOOL Session_IsErrorOccur; extern DWORD Session_dwErrorCode; +#ifdef _UNICODE +typedef std::wstring tstring; +#else +typedef std::string tstring; +#endif + #ifdef _WINDOWS #ifdef _WIN64 #pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib.lib")