@@ -50,15 +50,15 @@ CAPIHelp_Api::~CAPIHelp_Api()
5050 意思:是否成功
5151备注:
5252*********************************************************************/
53- BOOL CAPIHelp_Api::APIHelp_Api_ProxyAuth (TCHAR * ptszUser, TCHAR * ptszPass, TCHAR ** pptszListHdr, int nHdrCount)
53+ bool CAPIHelp_Api::APIHelp_Api_ProxyAuth (XCHAR * ptszUser, XCHAR * ptszPass, XCHAR ** pptszListHdr, int nHdrCount)
5454{
55- APIHelp_IsErrorOccur = FALSE ;
55+ APIHelp_IsErrorOccur = false ;
5656
5757 int nAuthType = 0 ;
5858 int nAuthLen = MAX_PATH;
5959
60- TCHAR tszAuthStr[MAX_PATH];
61- TCHAR tszSDBuffer[1024 ];
60+ XCHAR tszAuthStr[MAX_PATH];
61+ XCHAR tszSDBuffer[1024 ];
6262
6363 memset (tszAuthStr, ' \0 ' , MAX_PATH);
6464 memset (tszSDBuffer, ' \0 ' , sizeof (tszSDBuffer));
@@ -67,14 +67,14 @@ BOOL CAPIHelp_Api::APIHelp_Api_ProxyAuth(TCHAR* ptszUser, TCHAR* ptszPass, TCHAR
6767 {
6868 APIHelp_IsErrorOccur = true ;
6969 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_NOTAUTH;
70- return FALSE ;
70+ return false ;
7171 }
7272 // 是否是BASIC
7373 if (1 != nAuthType)
7474 {
7575 APIHelp_IsErrorOccur = true ;
7676 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_NOTSUPPORT;
77- return FALSE ;
77+ return false ;
7878 }
7979 OPenSsl_Help_BasicDecoder (tszAuthStr, ptszUser, ptszPass);
8080 return true ;
@@ -112,16 +112,16 @@ BOOL CAPIHelp_Api::APIHelp_Api_ProxyAuth(TCHAR* ptszUser, TCHAR* ptszPass, TCHAR
112112 意思:是否成功
113113备注:
114114*********************************************************************/
115- BOOL CAPIHelp_Api::APIHelp_Api_RangeFile (int * pInt_SPos, int * pInt_EPos, __int64x* pInt_Count, TCHAR ** pptszListHdr, int nHdrCount)
115+ bool CAPIHelp_Api::APIHelp_Api_RangeFile (int * pInt_SPos, int * pInt_EPos, __int64x* pInt_Count, XCHAR ** pptszListHdr, int nHdrCount)
116116{
117- APIHelp_IsErrorOccur = FALSE ;
117+ APIHelp_IsErrorOccur = false ;
118118
119- BOOL bFound = FALSE ;
120- LPCTSTR lpszRangeStr = _T (" Range" );
121- LPCTSTR lpszLengthStr = _T (" Content-Length" );
122- TCHAR tszKeyStr[128 ];
123- TCHAR tszValueStr[128 ];
124- TCHAR tszFieldStr[128 ];
119+ bool bFound = false ;
120+ LPCXSTR lpszRangeStr = _X (" Range" );
121+ LPCXSTR lpszLengthStr = _X (" Content-Length" );
122+ XCHAR tszKeyStr[128 ];
123+ XCHAR tszValueStr[128 ];
124+ XCHAR tszFieldStr[128 ];
125125
126126 memset (tszKeyStr, ' \0 ' , sizeof (tszKeyStr));
127127 memset (tszValueStr, ' \0 ' , sizeof (tszValueStr));
@@ -131,32 +131,32 @@ BOOL CAPIHelp_Api::APIHelp_Api_RangeFile(int* pInt_SPos, int* pInt_EPos, __int64
131131 {
132132 // 是否没有找到
133133 int nBPos = 0 ; // 某些时候有个BYTE
134- if (NULL != _tcsstr (tszFieldStr, _T (" bytes=" )))
134+ if (NULL != _tcsxstr (tszFieldStr, _X (" bytes=" )))
135135 {
136136 nBPos = 6 ;
137137 }
138138 if (!BaseLib_OperatorString_GetKeyValue (tszFieldStr + nBPos, " -" , tszKeyStr, tszValueStr))
139139 {
140140 APIHelp_IsErrorOccur = true ;
141141 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_PARSELEN;
142- return FALSE ;
142+ return false ;
143143 }
144144 // 得到 1/2 如果有的话
145- TCHAR tszRangeEnd[128 ];
146- TCHAR tszRangeCount[128 ];
145+ XCHAR tszRangeEnd[128 ];
146+ XCHAR tszRangeCount[128 ];
147147
148148 memset (tszRangeEnd, ' \0 ' , sizeof (tszRangeEnd));
149149 memset (tszRangeCount, ' \0 ' , sizeof (tszRangeCount));
150150 if (BaseLib_OperatorString_GetKeyValue (tszValueStr, " /" , tszRangeEnd, tszRangeCount))
151151 {
152- *pInt_SPos = _ttoi (tszKeyStr);
153- *pInt_EPos = _ttoi (tszRangeEnd);
154- *pInt_Count = _ttoi64 (tszRangeCount);
152+ *pInt_SPos = _ttxoi (tszKeyStr);
153+ *pInt_EPos = _ttxoi (tszRangeEnd);
154+ *pInt_Count = _ttxoll (tszRangeCount);
155155 }
156156 else
157157 {
158- *pInt_SPos = _ttoi (tszKeyStr);
159- *pInt_EPos = _ttoi (tszValueStr);
158+ *pInt_SPos = _ttxoi (tszKeyStr);
159+ *pInt_EPos = _ttxoi (tszValueStr);
160160 }
161161 bFound = true ;
162162 }
@@ -165,7 +165,7 @@ BOOL CAPIHelp_Api::APIHelp_Api_RangeFile(int* pInt_SPos, int* pInt_EPos, __int64
165165 {
166166 if (HttpProtocol_ServerHelp_GetField (&pptszListHdr, nHdrCount, lpszLengthStr, tszFieldStr))
167167 {
168- *pInt_Count = _ttoi64 (tszFieldStr);
168+ *pInt_Count = _ttxoll (tszFieldStr);
169169 bFound = true ;
170170 }
171171 }
@@ -174,7 +174,7 @@ BOOL CAPIHelp_Api::APIHelp_Api_RangeFile(int* pInt_SPos, int* pInt_EPos, __int64
174174 {
175175 APIHelp_IsErrorOccur = true ;
176176 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_NOTLENGTH;
177- return FALSE ;
177+ return false ;
178178 }
179179
180180 return true ;
@@ -202,25 +202,25 @@ BOOL CAPIHelp_Api::APIHelp_Api_RangeFile(int* pInt_SPos, int* pInt_EPos, __int64
202202 意思:是否成功
203203备注:
204204*********************************************************************/
205- BOOL CAPIHelp_Api::APIHelp_Api_VerHash (LPCTSTR lpszFileHash, TCHAR ** pptszListHdr, int nHdrCount)
205+ bool CAPIHelp_Api::APIHelp_Api_VerHash (LPCXSTR lpszFileHash, XCHAR ** pptszListHdr, int nHdrCount)
206206{
207- APIHelp_IsErrorOccur = FALSE ;
207+ APIHelp_IsErrorOccur = false ;
208208
209- LPCTSTR lpszKeyStr = _T (" FileHash" );
210- TCHAR tszValueStr[MAX_PATH];
209+ LPCXSTR lpszKeyStr = _X (" FileHash" );
210+ XCHAR tszValueStr[MAX_PATH];
211211 memset (tszValueStr, ' \0 ' , MAX_PATH);
212212
213213 if (!HttpProtocol_ServerHelp_GetField (&pptszListHdr, nHdrCount, lpszKeyStr, tszValueStr))
214214 {
215215 APIHelp_IsErrorOccur = true ;
216216 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_NOTHASH;
217- return FALSE ;
217+ return false ;
218218 }
219- if (0 != _tcsnicmp (lpszFileHash, tszValueStr, _tcslen (lpszFileHash)))
219+ if (0 != _tcsxnicmp (lpszFileHash, tszValueStr, _tcsxlen (lpszFileHash)))
220220 {
221221 APIHelp_IsErrorOccur = true ;
222222 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_NOTMATCH;
223- return FALSE ;
223+ return false ;
224224 }
225225 return true ;
226226}
@@ -247,9 +247,9 @@ BOOL CAPIHelp_Api::APIHelp_Api_VerHash(LPCTSTR lpszFileHash, TCHAR** pptszListHd
247247 意思:是否成功
248248备注:
249249*********************************************************************/
250- BOOL CAPIHelp_Api::APIHelp_Api_GetIPInfo (LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_IPADDRINFO* pSt_IPAddrInfo)
250+ bool CAPIHelp_Api::APIHelp_Api_GetIPInfo (LPCXSTR lpszMsgBuffer, int nMsgLen, XENGINE_IPADDRINFO* pSt_IPAddrInfo)
251251{
252- APIHelp_IsErrorOccur = FALSE ;
252+ APIHelp_IsErrorOccur = false ;
253253
254254 Json::Value st_JsonRoot;
255255 JSONCPP_STRING st_JsonError;
@@ -260,27 +260,27 @@ BOOL CAPIHelp_Api::APIHelp_Api_GetIPInfo(LPCTSTR lpszMsgBuffer, int nMsgLen, XEN
260260 {
261261 APIHelp_IsErrorOccur = true ;
262262 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_PARSE;
263- return FALSE ;
263+ return false ;
264264 }
265265 // 是否获取成功
266266 if (0 != st_JsonRoot[" code" ].asInt ())
267267 {
268268 APIHelp_IsErrorOccur = true ;
269269 APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_CODE;
270- return FALSE ;
270+ return false ;
271271 }
272272 Json::Value st_JsonObject = st_JsonRoot[" data" ];
273273
274- _tcscpy (pSt_IPAddrInfo->tszIPStart , st_JsonObject[" tszIPStart" ].asCString ());
275- _tcscpy (pSt_IPAddrInfo->tszIPEnd , st_JsonObject[" tszIPEnd" ].asCString ());
276- _tcscpy (pSt_IPAddrInfo->tszIPAddress , st_JsonObject[" tszIPAddress" ].asCString ());
277- _tcscpy (pSt_IPAddrInfo->tszIPAddr , st_JsonObject[" tszIPAddr" ].asCString ());
278- _tcscpy (pSt_IPAddrInfo->tszIPCity , st_JsonObject[" tszIPCity" ].asCString ());
279- _tcscpy (pSt_IPAddrInfo->tszIPCountry , st_JsonObject[" tszIPCountry" ].asCString ());
280- _tcscpy (pSt_IPAddrInfo->tszIPCounty , st_JsonObject[" tszIPCounty" ].asCString ());
281- _tcscpy (pSt_IPAddrInfo->tszIPProvince , st_JsonObject[" tszIPProvince" ].asCString ());
282- _tcscpy (pSt_IPAddrInfo->tszIPISP , st_JsonObject[" tszIPISP" ].asCString ());
283- _tcscpy (pSt_IPAddrInfo->tszIPTime , st_JsonObject[" tszIPTime" ].asCString ());
274+ _tcsxcpy (pSt_IPAddrInfo->tszIPStart , st_JsonObject[" tszIPStart" ].asCString ());
275+ _tcsxcpy (pSt_IPAddrInfo->tszIPEnd , st_JsonObject[" tszIPEnd" ].asCString ());
276+ _tcsxcpy (pSt_IPAddrInfo->tszIPAddress , st_JsonObject[" tszIPAddress" ].asCString ());
277+ _tcsxcpy (pSt_IPAddrInfo->tszIPAddr , st_JsonObject[" tszIPAddr" ].asCString ());
278+ _tcsxcpy (pSt_IPAddrInfo->tszIPCity , st_JsonObject[" tszIPCity" ].asCString ());
279+ _tcsxcpy (pSt_IPAddrInfo->tszIPCountry , st_JsonObject[" tszIPCountry" ].asCString ());
280+ _tcsxcpy (pSt_IPAddrInfo->tszIPCounty , st_JsonObject[" tszIPCounty" ].asCString ());
281+ _tcsxcpy (pSt_IPAddrInfo->tszIPProvince , st_JsonObject[" tszIPProvince" ].asCString ());
282+ _tcsxcpy (pSt_IPAddrInfo->tszIPISP , st_JsonObject[" tszIPISP" ].asCString ());
283+ _tcsxcpy (pSt_IPAddrInfo->tszIPTime , st_JsonObject[" tszIPTime" ].asCString ());
284284
285285 return true ;
286286}
@@ -312,41 +312,41 @@ BOOL CAPIHelp_Api::APIHelp_Api_GetIPInfo(LPCTSTR lpszMsgBuffer, int nMsgLen, XEN
312312 意思:是否成功
313313备注:
314314*********************************************************************/
315- BOOL CAPIHelp_Api::APIHelp_Api_UrlParse (TCHAR *** ppptszList, int nListCount, TCHAR * ptszFileName, TCHAR * ptszKeyName)
315+ bool CAPIHelp_Api::APIHelp_Api_UrlParse (XCHAR *** ppptszList, int nListCount, XCHAR * ptszFileName, XCHAR * ptszKeyName)
316316{
317- APIHelp_IsErrorOccur = FALSE ;
317+ APIHelp_IsErrorOccur = false ;
318318
319- LPCTSTR lpszHDRFile = _T (" filename" );
320- LPCTSTR lpszHDRKey = _T (" storeagekey" );
319+ LPCXSTR lpszHDRFile = _X (" filename" );
320+ LPCXSTR lpszHDRKey = _X (" storeagekey" );
321321
322322 for (int i = 0 ; i < nListCount; i++)
323323 {
324- TCHAR tszKey[MAX_PATH];
325- TCHAR tszValue[MAX_PATH];
324+ XCHAR tszKey[MAX_PATH];
325+ XCHAR tszValue[MAX_PATH];
326326
327327 memset (tszKey, ' \0 ' , MAX_PATH);
328328 memset (tszValue, ' \0 ' , MAX_PATH);
329329
330- BaseLib_OperatorString_GetKeyValue ((*ppptszList)[i], _T (" =" ), tszKey, tszValue);
330+ BaseLib_OperatorString_GetKeyValue ((*ppptszList)[i], _X (" =" ), tszKey, tszValue);
331331
332- if (0 == _tcsnicmp (lpszHDRFile, tszKey, _tcslen (lpszHDRFile)))
332+ if (0 == _tcsxnicmp (lpszHDRFile, tszKey, _tcsxlen (lpszHDRFile)))
333333 {
334334 // 编码格式是utf8,需要转为ansi
335335#ifdef _MSC_BUILD
336- TCHAR tszFileName[MAX_PATH];
336+ XCHAR tszFileName[MAX_PATH];
337337 memset (tszFileName, ' \0 ' , MAX_PATH);
338338
339- OPenSsl_Codec_UrlDeCodec (tszValue, _tcslen (tszValue), tszFileName);
339+ OPenSsl_Codec_UrlDeCodec (tszValue, _tcsxlen (tszValue), tszFileName);
340340
341- int nLen = _tcslen (tszFileName);
341+ int nLen = _tcsxlen (tszFileName);
342342 BaseLib_OperatorCharset_UTFToAnsi (tszFileName, ptszFileName, &nLen);
343343#else
344- OPenSsl_Codec_UrlDeCodec (tszValue, _tcslen (tszValue), ptszFileName);
344+ OPenSsl_Codec_UrlDeCodec (tszValue, _tcsxlen (tszValue), ptszFileName);
345345#endif
346346 }
347- else if (0 == _tcsnicmp (lpszHDRKey, tszKey, _tcslen (lpszHDRKey)))
347+ else if (0 == _tcsxnicmp (lpszHDRKey, tszKey, _tcsxlen (lpszHDRKey)))
348348 {
349- _tcscpy (ptszKeyName, tszValue);
349+ _tcsxcpy (ptszKeyName, tszValue);
350350 }
351351 }
352352 return true ;
0 commit comments