diff --git a/HLAPI/HLAPI/HLAPI.vcxproj b/HLAPI/HLAPI/HLAPI.vcxproj index 2ba64fb..625e226 100644 --- a/HLAPI/HLAPI/HLAPI.vcxproj +++ b/HLAPI/HLAPI/HLAPI.vcxproj @@ -99,12 +99,12 @@ Disabled true true - D:\VoidNet\include\HLAPI;D:\VoidNet\include + ../../include/HLAPI;../../include/VoidNet stdcpplatest Console - D:\VoidNet\VoidNetVS\x64\Debug\VoidNetVS.lib;WS2_32.lib;%(AdditionalDependencies) + ../../VoidNetVS/x64/Debug/VoidNetVS.lib;WS2_32.lib;%(AdditionalDependencies) diff --git a/TestsVS/Tests/Release/Tests.tlog/CL.command.1.tlog b/TestsVS/Tests/Release/Tests.tlog/CL.command.1.tlog deleted file mode 100644 index f4433fb..0000000 Binary files a/TestsVS/Tests/Release/Tests.tlog/CL.command.1.tlog and /dev/null differ diff --git a/TestsVS/Tests/Release/Tests.tlog/CL.read.1.tlog b/TestsVS/Tests/Release/Tests.tlog/CL.read.1.tlog deleted file mode 100644 index 047a462..0000000 Binary files a/TestsVS/Tests/Release/Tests.tlog/CL.read.1.tlog and /dev/null differ diff --git a/TestsVS/Tests/Release/Tests.tlog/CL.write.1.tlog b/TestsVS/Tests/Release/Tests.tlog/CL.write.1.tlog deleted file mode 100644 index e85ba54..0000000 Binary files a/TestsVS/Tests/Release/Tests.tlog/CL.write.1.tlog and /dev/null differ diff --git a/TestsVS/Tests/Release/Tests.tlog/Tests.lastbuildstate b/TestsVS/Tests/Release/Tests.tlog/Tests.lastbuildstate deleted file mode 100644 index 3d85588..0000000 --- a/TestsVS/Tests/Release/Tests.tlog/Tests.lastbuildstate +++ /dev/null @@ -1,2 +0,0 @@ -#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1 -Release|Win32|F:\VoidNet\VoidNetVS\| diff --git a/TestsVS/Tests/Release/Tests.tlog/link.command.1.tlog b/TestsVS/Tests/Release/Tests.tlog/link.command.1.tlog deleted file mode 100644 index 62783be..0000000 Binary files a/TestsVS/Tests/Release/Tests.tlog/link.command.1.tlog and /dev/null differ diff --git a/TestsVS/Tests/Release/Tests.tlog/link.read.1.tlog b/TestsVS/Tests/Release/Tests.tlog/link.read.1.tlog deleted file mode 100644 index 7ed46ee..0000000 Binary files a/TestsVS/Tests/Release/Tests.tlog/link.read.1.tlog and /dev/null differ diff --git a/TestsVS/Tests/Release/Tests.tlog/link.write.1.tlog b/TestsVS/Tests/Release/Tests.tlog/link.write.1.tlog deleted file mode 100644 index 33fb381..0000000 Binary files a/TestsVS/Tests/Release/Tests.tlog/link.write.1.tlog and /dev/null differ diff --git a/TestsVS/Tests/Tests.cpp b/TestsVS/Tests/Tests.cpp deleted file mode 100644 index aa098d5..0000000 --- a/TestsVS/Tests/Tests.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "Util.hpp" - -#include - -int main() -{ - std::vector bytes = Utility::BitConverter::FromInt32(50000); - int32 integer = Utility::BitConverter::ToInt32(bytes); - std::cout << integer << std::endl; - std::cin.get(); - return 0; -} - diff --git a/TestsVS/Tests/Tests.vcxproj b/TestsVS/Tests/Tests.vcxproj deleted file mode 100644 index 1e194a6..0000000 --- a/TestsVS/Tests/Tests.vcxproj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {41663B22-3949-4570-9AB5-309363EAD56F} - Win32Proj - Tests - 10.0.17763.0 - - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - - - Level3 - Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - D:\VoidNet\include - - - Console - true - D:\VoidNet\VoidNetVS\x64\Debug\VoidNetVS.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - F:\VoidNet\include; - MultiThreaded - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - {5172321e-ccb0-4a77-9f3d-faaf0084f434} - - - - - - \ No newline at end of file diff --git a/TestsVS/Tests/Tests.vcxproj.filters b/TestsVS/Tests/Tests.vcxproj.filters deleted file mode 100644 index 74f2955..0000000 --- a/TestsVS/Tests/Tests.vcxproj.filters +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/VoidNetVS/VoidNetVS.sln b/VoidNetVS/VoidNetVS.sln index a340f35..65fadd1 100644 --- a/VoidNetVS/VoidNetVS.sln +++ b/VoidNetVS/VoidNetVS.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29326.143 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoidNetVS", "VoidNetVS\VoidNetVS.vcxproj", "{5172321E-CCB0-4A77-9F3D-FAAF0084F434}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "..\TestsVS\Tests\Tests.vcxproj", "{41663B22-3949-4570-9AB5-309363EAD56F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLAPI", "..\HLAPI\HLAPI\HLAPI.vcxproj", "{989D0F55-C4B9-44D2-AD2B-DD7E1AAABFC1}" EndProject Global @@ -25,14 +23,6 @@ Global {5172321E-CCB0-4A77-9F3D-FAAF0084F434}.Release|x64.Build.0 = Release|x64 {5172321E-CCB0-4A77-9F3D-FAAF0084F434}.Release|x86.ActiveCfg = Release|Win32 {5172321E-CCB0-4A77-9F3D-FAAF0084F434}.Release|x86.Build.0 = Release|Win32 - {41663B22-3949-4570-9AB5-309363EAD56F}.Debug|x64.ActiveCfg = Debug|x64 - {41663B22-3949-4570-9AB5-309363EAD56F}.Debug|x64.Build.0 = Debug|x64 - {41663B22-3949-4570-9AB5-309363EAD56F}.Debug|x86.ActiveCfg = Debug|Win32 - {41663B22-3949-4570-9AB5-309363EAD56F}.Debug|x86.Build.0 = Debug|Win32 - {41663B22-3949-4570-9AB5-309363EAD56F}.Release|x64.ActiveCfg = Release|x64 - {41663B22-3949-4570-9AB5-309363EAD56F}.Release|x64.Build.0 = Release|x64 - {41663B22-3949-4570-9AB5-309363EAD56F}.Release|x86.ActiveCfg = Release|Win32 - {41663B22-3949-4570-9AB5-309363EAD56F}.Release|x86.Build.0 = Release|Win32 {989D0F55-C4B9-44D2-AD2B-DD7E1AAABFC1}.Debug|x64.ActiveCfg = Debug|x64 {989D0F55-C4B9-44D2-AD2B-DD7E1AAABFC1}.Debug|x64.Build.0 = Debug|x64 {989D0F55-C4B9-44D2-AD2B-DD7E1AAABFC1}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj b/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj index 5331e04..f54eb0a 100644 --- a/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj +++ b/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj @@ -23,41 +23,42 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + {5172321E-CCB0-4A77-9F3D-FAAF0084F434} @@ -123,7 +124,7 @@ Level3 Disabled true - ../../include + ../../include/VoidNet stdcpplatest _WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj.filters b/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj.filters index a22a698..a6f7b68 100644 --- a/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj.filters +++ b/VoidNetVS/VoidNetVS/VoidNetVS.vcxproj.filters @@ -19,106 +19,109 @@ - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - + include\Http - + include\Http - + include\Http - + include\Http - + include\Http - + include\Http - + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + include\Http - - src - - - src - - - src - - - src - - - src - - - src - - - src - - + src\Http - + src\Http - + src\Http - + src\Http - + src\Http - + src\Http + + src\Http + + + src + + + src + + + src + + + src + + + src + + + src + + + src + \ No newline at end of file diff --git a/include/Cookies.hpp b/include/VoidNet/Cookies.hpp similarity index 100% rename from include/Cookies.hpp rename to include/VoidNet/Cookies.hpp diff --git a/include/Enums.hpp b/include/VoidNet/Enums.hpp similarity index 100% rename from include/Enums.hpp rename to include/VoidNet/Enums.hpp diff --git a/include/Headers.hpp b/include/VoidNet/Headers.hpp similarity index 100% rename from include/Headers.hpp rename to include/VoidNet/Headers.hpp diff --git a/include/Http.hpp b/include/VoidNet/Http.hpp similarity index 100% rename from include/Http.hpp rename to include/VoidNet/Http.hpp diff --git a/include/IPAddress.hpp b/include/VoidNet/IPAddress.hpp similarity index 100% rename from include/IPAddress.hpp rename to include/VoidNet/IPAddress.hpp diff --git a/include/ISocket.hpp b/include/VoidNet/ISocket.hpp similarity index 100% rename from include/ISocket.hpp rename to include/VoidNet/ISocket.hpp diff --git a/include/Init.hpp b/include/VoidNet/Init.hpp similarity index 100% rename from include/Init.hpp rename to include/VoidNet/Init.hpp diff --git a/include/Net.hpp b/include/VoidNet/Net.hpp similarity index 95% rename from include/Net.hpp rename to include/VoidNet/Net.hpp index d06f6dd..e8822f3 100644 --- a/include/Net.hpp +++ b/include/VoidNet/Net.hpp @@ -28,7 +28,6 @@ #define SOCKET int #define closesocket close - #define ioctlsocket ioctl int closesocket(SOCKET soc) { diff --git a/include/Parse.hpp b/include/VoidNet/Parse.hpp similarity index 100% rename from include/Parse.hpp rename to include/VoidNet/Parse.hpp diff --git a/include/Request.hpp b/include/VoidNet/Request.hpp similarity index 100% rename from include/Request.hpp rename to include/VoidNet/Request.hpp diff --git a/include/Response.hpp b/include/VoidNet/Response.hpp similarity index 100% rename from include/Response.hpp rename to include/VoidNet/Response.hpp diff --git a/include/SecureSocket.hpp b/include/VoidNet/SecureSocket.hpp similarity index 100% rename from include/SecureSocket.hpp rename to include/VoidNet/SecureSocket.hpp diff --git a/include/Socket.hpp b/include/VoidNet/Socket.hpp similarity index 100% rename from include/Socket.hpp rename to include/VoidNet/Socket.hpp diff --git a/include/TcpClient.hpp b/include/VoidNet/TcpClient.hpp similarity index 100% rename from include/TcpClient.hpp rename to include/VoidNet/TcpClient.hpp diff --git a/include/TcpListener.hpp b/include/VoidNet/TcpListener.hpp similarity index 100% rename from include/TcpListener.hpp rename to include/VoidNet/TcpListener.hpp diff --git a/include/TcpSocketBuilder.hpp b/include/VoidNet/TcpSocketBuilder.hpp similarity index 100% rename from include/TcpSocketBuilder.hpp rename to include/VoidNet/TcpSocketBuilder.hpp diff --git a/include/UdpSocket.hpp b/include/VoidNet/UdpSocket.hpp similarity index 100% rename from include/UdpSocket.hpp rename to include/VoidNet/UdpSocket.hpp diff --git a/include/UdpSocketBuilder.hpp b/include/VoidNet/UdpSocketBuilder.hpp similarity index 100% rename from include/UdpSocketBuilder.hpp rename to include/VoidNet/UdpSocketBuilder.hpp diff --git a/include/Uri.hpp b/include/VoidNet/Uri.hpp similarity index 100% rename from include/Uri.hpp rename to include/VoidNet/Uri.hpp diff --git a/include/Util.hpp b/include/VoidNet/Util.hpp similarity index 100% rename from include/Util.hpp rename to include/VoidNet/Util.hpp diff --git a/src/HLAPI/TcpConnectionHandler.cpp b/src/HLAPI/TcpConnectionHandler.cpp index 5278c0c..52b7394 100644 --- a/src/HLAPI/TcpConnectionHandler.cpp +++ b/src/HLAPI/TcpConnectionHandler.cpp @@ -82,7 +82,7 @@ namespace std::net uint32_t TcpConnectionHandler::GetAvailableID() { - for (int i = 1; i <= m_maxConnections; i++) + for (uint32_t i = 1; i <= m_maxConnections; i++) { bool flag = true; m_listMutex.lock(); diff --git a/src/Cookies.cpp b/src/VoidNet/Cookies.cpp similarity index 100% rename from src/Cookies.cpp rename to src/VoidNet/Cookies.cpp diff --git a/src/Headers.cpp b/src/VoidNet/Headers.cpp similarity index 100% rename from src/Headers.cpp rename to src/VoidNet/Headers.cpp diff --git a/src/Http.cpp b/src/VoidNet/Http.cpp similarity index 100% rename from src/Http.cpp rename to src/VoidNet/Http.cpp diff --git a/src/IPAddress.cpp b/src/VoidNet/IPAddress.cpp similarity index 100% rename from src/IPAddress.cpp rename to src/VoidNet/IPAddress.cpp diff --git a/src/Parse.cpp b/src/VoidNet/Parse.cpp similarity index 100% rename from src/Parse.cpp rename to src/VoidNet/Parse.cpp diff --git a/src/Request.cpp b/src/VoidNet/Request.cpp similarity index 100% rename from src/Request.cpp rename to src/VoidNet/Request.cpp diff --git a/src/Response.cpp b/src/VoidNet/Response.cpp similarity index 100% rename from src/Response.cpp rename to src/VoidNet/Response.cpp diff --git a/src/SecureSocket.cpp b/src/VoidNet/SecureSocket.cpp similarity index 100% rename from src/SecureSocket.cpp rename to src/VoidNet/SecureSocket.cpp diff --git a/src/Socket.cpp b/src/VoidNet/Socket.cpp similarity index 100% rename from src/Socket.cpp rename to src/VoidNet/Socket.cpp diff --git a/src/TcpClient.cpp b/src/VoidNet/TcpClient.cpp similarity index 100% rename from src/TcpClient.cpp rename to src/VoidNet/TcpClient.cpp diff --git a/src/TcpListener.cpp b/src/VoidNet/TcpListener.cpp similarity index 100% rename from src/TcpListener.cpp rename to src/VoidNet/TcpListener.cpp diff --git a/src/TcpSocketBuilder.cpp b/src/VoidNet/TcpSocketBuilder.cpp similarity index 100% rename from src/TcpSocketBuilder.cpp rename to src/VoidNet/TcpSocketBuilder.cpp diff --git a/src/UdpSocket.cpp b/src/VoidNet/UdpSocket.cpp similarity index 100% rename from src/UdpSocket.cpp rename to src/VoidNet/UdpSocket.cpp diff --git a/src/Uri.cpp b/src/VoidNet/Uri.cpp similarity index 100% rename from src/Uri.cpp rename to src/VoidNet/Uri.cpp