diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json index 58f2a323b302c08fad5cfa26aef84d84f1c0b86e..89914cc063519ef0fc5ca8d7ed5ae4488bc9f7dd 100644 --- a/XEngine_Release/XEngine_Config/XEngine_Config.json +++ b/XEngine_Release/XEngine_Config/XEngine_Config.json @@ -75,6 +75,7 @@ }, "XVer":{ "StorageVersion":[ + "3.4.1.1001 Build20220126", "3.4.0.1001 Build20220121", "3.3.0.1001 Build20220106", "3.2.0.1001 Build20211211", diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp b/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp index 5d73f9201d170c9fcc9e9e21b1fc1fb27ca80ea4..d717a2126ca272951b5d5c8066f99e02d43cd7fc 100644 --- a/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp +++ b/XEngine_Source/StorageModule_APIHelp/APIHelp_Api/APIHelp_Api.cpp @@ -54,7 +54,6 @@ BOOL CAPIHelp_Api::APIHelp_Api_ProxyAuth(TCHAR* ptszUser, TCHAR* ptszPass, TCHAR { APIHelp_IsErrorOccur = FALSE; - int nSDLen = 1024; int nAuthType = 0; int nAuthLen = MAX_PATH; diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp b/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp index a72bdd5f860d7e3a69501741e7818c61d55a209b..0b784e76736ef8561708e958e4e392092f28d220 100644 --- a/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp +++ b/XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp @@ -257,6 +257,25 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_UPStorage(LPCTSTR lpszMsgBuffer, { return FALSE; } + //判断目录大小是否正常 + int nListCount = 0; + __int64u nDirCount = 0; //当前目录大小 + CHAR** ppListFile; + SystemApi_File_EnumFile(pSt_StorageBucket->tszFilePath, &ppListFile, &nListCount, NULL, NULL, TRUE, 1); + for (int j = 0; j < nListCount; j++) + { + struct __stat64 st_FStat; + _stat64(ppListFile[j], &st_FStat); + nDirCount += st_FStat.st_size; + } + BaseLib_OperatorMemory_Free((XPPPMEM)&ppListFile, nListCount); + //如果当前目录大小大于设定的大小. + if (nDirCount >= APIHelp_Distributed_GetSize(pSt_StorageBucket->tszBuckSize)) + { + APIHelp_IsErrorOccur = TRUE; + APIHelp_dwErrorCode = ERROR_STORAGE_MODULE_APIHELP_SIZE; + return FALSE; + } } else { diff --git a/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h b/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h index aa66fd142a31e1c0d2e442a285d4339d5e70ee92..59f39595e446dffff2ace9a07d2cdeb210f6eced 100644 --- a/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h +++ b/XEngine_Source/StorageModule_APIHelp/APIHelp_Error.h @@ -18,4 +18,5 @@ #define ERROR_STORAGE_MODULE_APIHELP_NOTLENGTH 0x0030012 //娌℃湁闀垮害淇℃伅 #define ERROR_STORAGE_MODULE_APIHELP_PARSELEN 0x0030013 //瑙ｆ瀽闀垮害澶辫触 #define ERROR_STORAGE_MODULE_APIHELP_NOTHASH 0x0030014 //娌℃湁HASH鍊 -#define ERROR_STORAGE_MODULE_APIHELP_NOTMATCH 0x0030015 //HASH涓嶅尮閰 \ No newline at end of file +#define ERROR_STORAGE_MODULE_APIHELP_NOTMATCH 0x0030015 //HASH涓嶅尮閰 +#define ERROR_STORAGE_MODULE_APIHELP_SIZE 0x0030016 //鐩綍澶у皬宸茬粡婊′簡 \ No newline at end of file diff --git a/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj b/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj index 95b37e623ccedae9f41f4c1aab8958b348bc02fa..16cc326ec3b768b895e6089eed6ea566dab84da6 100644 --- a/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj +++ b/XEngine_Source/StorageModule_APIHelp/StorageModule_APIHelp.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -131,7 +133,7 @@ Level3 true - _DEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULEAPIHELP_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj b/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj index 65c20d35d9185a76380680add2aaf1a0a803519a..29a564a0b9d4c361d25e8d7458c25a2f02339ab1 100644 --- a/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj +++ b/XEngine_Source/StorageModule_Config/StorageModule_Config.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -81,6 +81,7 @@ true + $(XEngine_Include);$(IncludePath) false @@ -129,7 +130,7 @@ Level3 true - _DEBUG;STORAGEMODULECONFIG_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULECONFIG_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj b/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj index c977589f46f05f0717ac284ddb057b49a0c657cd..624c519a95b44bd3fd6dc256c4b0f802449f8492 100644 --- a/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj +++ b/XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -131,7 +133,7 @@ Level3 true - _DEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULEPROTOCOL_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj b/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj index ea7f39b977e1c02dccb3725aa837ae0ee43ba048..9d77abcf1d6f8ef6e171c8fab0358601b5cb5f4a 100644 --- a/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj +++ b/XEngine_Source/StorageModule_Session/StorageModule_Session.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -73,20 +73,22 @@ true $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib64);$(LibraryPath) @@ -131,7 +133,7 @@ Level3 true - _DEBUG;STORAGEMODULESESSION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;STORAGEMODULESESSION_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/StorageModule_Session/pch.h b/XEngine_Source/StorageModule_Session/pch.h index 05b469ca37f20810915fc8aea1c1b4fd4f06bfa9..25d26343258969683230b0b68ec03e1585d01a0a 100644 --- a/XEngine_Source/StorageModule_Session/pch.h +++ b/XEngine_Source/StorageModule_Session/pch.h @@ -11,6 +11,7 @@ // 娣诲姞瑕佸湪姝ゅ棰勭紪璇戠殑鏍囧ご #include "framework.h" #include +#include #else #include #endif @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -50,9 +50,5 @@ extern BOOL Session_IsErrorOccur; extern DWORD Session_dwErrorCode; #ifdef _WINDOWS -#ifdef _WIN64 -#pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib.lib") -#else -#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib.lib") -#endif +#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib") #endif \ No newline at end of file diff --git a/XEngine_Source/VSCopy_x64.bat b/XEngine_Source/VSCopy_x64.bat new file mode 100644 index 0000000000000000000000000000000000000000..5f12f971e71e058bb2c9aea5e0ede3bb6df981df --- /dev/null +++ b/XEngine_Source/VSCopy_x64.bat @@ -0,0 +1,27 @@ +copy /y "%XEngine_Library%\x64\XEngine_BaseLib\XEngine_BaseLib.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_BaseLib\XEngine_Algorithm.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_Core.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_ManagePool.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_NetXApi.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_Core\XEngine_OPenSsl.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_SystemSdk\XEngine_SystemApi.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\HelpComponents_DataBase.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\HelpComponents_Packets.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\HelpComponents_XLog.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_NetHelp\NetHelp_APIHelp.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_RfcComponents\RfcComponents_HttpServer.dll" "./" + +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\bson-1.0.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\mongoc-1.0.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\libmariadb.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\libpq.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\sqlite3.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\zlib1.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_HelpComponents\plugin\caching_sha2_password.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_LibEx\libcrypto-1_1.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_LibEx\libssl-1_1.dll" "./" +copy /y "%XEngine_Library%\x64\XEngine_LibEx\libcurl.dll" "./" \ No newline at end of file diff --git a/XEngine_Source/VSCopy.bat b/XEngine_Source/VSCopy_x86.bat similarity index 100% rename from XEngine_Source/VSCopy.bat rename to XEngine_Source/VSCopy_x86.bat diff --git a/XEngine_Source/XEngine_StorageApp/Makefile b/XEngine_Source/XEngine_StorageApp/Makefile index 92debd551b0e3288ed76316e5918c9dbbda8aabf..0dea35c48be781d5d62597544d6b88fdf2a63e44 100644 --- a/XEngine_Source/XEngine_StorageApp/Makefile +++ b/XEngine_Source/XEngine_StorageApp/Makefile @@ -5,7 +5,7 @@ LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XE LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_NetXApi -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpServer -lNetHelp_APIHelp -lXStorage_SQLPacket -lXStorage_P2XPPeer -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol LIBEX = -static-libgcc -ldl -lrt -lpthread LOADSO = -Wl,-rpath=./,--disable-new-dtags -LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_APPHelp.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o +LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o StorageApp_P2XPNet.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o ifeq ($(RELEASE),1) FLAGS = -c -O2 @@ -36,9 +36,7 @@ StorageApp_UPLoader.o:./StorageApp_UPLoader.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./StorageApp_UPLoader.cpp StorageApp_P2XPNet.o:./StorageApp_P2XPNet.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./StorageApp_P2XPNet.cpp - -Storage_APPHelp.o:./Storage_APPHelp/Storage_APPHelp.cpp - $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPHelp/Storage_APPHelp.cpp + Storage_TaskPass.o:./Storage_APPTask/Storage_TaskPass.cpp $(CC) $(DEBUG) $(FLAGS) $(UNICODE) ./Storage_APPTask/Storage_TaskPass.cpp Storage_TaskManage.o:./Storage_APPTask/Storage_TaskManage.cpp diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp index 8106562b0ba2b29948d799e4f8a215bcb5dc6148..a98ed28d3eeb72c3676e024e1951f0a14c0cf03e 100644 --- a/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp +++ b/XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp @@ -64,7 +64,6 @@ void CALLBACK XEngine_Download_CBSend(LPCSTR lpszClientAddr, SOCKET hSocket, LPV memset(&st_StorageInfo, '\0', sizeof(SESSION_STORAGEINFO)); Session_DLStroage_GetInfo(lpszClientAddr, &st_StorageInfo); - Protocol_StoragePacket_UPDown(tszProxyStr, &nPLen, st_StorageInfo.tszFileDir, st_StorageInfo.tszBuckKey, st_StorageInfo.tszClientAddr, st_StorageInfo.ullRWCount, TRUE, st_StorageInfo.tszFileHash); if (APIHelp_HttpRequest_Post(st_ServiceCfg.st_XProxy.st_XProxyPass.tszDLPass, tszProxyStr, &nHttpCode)) { diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h b/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h index 560b6ea3705b5181a57cf0559aeb93319c9a5521..3d15619e84669a3c2819694cf3958c60a7a14c20 100644 --- a/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h +++ b/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -14,6 +13,7 @@ #ifdef _WINDOWS #include #include +#include #else #include #include @@ -128,12 +128,21 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg; #pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp.lib") #pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi.lib") #ifdef _WIN64 +#ifdef _DEBUG +#pragma comment(lib,"../x64/Debug/StorageModule_Session.lib") +#pragma comment(lib,"../x64/Debug/StorageModule_Config.lib") +#pragma comment(lib,"../x64/Debug/StorageModule_APIHelp.lib") +#pragma comment(lib,"../x64/Debug/StorageModule_Protocol.lib") +#pragma comment(lib,"../x64/Debug/XStorage_SQLPacket.lib") +#pragma comment(lib,"../x64/Debug/XStorage_P2XPPeer.lib") +#else #pragma comment(lib,"../x64/Release/StorageModule_Session.lib") #pragma comment(lib,"../x64/Release/StorageModule_Config.lib") #pragma comment(lib,"../x64/Release/StorageModule_APIHelp.lib") #pragma comment(lib,"../x64/Release/StorageModule_Protocol.lib") #pragma comment(lib,"../x64/Release/XStorage_SQLPacket.lib") #pragma comment(lib,"../x64/Release/XStorage_P2XPPeer.lib") +#endif #else #ifdef _DEBUG #pragma comment(lib,"../Debug/StorageModule_Session.lib") diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp index 086ebbb8a002a0ace485604b891691bc3b1319e7..99fca49e8ef47db78fda5dde3713bf8297e60300 100644 --- a/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp +++ b/XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp @@ -148,6 +148,11 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in if (!APIHelp_Distributed_UPStorage(pSt_HTTPParam->tszHttpUri, st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket, &st_StorageBucket, st_LoadbalanceCfg.st_LBLocation.nUPLoadMode)) { + st_HDRParam.bIsClose = TRUE; + st_HDRParam.nHttpCode = 413; + + RfcComponents_HttpServer_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam); + XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER); XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("涓婁紶瀹㈡埛绔:%s,璇锋眰涓婁紶鏂囦欢澶辫触,鍙兘BUCKET:% 涓嶆纭,閿欒锛%lX"), lpszClientAddr, pSt_HTTPParam->tszHttpUri, APIHelp_GetLastError()); return FALSE; } diff --git a/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj b/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj index 3386144e3a97335203c63fd60d81cdad97d86e45..23df15483d1cf7d95bd0cf00353cd92d2064ec7f 100644 --- a/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj +++ b/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.vcxproj @@ -43,7 +43,7 @@ Application true v142 - Unicode + MultiByte Application @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -123,7 +125,7 @@ Level3 true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj b/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj index 9f15567081f442bb3eff4e254e810d561e27b218..759d64bf7083fb5a909d296b4beed9b0222db239 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_P2XPPeer/XStorage_P2XPPeer.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -82,6 +82,8 @@ true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false @@ -131,7 +133,7 @@ Level3 true - _DEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;XSTORAGEP2XPPEER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp index 4085548588fd8505a22c403f6f574b90175735d0..938e69a269d353d7a1f657372a7b84a3eba27d87 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLHelp/XStorage_SQLHelp.cpp @@ -163,7 +163,6 @@ BOOL CXStorage_SQLHelp::XStorage_SQLHelp_Query(TCHAR* ptszSQLBuffer, LPCTSTR lps { XStorage_IsErrorOccur = FALSE; - BOOL bInit = FALSE; TCHAR tszSQLQuery[1024]; memset(tszSQLQuery, '\0', sizeof(tszSQLQuery)); diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj index 780d2331b42fd143faa21017f167185782c59ac9..dd52e08c6a44f3d667ad5f88bb12f005aa09e17d 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/XStorage_SQLPacket.vcxproj @@ -43,7 +43,7 @@ DynamicLibrary true v142 - Unicode + MultiByte DynamicLibrary @@ -73,20 +73,22 @@ true $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib32);$(LibraryPath) true + $(XEngine_Include);$(IncludePath) + $(XEngine_Lib64);$(LibraryPath) false $(XEngine_Include);$(IncludePath) - $(XEngine_Library);$(LibraryPath) + $(XEngine_Lib64);$(LibraryPath) @@ -131,7 +133,7 @@ Level3 true - _DEBUG;XSTORAGESQLPACKET_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _DEBUG;XSTORAGESQLPACKET_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Use pch.h diff --git a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h index ab4b5e94900796717ce6294d605f106ecfac788f..5cdd5114d1b745ea3658c85924c9d7c3a5dea6a0 100644 --- a/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h +++ b/XEngine_Source/XEngine_StorageComponents/XStorage_SQLPacket/pch.h @@ -55,13 +55,6 @@ extern BOOL XStorage_IsErrorOccur; extern DWORD XStorage_dwErrorCode; #ifdef _WINDOWS -#ifdef _WIN64 -#pragma comment(lib,"x64/XEngine_BaseLib/XEngine_BaseLib.lib") -#pragma comment(lib,"x64/XEngine_HelpComponents/HelpComponents_DataBase.lib") -#else -#pragma comment(lib,"x86/XEngine_BaseLib/XEngine_BaseLib.lib") -#pragma comment(lib,"x86/XEngine_HelpComponents/HelpComponents_DataBase.lib") -#endif // _WIN64 -#else - +#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib") +#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_DataBase.lib") #endif