update:depend library

xengine-qyt · xengine-qyt · commit 39869f7aa85f · 2025-05-29T11:20:08.000+08:00
update:match xengine v9.20
diff --git a/XEngine_Source/MQCore_ConfigModule/Config_Define.h b/XEngine_Source/MQCore_ConfigModule/Config_Define.h
@@ -34,7 +34,7 @@ typedef struct
     }st_XMax;
     struct
     {
-        XCHAR tszLOGFile[MAX_PATH];
+        XCHAR tszLOGFile[XPATH_MAX];
         int nMaxSize;
         int nMaxCount;
         int nLogLeave;
@@ -50,10 +50,10 @@ typedef struct
     }st_XSql;
     struct  
     {
-        XCHAR tszPassRegister[MAX_PATH];
-        XCHAR tszPassUNReg[MAX_PATH];
-        XCHAR tszPassLogin[MAX_PATH];
-        XCHAR tszPassLogout[MAX_PATH];
+        XCHAR tszPassRegister[XPATH_MAX];
+        XCHAR tszPassUNReg[XPATH_MAX];
+        XCHAR tszPassLogin[XPATH_MAX];
+        XCHAR tszPassLogout[XPATH_MAX];
         int nTimeout;
     }st_XPass;
     struct  
@@ -71,7 +71,7 @@ typedef struct
 	struct
 	{
 		bool bEnable;
-		XCHAR tszAPIUrl[MAX_PATH];
+		XCHAR tszAPIUrl[XPATH_MAX];
 		XCHAR tszServiceName[128];
 	}st_XReport;
     struct
