modify:match xengine v7.18 version

fixed:linux build error fixed:tab switch show
libxengine · Aug 5, 2021 · 5783bdc · 5783bdc
1 parent bfa5a5e
commit 5783bdc
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 2 deletions.
diff --git a/XEngine_Source/AuthorizeModule_Configure/pch.h b/XEngine_Source/AuthorizeModule_Configure/pch.h
@@ -14,7 +14,10 @@
 #endif
 
 #endif //PCH_H
+#include <stdio.h>
 #include <string.h>
+#include <time.h>
+#include <errno.h>
 #include <XEngine_Include/XEngine_CommHdr.h>
 #include <XEngine_Include/XEngine_Types.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>

diff --git a/XEngine_Source/AuthorizeModule_Protocol/pch.h b/XEngine_Source/AuthorizeModule_Protocol/pch.h
@@ -15,6 +15,7 @@
 
 #endif //PCH_H
 #include <string.h>
+#include <errno.h>
 #include <XEngine_Include/XEngine_CommHdr.h>
 #include <XEngine_Include/XEngine_Types.h>
 #include <XEngine_Include/XEngine_ProtocolHdr.h>

diff --git a/...ine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Task/Authorize_TaskEvent.cpp b/...ine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Task/Authorize_TaskEvent.cpp
@@ -21,15 +21,15 @@ 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);
 			}
 			else
 			{
 				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
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngine_AuthorizeAppDlg.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngine_AuthorizeAppDlg.cpp
@@ -256,11 +256,13 @@ void CXEngineAuthorizeAppDlg::OnTcnSelchangeTab1(NMHDR* pNMHDR, LRESULT* pResult
 		m_DlgUser.ShowWindow(FALSE);
 		m_DlgSerial.ShowWindow(TRUE);
 		m_DlgLocal.ShowWindow(FALSE);
+		break;
 	case 3:
 		m_DlgConfig.ShowWindow(FALSE);
 		m_DlgUser.ShowWindow(FALSE);
 		m_DlgSerial.ShowWindow(FALSE);
 		m_DlgLocal.ShowWindow(TRUE);
+		break;
 	default:
 		break;
 	}

diff --git a/XEngine_Source/XEngine_AuthComponents/AuthComponents_SQLPacket/pch.h b/XEngine_Source/XEngine_AuthComponents/AuthComponents_SQLPacket/pch.h
@@ -16,6 +16,7 @@
 #endif //PCH_H
 #include <string.h>
 #include <list>
+#include <string>
 using namespace std;
 #include <XEngine_Include/XEngine_CommHdr.h>
 #include <XEngine_Include/XEngine_Types.h>
@@ -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
@@ -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")