fixed:XPATH_MAX name error

Author: xengine-qyt

XEngine_Application/XEngine_APPFileSort/XEngine_APPFileSortDlg.cpp

@@ -103,15 +103,15 @@ HCURSOR CXEngineAPPFileSortDlg::OnQueryDragIcon()
 bool compareNumericString(const std::string& strSource, const std::string& strDest)
 {
 	// 解析字符串中的数字部分
-	XCHAR tszSrcName[XMAX_PATH] = {};
-	XCHAR tszDstName[XMAX_PATH] = {};
+	XCHAR tszSrcName[XPATH_MAX] = {};
+	XCHAR tszDstName[XPATH_MAX] = {};
 	BaseLib_String_GetFileAndPath(strSource.c_str(), NULL, tszSrcName);
 	BaseLib_String_GetFileAndPath(strDest.c_str(), NULL, tszDstName);
 
-	XCHAR tszSrcKey[XMAX_PATH] = {};
-	XCHAR tszSrcVlu[XMAX_PATH] = {};
-	XCHAR tszDstKey[XMAX_PATH] = {};
-	XCHAR tszDstVlu[XMAX_PATH] = {};
+	XCHAR tszSrcKey[XPATH_MAX] = {};
+	XCHAR tszSrcVlu[XPATH_MAX] = {};
+	XCHAR tszDstKey[XPATH_MAX] = {};
+	XCHAR tszDstVlu[XPATH_MAX] = {};
 
 	BaseLib_String_GetKeyValue(tszSrcName, _X("."), tszSrcKey, tszSrcVlu);
 	BaseLib_String_GetKeyValue(tszDstName, _X("."), tszDstKey, tszDstVlu);
@@ -198,10 +198,10 @@ void CXEngineAPPFileSortDlg::XEngine_FileSort_ThreadList(LPVOID lParam)
 	auto stl_ListIterator = stl_ListFile.begin();
 	for (int i = 0; stl_ListIterator != stl_ListFile.end(); stl_ListIterator++, i++, j++)
 	{
-		TCHAR tszIndexStr[XMAX_PATH] = {};
-		CHAR tszFileName[XMAX_PATH] = {};
-		CHAR tszFilePath[XMAX_PATH] = {};
-		CHAR tszFileExt[XMAX_PATH] = {};
+		TCHAR tszIndexStr[XPATH_MAX] = {};
+		CHAR tszFileName[XPATH_MAX] = {};
+		CHAR tszFilePath[XPATH_MAX] = {};
+		CHAR tszFileExt[XPATH_MAX] = {};
 
 		BaseLib_String_GetFileAndPath(stl_ListIterator->c_str(), tszFilePath, NULL, NULL, tszFileExt);
 
@@ -212,8 +212,8 @@ void CXEngineAPPFileSortDlg::XEngine_FileSort_ThreadList(LPVOID lParam)
 		pClass_This->m_ListFile.SetItemText(i, 0, tszIndexStr);
 #ifdef _UNICODE
 		int nGBKLen = 0;
-		wchar_t tszUNCSrc[XMAX_PATH] = {};
-		wchar_t tszUNCDst[XMAX_PATH] = {};
+		wchar_t tszUNCSrc[XPATH_MAX] = {};
+		wchar_t tszUNCDst[XPATH_MAX] = {};
 		nGBKLen = stl_ListIterator->length();
 		BaseLib_Charset_AnsiToUnicode(stl_ListIterator->c_str(), tszUNCSrc, &nGBKLen);
 
@@ -239,14 +239,14 @@ void CXEngineAPPFileSortDlg::XEngine_FileSort_ThreadName(LPVOID lParam)
 	CString m_StrLastSrc = pClass_This->m_ListFile.GetItemText(pClass_This->m_ListFile.GetItemCount() - 1, 1);
 	CString m_StrLastDst = pClass_This->m_ListFile.GetItemText(pClass_This->m_ListFile.GetItemCount() - 1, 2);
 
-	XCHAR tszFileSrc[XMAX_PATH] = {};
-	XCHAR tszFileDst[XMAX_PATH] = {};
+	XCHAR tszFileSrc[XPATH_MAX] = {};
+	XCHAR tszFileDst[XPATH_MAX] = {};
 	USES_CONVERSION;
 	BaseLib_String_GetFileAndPath(W2A(m_StrLastSrc.GetBuffer()), NULL, tszFileSrc);
 	BaseLib_String_GetFileAndPath(W2A(m_StrLastDst.GetBuffer()), NULL, tszFileDst);
 
-	XCHAR tszNameSrc[XMAX_PATH] = {};
-	XCHAR tszNameDst[XMAX_PATH] = {};
+	XCHAR tszNameSrc[XPATH_MAX] = {};
+	XCHAR tszNameDst[XPATH_MAX] = {};
 	BaseLib_String_GetKeyValue(tszFileSrc, ".", tszNameSrc);
 	BaseLib_String_GetKeyValue(tszFileDst, ".", tszNameDst);
 
@@ -331,7 +331,7 @@ void CXEngineAPPFileSortDlg::OnBnClickedButton1()
 {
 	// TODO: 在此添加控件通知处理程序代码
 	BROWSEINFO st_BrowseInfo = { 0 };
-	TCHAR tszDIRBuffer[XMAX_PATH] = {};
+	TCHAR tszDIRBuffer[XPATH_MAX] = {};
 	st_BrowseInfo.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
 
 	LPITEMIDLIST pSt_ItemList = SHBrowseForFolder(&st_BrowseInfo);

XEngine_Application/XEngine_APPFileSort/pch.h

@@ -33,8 +33,8 @@ using namespace std;
 *********************************************************************/
 typedef struct
 {
-	TCHAR tszFileSrc[XMAX_PATH];
-	TCHAR tszFileDst[XMAX_PATH];
+	TCHAR tszFileSrc[XPATH_MAX];
+	TCHAR tszFileDst[XPATH_MAX];
 }FILESORT_INFO;
 
 #ifdef _UNICODE

XEngine_Application/XEngine_APPSimulateKeyInput/XEngine_APPSimulateKeyInputDlg.cpp

@@ -119,7 +119,7 @@ int CALLBACK CXEngineAPPSimulateKeyInputDlg::Keyboard_ThreadCheck1(LPVOID lParam
 	while (pClass_This->m_bRun)
 	{
 		int nRandom = 0;
-		TCHAR tszWindowName[XMAX_PATH];
+		TCHAR tszWindowName[XPATH_MAX];
 		memset(tszWindowName, '\0', sizeof(tszWindowName));
 
 		pClass_This->m_EditTime1.GetWindowText(m_StrTime);
@@ -181,7 +181,7 @@ int CALLBACK CXEngineAPPSimulateKeyInputDlg::Keyboard_ThreadCheck2(LPVOID lParam
 	while (pClass_This->m_bRun)
 	{
 		int nRandom = 0;
-		TCHAR tszWindowName[XMAX_PATH];
+		TCHAR tszWindowName[XPATH_MAX];
 		memset(tszWindowName, '\0', sizeof(tszWindowName));
 
 		pClass_This->m_EditTime2.GetWindowText(m_StrTime);
@@ -243,7 +243,7 @@ int CALLBACK CXEngineAPPSimulateKeyInputDlg::Keyboard_ThreadCheck3(LPVOID lParam
 	while (pClass_This->m_bRun)
 	{
 		int nRandom = 0;
-		TCHAR tszWindowName[XMAX_PATH];
+		TCHAR tszWindowName[XPATH_MAX];
 		memset(tszWindowName, '\0', sizeof(tszWindowName));
 
 		pClass_This->m_EditTime3.GetWindowText(m_StrTime);
@@ -305,7 +305,7 @@ int CALLBACK CXEngineAPPSimulateKeyInputDlg::Keyboard_ThreadCheck4(LPVOID lParam
 	while (pClass_This->m_bRun)
 	{
 		int nRandom = 0;
-		TCHAR tszWindowName[XMAX_PATH];
+		TCHAR tszWindowName[XPATH_MAX];
 		memset(tszWindowName, '\0', sizeof(tszWindowName));
 
 		pClass_This->m_EditTime4.GetWindowText(m_StrTime);

XEngine_Module/XEngine_InfoReport/InfoReport_APIMachine/InfoReport_APIMachine.cpp

@@ -58,7 +58,7 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Send(LPCXSTR lpszAPIUrl, LPCX
 	int nLen = 0;
 	int nCode = 0;
 
-	XCHAR tszAPIUrl[XMAX_PATH] = {};
+	XCHAR tszAPIUrl[XPATH_MAX] = {};
 	XCHAR tszOSName[128] = {};
 	XCHAR tszOSVersion[128] = {};
 	XCHAR tszOSBuild[128] = {};
@@ -157,8 +157,8 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_GetTime(LPCXSTR lpszAPIUrl, L
 	}
 	int nLen = 0;
 	int nCode = 0;
-	XCHAR tszAPIUrl[XMAX_PATH] = {};
-	XCHAR tszComputerName[XMAX_PATH] = {};
+	XCHAR tszAPIUrl[XPATH_MAX] = {};
+	XCHAR tszComputerName[XPATH_MAX] = {};
 	XCLIENT_APIHTTP st_HTTPParam = {};
 
 	_xstprintf(tszAPIUrl, _X("%s&params1=2"), lpszAPIUrl);
@@ -234,8 +234,8 @@ bool CInfoReport_APIMachine::InfoReport_APIMachine_Delete(LPCXSTR lpszAPIUrl, LP
 	}
 	int nLen = 0;
 	int nCode = 0;
-	XCHAR tszAPIUrl[XMAX_PATH] = {};
-	XCHAR tszComputerName[XMAX_PATH] = {};
+	XCHAR tszAPIUrl[XPATH_MAX] = {};
+	XCHAR tszComputerName[XPATH_MAX] = {};
 	XCLIENT_APIHTTP st_HTTPParam = {};
 
 	_xstprintf(tszAPIUrl, _X("%s&params1=1"), lpszAPIUrl);