diff --git a/XEngine_Source/MQCore_DBModule/DBModule_Define.h b/XEngine_Source/MQCore_DBModule/DBModule_Define.h
@@ -39,8 +39,8 @@ typedef struct
 //用户消息
 typedef struct
 {
-	XCHAR tszUserName[MAX_PATH];                                          //用户名
-	XCHAR tszKeyName[MAX_PATH];                                           //绑定的KEY
+	XCHAR tszUserName[XPATH_MAX];                                          //用户名
+	XCHAR tszKeyName[XPATH_MAX];                                           //绑定的KEY
 	XCHAR tszUPTime[64];                                                  //最后更新时间
 	XCHAR tszCreateTime[64];                                              //创建的时间
 	__int64x nKeySerial;                                                  //包序列号
@@ -55,7 +55,7 @@ typedef struct
 //////////////////////////////////////////////////////////////////////////
 //                       导出的回调
 //////////////////////////////////////////////////////////////////////////
-typedef void(CALLBACK* CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_TIMEPUBLISH)(XENGINE_DBTIMERELEASE* pSt_DBInfo, XPVOID lParam);
+typedef void(XCALLBACK* CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_TIMEPUBLISH)(XENGINE_DBTIMERELEASE* pSt_DBInfo, XPVOID lParam);
 //////////////////////////////////////////////////////////////////////////
 //                       导出的函数
 //////////////////////////////////////////////////////////////////////////
diff --git a/XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp b/XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp
@@ -1173,7 +1173,7 @@ bool CDBModule_MQUser::DBModule_MQUser_OwnerTopicUPDate(LPCXSTR lpszSourceTable,
 //////////////////////////////////////////////////////////////////////////
 //                         线程函数
 //////////////////////////////////////////////////////////////////////////
-XHTHREAD CALLBACK CDBModule_MQUser::DBModule_MQUser_TimeThread(XPVOID lParam)
+XHTHREAD XCALLBACK CDBModule_MQUser::DBModule_MQUser_TimeThread(XPVOID lParam)
 {
 	CDBModule_MQUser* pClass_This = (CDBModule_MQUser*)lParam;
 
diff --git a/XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.h b/XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.h
@@ -44,7 +44,7 @@ class CDBModule_MQUser
 	bool DBModule_MQUser_OwnerQuery(XENGINE_DBTOPICOWNER* pSt_DBOwner);
 	bool DBModule_MQUser_OwnerTopicUPDate(LPCXSTR lpszSourceTable, LPCXSTR lpszDestTable);
 protected:
-	static XHTHREAD CALLBACK DBModule_MQUser_TimeThread(XPVOID lParam);
+	static XHTHREAD XCALLBACK DBModule_MQUser_TimeThread(XPVOID lParam);
 private:
 	shared_ptr<std::thread> pSTDThread;
 private:
diff --git a/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBData/MemoryCache_DBData.cpp b/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBData/MemoryCache_DBData.cpp
@@ -286,7 +286,7 @@ bool CMemoryCache_DBData::MemoryCache_DBData_QueueInsert(LPCXSTR lpszSQLStr, XEN
 //////////////////////////////////////////////////////////////////////////
 //                         线程函数
 //////////////////////////////////////////////////////////////////////////
-XHTHREAD CALLBACK CMemoryCache_DBData::DBModule_MQUser_TimeThread(XPVOID lParam)
+XHTHREAD XCALLBACK CMemoryCache_DBData::DBModule_MQUser_TimeThread(XPVOID lParam)
 {
 	CMemoryCache_DBData* pClass_This = (CMemoryCache_DBData*)lParam;
 
@@ -325,7 +325,7 @@ XHTHREAD CALLBACK CMemoryCache_DBData::DBModule_MQUser_TimeThread(XPVOID lParam)
 	}
 	return 0;
 }
-XHTHREAD CALLBACK CMemoryCache_DBData::DBModule_MQUser_InsertThread(XPVOID lParam)
+XHTHREAD XCALLBACK CMemoryCache_DBData::DBModule_MQUser_InsertThread(XPVOID lParam)
 {
 	CMemoryCache_DBData* pClass_This = (CMemoryCache_DBData*)lParam;
 
diff --git a/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBData/MemoryCache_DBData.h b/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBData/MemoryCache_DBData.h
@@ -52,8 +52,8 @@ class CMemoryCache_DBData
 public:
 	bool MemoryCache_DBData_QueueInsert(LPCXSTR lpszSQLStr, XENGINE_DBMESSAGEQUEUE* pSt_DBMessageInfo);
 protected:
-	static XHTHREAD CALLBACK DBModule_MQUser_TimeThread(XPVOID lParam);
-	static XHTHREAD CALLBACK DBModule_MQUser_InsertThread(XPVOID lParam);
+	static XHTHREAD XCALLBACK DBModule_MQUser_TimeThread(XPVOID lParam);
+	static XHTHREAD XCALLBACK DBModule_MQUser_InsertThread(XPVOID lParam);
 private:
 	bool bIsRun = false;
 	int m_nTimeLast = 0;
diff --git a/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBUser/MemoryCache_DBUser.cpp b/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBUser/MemoryCache_DBUser.cpp
@@ -214,7 +214,7 @@ bool CMemoryCache_DBUser::MemoryCache_DBUser_DataDelete(XENGINE_PROTOCOL_USERINF
 //////////////////////////////////////////////////////////////////////////
 //                         线程函数
 //////////////////////////////////////////////////////////////////////////
-XHTHREAD CALLBACK CMemoryCache_DBUser::DBModule_MQUser_TimeThread(XPVOID lParam)
+XHTHREAD XCALLBACK CMemoryCache_DBUser::DBModule_MQUser_TimeThread(XPVOID lParam)
 {
 	CMemoryCache_DBUser* pClass_This = (CMemoryCache_DBUser*)lParam;
 
diff --git a/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBUser/MemoryCache_DBUser.h b/XEngine_Source/MQCore_MemoryCache/MemoryCache_DBUser/MemoryCache_DBUser.h
@@ -31,7 +31,7 @@ class CMemoryCache_DBUser
 	bool MemoryCache_DBUser_DataQuery(XENGINE_PROTOCOL_USERINFO* pSt_DBUserInfo);
 	bool MemoryCache_DBUser_DataDelete(XENGINE_PROTOCOL_USERINFO* pSt_DBUserInfo);
 protected:
-	static XHTHREAD CALLBACK DBModule_MQUser_TimeThread(XPVOID lParam);
+	static XHTHREAD XCALLBACK DBModule_MQUser_TimeThread(XPVOID lParam);
 private:
 	bool bIsRun = false;
 	int m_nTimeLast = 0;
diff --git a/XEngine_Source/MQCore_MemoryCache/MemoryCache_Define.h b/XEngine_Source/MQCore_MemoryCache/MemoryCache_Define.h
@@ -19,7 +19,7 @@ typedef enum
 //////////////////////////////////////////////////////////////////////////
 //                       导出的回调
 //////////////////////////////////////////////////////////////////////////
-typedef void(CALLBACK* CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE)(ENUM_MEMORYCACHE_CALLBACK_TYPE enMemoryType, bool bSuccess, size_t nListCount, XPVOID pSt_DBInfo, XPVOID lParam);
+typedef void(XCALLBACK* CALLBACK_MESSAGEQUEUE_MODULE_DATABASE_CACHE)(ENUM_MEMORYCACHE_CALLBACK_TYPE enMemoryType, bool bSuccess, size_t nListCount, XPVOID pSt_DBInfo, XPVOID lParam);
 //////////////////////////////////////////////////////////////////////////
 //                       导出的函数
 //////////////////////////////////////////////////////////////////////////
diff --git a/XEngine_Source/XEngine_Depend b/XEngine_Source/XEngine_Depend
@@ -1 +1 @@
-Subproject commit b9427ac1eb1183eb76ae73c61b2cf0fb27448aa4
+Subproject commit 78d2ea2cfcfa4701e122ee3e4ac536f712831f86
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_HTTPTask/MQService_HTTPGet.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_HTTPTask/MQService_HTTPGet.cpp
@@ -14,7 +14,7 @@ bool MessageQueue_HttpTask_Get(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, XCH
 {
 	int nSDLen = 0;
 	XCHAR tszSDBuffer[1024] = {};
-	XCHAR tszKeyStr[MAX_PATH] = {};
+	XCHAR tszKeyStr[XPATH_MAX] = {};
 
 	LPCXSTR lpszAPILogin = _X("login");
 	LPCXSTR lpszAPIUPDate = _X("update");
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_HTTPTask/MQService_HTTPPost.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_HTTPTask/MQService_HTTPPost.cpp
@@ -15,8 +15,8 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
 	int nSDLen = 0;
 	XNETHANDLE xhToken = 0;
 	XCHAR tszSDBuffer[1024] = {};
-	XCHAR tszKeyStr[MAX_PATH] = {};
-	XCHAR tszVluStr[MAX_PATH] = {};
+	XCHAR tszKeyStr[XPATH_MAX] = {};
+	XCHAR tszVluStr[XPATH_MAX] = {};
 	LPCXSTR lpszAPIRegister = _X("register");
 	LPCXSTR lpszAPIGetUser = _X("getuser");
 	LPCXSTR lpszAPIGetTopic = _X("gettopic");
@@ -131,7 +131,7 @@ bool MessageQueue_HttpTask_Post(LPCXSTR lpszClientAddr, LPCXSTR lpszFuncName, LP
 	{
 		//主题 http://127.0.0.1:5202/api?function=gettopic
 		int nDBCount = 0;
-		XCHAR tszTopicName[MAX_PATH] = {};
+		XCHAR tszTopicName[XPATH_MAX] = {};
 		ProtocolModule_Parse_Name(lpszMsgBuffer, nMsgLen, tszTopicName);
 		DBModule_MQData_GetLeftCount(tszTopicName, 0, &nDBCount);
 		ProtocolModule_Packet_TopicName(tszSDBuffer, &nSDLen, tszTopicName, nDBCount);
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_HttpTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_HttpTask.cpp
@@ -1,6 +1,6 @@
 ﻿#include "MQService_Hdr.h"
 
-XHTHREAD CALLBACK MessageQueue_HttpThread(XPVOID lParam)
+XHTHREAD XCALLBACK MessageQueue_HttpThread(XPVOID lParam)
 {
 	int nThreadPos = *(int*)lParam;
 	nThreadPos++;
@@ -29,7 +29,7 @@ XHTHREAD CALLBACK MessageQueue_HttpThread(XPVOID lParam)
 				if (HttpProtocol_Server_GetMemoryEx(xhHTTPPacket, ppSst_ListAddr[i]->tszClientAddr, &ptszMsgBuffer, &nMsgLen, &st_HTTPReqparam, &ppszHdrList, &nHdrCount))
 				{
 					MessageQueue_Http_Handle(&st_HTTPReqparam, ppSst_ListAddr[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, ppszHdrList, nHdrCount);
-					BaseLib_Memory_FreeCStyle((VOID**)&ptszMsgBuffer);
+					BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 					BaseLib_Memory_Free((XPPPMEM)&ppszHdrList, nHdrCount);
 				}
 			}
@@ -42,8 +42,8 @@ bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXST
 {
 	int nPKTLen = 4096;
 	XCHAR tszPKTBuffer[4096] = {};
-	XCHAR tszKey[MAX_PATH] = {};
-	XCHAR tszValue[MAX_PATH] = {};
+	XCHAR tszKey[XPATH_MAX] = {};
+	XCHAR tszValue[XPATH_MAX] = {};
 
 	LPCXSTR lpszPostMethod = _X("POST");
 	LPCXSTR lpszGetMethod = _X("GET");
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_HttpTask.h b/XEngine_Source/XEngine_MQServiceApp/MQService_HttpTask.h
@@ -1,4 +1,4 @@
 ﻿#pragma once
 
-XHTHREAD CALLBACK MessageQueue_HttpThread(XPVOID lParam);
+XHTHREAD XCALLBACK MessageQueue_HttpThread(XPVOID lParam);
 bool MessageQueue_Http_Handle(RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, XCHAR** pptszListHdr, int nHdrCount);
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_MQTTTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_MQTTTask.cpp
@@ -1,6 +1,6 @@
 ﻿#include "MQService_Hdr.h"
 
-XHTHREAD CALLBACK MessageQueue_MQTTThread(XPVOID lParam)
+XHTHREAD XCALLBACK MessageQueue_MQTTThread(XPVOID lParam)
 {
 	int nThreadPos = *(int*)lParam;
 	nThreadPos++;
@@ -108,7 +108,7 @@ bool MQService_MQTT_Handle(LPCXSTR lpszClientAddr, MQTTPROTOCOL_FIXEDHEADER* pSt
 	else if (XENGINE_RFCCOMPONENTS_MQTT_PROTOCOL_TYPE_SUBSCRIBE == pSt_MQTTHdr->byMsgType)
 	{
 		XSHOT wMsgID = 0;
-		XCHAR tszTopicName[MAX_PATH] = {};
+		XCHAR tszTopicName[XPATH_MAX] = {};
 		int nListCount = 0;
 		MQTTPROTOCOL_HDRPROPERTY** ppSt_HDRProperty;
 		MQTTPROTOCOL_HDRSUBSCRIBE st_SubScribe = {};
@@ -137,7 +137,7 @@ bool MQService_MQTT_Handle(LPCXSTR lpszClientAddr, MQTTPROTOCOL_FIXEDHEADER* pSt
 	else if (XENGINE_RFCCOMPONENTS_MQTT_PROTOCOL_TYPE_UNSUBSCRIBE == pSt_MQTTHdr->byMsgType)
 	{
 		XSHOT wMsgID = 0;
-		XCHAR tszTopicName[MAX_PATH] = {};
+		XCHAR tszTopicName[XPATH_MAX] = {};
 		int nListCount = 0;
 		MQTTPROTOCOL_HDRPROPERTY** ppSt_HDRProperty;
 
@@ -166,7 +166,7 @@ bool MQService_MQTT_Handle(LPCXSTR lpszClientAddr, MQTTPROTOCOL_FIXEDHEADER* pSt
 	{
 		int nListCount = 0;
 		XSHOT wMsgID = 0;
-		XCHAR tszTopicName[MAX_PATH] = {};
+		XCHAR tszTopicName[XPATH_MAX] = {};
 		XENGINE_PROTOCOLHDR st_ProtocolHdr = {};
 		MQTTPROTOCOL_HDRPROPERTY** ppSt_HDRProperty;
 
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_MQTTTask.h b/XEngine_Source/XEngine_MQServiceApp/MQService_MQTTTask.h
@@ -1,4 +1,4 @@
 ﻿#pragma once
 
-XHTHREAD CALLBACK MessageQueue_MQTTThread(XPVOID lParam);
+XHTHREAD XCALLBACK MessageQueue_MQTTThread(XPVOID lParam);
 bool MQService_MQTT_Handle(LPCXSTR lpszClientAddr, MQTTPROTOCOL_FIXEDHEADER* pSt_MQTTHdr, LPCXSTR lpszMSGBuffer, int nMSGLen);
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_Net.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_Net.cpp
@@ -1,12 +1,12 @@
 ﻿#include "MQService_Hdr.h"
 //////////////////////////////////////////////////////////////////////////
-bool CALLBACK MessageQueue_Callback_TCPLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+bool XCALLBACK MessageQueue_Callback_TCPLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
 	HelpComponents_Datas_CreateEx(xhTCPPacket, lpszClientAddr, 0);
     XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO,_X("TCP客户端连接，TCP客户端地址：%s"),lpszClientAddr);
 	return true;
 }
-void CALLBACK MessageQueue_Callback_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg,int nMsgLen,XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg,int nMsgLen,XPVOID lParam)
 {
 	if (!HelpComponents_Datas_PostEx(xhTCPPacket, lpszClientAddr, lpszRecvMsg, nMsgLen))
 	{
@@ -15,17 +15,17 @@ void CALLBACK MessageQueue_Callback_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSoc
 	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("投递TCP数据包到消息队列成功,%d"), nMsgLen);
 }
-void CALLBACK MessageQueue_Callback_TCPLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_TCPLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
     XEngine_MQXService_Close(lpszClientAddr, XENGINE_MQAPP_NETTYPE_TCP, false);
 }
 //////////////////////////////////////////////////////////////////////////
-bool CALLBACK MessageQueue_Callback_MQTTLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+bool XCALLBACK MessageQueue_Callback_MQTTLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
 	MQTTProtocol_Parse_Insert(lpszClientAddr);
 	return true;
 }
-void CALLBACK MessageQueue_Callback_MQTTRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_MQTTRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
 {
 	if (!MQTTProtocol_Parse_Send(lpszClientAddr, lpszRecvMsg, nMsgLen))
 	{
@@ -34,37 +34,37 @@ void CALLBACK MessageQueue_Callback_MQTTRecv(LPCXSTR lpszClientAddr, XSOCKET hSo
 	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("投递MQTT数据包到消息队列成功,%d"), nMsgLen);
 }
-void CALLBACK MessageQueue_Callback_MQTTLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_MQTTLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
 	XEngine_MQXService_Close(lpszClientAddr, XENGINE_MQAPP_NETTYPE_MQTT, false);
 }
 //////////////////////////////////////////////////////////////////////////
-bool CALLBACK MessageQueue_Callback_HttpLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+bool XCALLBACK MessageQueue_Callback_HttpLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
     HttpProtocol_Server_CreateClientEx(xhHTTPPacket, lpszClientAddr, 0);
     XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端连接，HTTP客户端地址：%s"), lpszClientAddr);
     return true;
 }
-void CALLBACK MessageQueue_Callback_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
 {
 	if (!HttpProtocol_Server_InserQueueEx(xhHTTPPacket, lpszClientAddr, lpszRecvMsg, nMsgLen))
 	{
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("投递HTTP数据包到消息队列失败，错误：%lX"), HttpProtocol_GetLastError());
 		return;
 	}
 }
-void CALLBACK MessageQueue_Callback_HttpLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_HttpLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
     XEngine_MQXService_Close(lpszClientAddr, XENGINE_MQAPP_NETTYPE_HTTP, false);
 }
 //////////////////////////////////////////////////////////////////////////
-bool CALLBACK MessageQueue_Callback_WSLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+bool XCALLBACK MessageQueue_Callback_WSLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
     RfcComponents_WSPacket_CreateEx(xhWSPacket, lpszClientAddr, 0);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Websocket客户端连接，Websocket客户端地址：%s"), lpszClientAddr);
 	return true;
 }
-void CALLBACK MessageQueue_Callback_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
 {
 	bool bLogin = false;
 	RfcComponents_WSPacket_GetLoginEx(xhWSPacket, lpszClientAddr, &bLogin);
@@ -88,7 +88,7 @@ void CALLBACK MessageQueue_Callback_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSock
         XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("WEBSOCKET客户端:%s 与服务器握手成功"), lpszClientAddr);
 	}
 }
-void CALLBACK MessageQueue_Callback_WSLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
+void XCALLBACK MessageQueue_Callback_WSLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
     XEngine_MQXService_Close(lpszClientAddr, XENGINE_MQAPP_NETTYPE_WEBSOCKET, false);
 }
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_Net.h b/XEngine_Source/XEngine_MQServiceApp/MQService_Net.h
@@ -1,20 +1,20 @@
 ﻿#pragma once
 
-bool CALLBACK MessageQueue_Callback_TCPLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);   //用户连接
-void CALLBACK MessageQueue_Callback_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg,int nMsgLen,XPVOID lParam); //接受到数据
-void CALLBACK MessageQueue_Callback_TCPLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);          //用户离开
+bool XCALLBACK MessageQueue_Callback_TCPLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);   //用户连接
+void XCALLBACK MessageQueue_Callback_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg,int nMsgLen,XPVOID lParam); //接受到数据
+void XCALLBACK MessageQueue_Callback_TCPLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);          //用户离开
 
-bool CALLBACK MessageQueue_Callback_MQTTLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);   
-void CALLBACK MessageQueue_Callback_MQTTRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
-void CALLBACK MessageQueue_Callback_MQTTLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
+bool XCALLBACK MessageQueue_Callback_MQTTLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);   
+void XCALLBACK MessageQueue_Callback_MQTTRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
+void XCALLBACK MessageQueue_Callback_MQTTLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
 
-bool CALLBACK MessageQueue_Callback_HttpLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);  
-void CALLBACK MessageQueue_Callback_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam); 
-void CALLBACK MessageQueue_Callback_HttpLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);     
+bool XCALLBACK MessageQueue_Callback_HttpLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);  
+void XCALLBACK MessageQueue_Callback_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam); 
+void XCALLBACK MessageQueue_Callback_HttpLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);     
 
-bool CALLBACK MessageQueue_Callback_WSLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
-void CALLBACK MessageQueue_Callback_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
-void CALLBACK MessageQueue_Callback_WSLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
+bool XCALLBACK MessageQueue_Callback_WSLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
+void XCALLBACK MessageQueue_Callback_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
+void XCALLBACK MessageQueue_Callback_WSLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
 
 void XEngine_MQXService_Close(LPCXSTR lpszClientAddr, int nIPProto, bool bHeart);
 bool XEngine_MQXService_Send(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nIPProto);
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.h b/XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.h
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_Task.h b/XEngine_Source/XEngine_MQServiceApp/MQService_Task.h
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_WSTask.cpp b/XEngine_Source/XEngine_MQServiceApp/MQService_WSTask.cpp
diff --git a/XEngine_Source/XEngine_MQServiceApp/MQService_WSTask.h b/XEngine_Source/XEngine_MQServiceApp/MQService_WSTask.h
diff --git a/XEngine_Source/XEngine_MQServiceApp/XEngine_MQServiceApp.cpp b/XEngine_Source/XEngine_MQServiceApp/XEngine_MQServiceApp.cpp
diff --git a/XEngine_Source/XQueue_ProtocolHdr.h b/XEngine_Source/XQueue_ProtocolHdr.h

Original file line number	Diff line number	Diff line change
`@@ -1173,7 +1173,7 @@ bool CDBModule_MQUser::DBModule_MQUser_OwnerTopicUPDate(LPCXSTR lpszSourceTable,`
`1173`	`1173`	`//////////////////////////////////////////////////////////////////////////`
`1174`	`1174`	`// 线程函数`
`1175`	`1175`	`//////////////////////////////////////////////////////////////////////////`
`1176`		`-XHTHREAD CALLBACK CDBModule_MQUser::DBModule_MQUser_TimeThread(XPVOID lParam)`
	`1176`	`+XHTHREAD XCALLBACK CDBModule_MQUser::DBModule_MQUser_TimeThread(XPVOID lParam)`
`1177`	`1177`	`{`
`1178`	`1178`	`CDBModule_MQUser* pClass_This = (CDBModule_MQUser*)lParam;`
`1179`	`1179`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ bool CMemoryCache_DBData::MemoryCache_DBData_QueueInsert(LPCXSTR lpszSQLStr, XEN`
`286`	`286`	`//////////////////////////////////////////////////////////////////////////`
`287`	`287`	`// 线程函数`
`288`	`288`	`//////////////////////////////////////////////////////////////////////////`
`289`		`-XHTHREAD CALLBACK CMemoryCache_DBData::DBModule_MQUser_TimeThread(XPVOID lParam)`
	`289`	`+XHTHREAD XCALLBACK CMemoryCache_DBData::DBModule_MQUser_TimeThread(XPVOID lParam)`
`290`	`290`	`{`
`291`	`291`	`CMemoryCache_DBData* pClass_This = (CMemoryCache_DBData*)lParam;`
`292`	`292`
`@@ -325,7 +325,7 @@ XHTHREAD CALLBACK CMemoryCache_DBData::DBModule_MQUser_TimeThread(XPVOID lParam)`
`325`	`325`	`}`
`326`	`326`	`return 0;`
`327`	`327`	`}`
`328`		`-XHTHREAD CALLBACK CMemoryCache_DBData::DBModule_MQUser_InsertThread(XPVOID lParam)`
	`328`	`+XHTHREAD XCALLBACK CMemoryCache_DBData::DBModule_MQUser_InsertThread(XPVOID lParam)`
`329`	`329`	`{`
`330`	`330`	`CMemoryCache_DBData* pClass_This = (CMemoryCache_DBData*)lParam;`
`331`	`331`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ bool CMemoryCache_DBUser::MemoryCache_DBUser_DataDelete(XENGINE_PROTOCOL_USERINF`
`214`	`214`	`//////////////////////////////////////////////////////////////////////////`
`215`	`215`	`// 线程函数`
`216`	`216`	`//////////////////////////////////////////////////////////////////////////`
`217`		`-XHTHREAD CALLBACK CMemoryCache_DBUser::DBModule_MQUser_TimeThread(XPVOID lParam)`
	`217`	`+XHTHREAD XCALLBACK CMemoryCache_DBUser::DBModule_MQUser_TimeThread(XPVOID lParam)`
`218`	`218`	`{`
`219`	`219`	`CMemoryCache_DBUser* pClass_This = (CMemoryCache_DBUser*)lParam;`
`220`	`220`