organize folders

2022-06-07 02:02:20 -07:00 · 2022-06-07 02:02:20 -07:00 · ad730e446c
parent c1f38fc76a
commit ad730e446c
25 changed files with 87 additions and 79 deletions
--- a/PolygonClientUtilities/Hooks/Application.cpp
+++ b/PolygonClientUtilities/Hooks/Application.cpp
@ -1,7 +1,8 @@
 #include "pch.h"
-#include "Application.h"
+
 #include "Patches.h"
 #include "Util.h"
+#include "Hooks/Application.h"

 #if defined(ARBITERBUILD) && defined(PLAYER2012)

--- a/PolygonClientUtilities/Hooks/CRoblox.cpp
+++ b/PolygonClientUtilities/Hooks/CRoblox.cpp
@ -1,5 +1,6 @@
 #include "pch.h"
-#include "CRoblox.h"
+
+#include "Hooks/CRoblox.h"

 #if defined(MFC2010) || defined(MFC2011)

--- a/PolygonClientUtilities/Hooks/Context.cpp
+++ b/PolygonClientUtilities/Hooks/Context.cpp
@ -1,6 +1,7 @@
 #include "pch.h"
-#include "Context.h"
+
 #include "Util.h"
+#include "Hooks/Context.h"

 #ifdef _DEBUG

--- a/PolygonClientUtilities/Hooks/Crypt.cpp
+++ b/PolygonClientUtilities/Hooks/Crypt.cpp
@ -1,7 +1,9 @@
 #include "pch.h"
-#include "Crypt.h"
+
 #include "Patches.h"
 #include "Util.h"
+#include "Hooks/Crypt.h"
+

 Crypt::Crypt()
 {
--- a/PolygonClientUtilities/Hooks/Http.cpp
+++ b/PolygonClientUtilities/Hooks/Http.cpp
@ -1,6 +1,7 @@
 #include "pch.h"
-#include "Http.h"
+
 #include "Util.h"
+#include "Hooks/Http.h"

 #define CHECK(condition, code) \
    if(!error) {               \
--- a/PolygonClientUtilities/Hooks/ServerReplicator.cpp
+++ b/PolygonClientUtilities/Hooks/ServerReplicator.cpp
@ -1,5 +1,6 @@
 #include "pch.h"
-#include "ServerReplicator.h"
+
+#include "Hooks/ServerReplicator.h"

 #if defined(ARBITERBUILD) && defined(MFC2011)

--- a/PolygonClientUtilities/Hooks/StandardOut.cpp
+++ b/PolygonClientUtilities/Hooks/StandardOut.cpp
@ -1,6 +1,7 @@
 #include "pch.h"
-#include "StandardOut.h"
+
 #include "Patches.h"
+#include "Hooks/StandardOut.h"

 HANDLE outputHandle;

--- a/PolygonClientUtilities/Include/Classes.h
+++ b/PolygonClientUtilities/Include/Classes.h
@ -1,8 +1,9 @@
 #pragma once

-#include "Config.h"
 #include <oaidl.h>

+#include "Config.h"
+
 // TODO: These need a place

 struct DataModel
--- a/PolygonClientUtilities/Include/Config.h
+++ b/PolygonClientUtilities/Include/Config.h
--- a/PolygonClientUtilities/Include/Hooks/Application.h
+++ b/PolygonClientUtilities/Include/Hooks/Application.h
--- a/PolygonClientUtilities/Include/Hooks/CRoblox.h
+++ b/PolygonClientUtilities/Include/Hooks/CRoblox.h
--- a/PolygonClientUtilities/Include/Hooks/Context.h
+++ b/PolygonClientUtilities/Include/Hooks/Context.h
--- a/PolygonClientUtilities/Include/Hooks/Crypt.h
+++ b/PolygonClientUtilities/Include/Hooks/Crypt.h
@ -1,8 +1,9 @@
 #pragma once

-#include "Classes.h"
 #include <wincrypt.h>

+#include "Classes.h"
+
 typedef void(__thiscall* Crypt__verifySignatureBase64_t)(HCRYPTPROV* _this, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);
 void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);
 extern Crypt__verifySignatureBase64_t Crypt__verifySignatureBase64;
--- a/PolygonClientUtilities/Include/Hooks/Http.h
+++ b/PolygonClientUtilities/Include/Hooks/Http.h
@ -1,9 +1,10 @@
 #pragma once

-#include "Classes.h"
 #include <curl/curl.h>
 #include <rapidjson/document.h>

+#include "Classes.h"
+
 struct Http
 {
 #if PADDING_STRUCT != 0
--- a/PolygonClientUtilities/Include/Hooks/ServerReplicator.h
+++ b/PolygonClientUtilities/Include/Hooks/ServerReplicator.h
--- a/PolygonClientUtilities/Include/Hooks/StandardOut.h
+++ b/PolygonClientUtilities/Include/Hooks/StandardOut.h
--- a/PolygonClientUtilities/Include/Patches.h
+++ b/PolygonClientUtilities/Include/Patches.h
@ -1,5 +1,7 @@
 #pragma once

+#include <detours/detours.h>
+
 namespace Patches
 {
    typedef std::pair<void**, void*> Patch;
--- a/PolygonClientUtilities/Include/Util.h
+++ b/PolygonClientUtilities/Include/Util.h
@ -1,6 +1,5 @@
 #pragma once

-#include "pch.h"
 #include <string_view>

 class Util
--- a/PolygonClientUtilities/Include/framework.h
+++ b/PolygonClientUtilities/Include/framework.h
--- a/PolygonClientUtilities/Include/pch.h
+++ b/PolygonClientUtilities/Include/pch.h
@ -1,6 +1,6 @@
 #pragma once

-#include <Windows.h>
+#include <windows.h>
 #include <iomanip>
 #include <iostream>
 #include <fstream>
--- a/PolygonClientUtilities/Patches.cpp
+++ b/PolygonClientUtilities/Patches.cpp
@ -1,7 +1,6 @@
 #include "pch.h"
-#include "Patches.h"

-#include <detours/detours.h>
+#include "Patches.h"

 int addressOffset;

--- a/PolygonClientUtilities/PolygonClientUtilities.vcxproj
+++ b/PolygonClientUtilities/PolygonClientUtilities.vcxproj
@ -64,8 +64,7 @@
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Link>
@ -90,8 +89,7 @@
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <Optimization>Disabled</Optimization>
      <WholeProgramOptimization>false</WholeProgramOptimization>
      <LanguageStandard>stdcpp17</LanguageStandard>
@ -111,36 +109,34 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClInclude Include="Config.h" />
-    <ClInclude Include="Context.h" />
-    <ClInclude Include="CRoblox.h" />
-    <ClInclude Include="Application.h" />
-    <ClInclude Include="StandardOut.h" />
-    <ClInclude Include="ServerReplicator.h" />
-    <ClInclude Include="Http.h" />
-    <ClInclude Include="Patches.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="Classes.h" />
-    <ClInclude Include="Util.h" />
-    <ClInclude Include="Crypt.h" />
+    <ClInclude Include="Include\Config.h" />
+    <ClInclude Include="Include\Hooks\Context.h" />
+    <ClInclude Include="Include\Hooks\CRoblox.h" />
+    <ClInclude Include="Include\Hooks\Application.h" />
+    <ClInclude Include="Include\Hooks\StandardOut.h" />
+    <ClInclude Include="Include\Hooks\ServerReplicator.h" />
+    <ClInclude Include="Include\Hooks\Http.h" />
+    <ClInclude Include="Include\Patches.h" />
+    <ClInclude Include="Include\pch.h" />
+    <ClInclude Include="Include\Classes.h" />
+    <ClInclude Include="Include\Util.h" />
+    <ClInclude Include="Include\Hooks\Crypt.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="Context.cpp" />
+    <ClCompile Include="Hooks\Context.cpp" />
    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="CRoblox.cpp" />
+    <ClCompile Include="Hooks\CRoblox.cpp" />
    <ClCompile Include="Patches.cpp" />
    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="Application.cpp" />
-    <ClCompile Include="StandardOut.cpp" />
-    <ClCompile Include="ServerReplicator.cpp" />
-    <ClCompile Include="Http.cpp" />
+    <ClCompile Include="Hooks\Application.cpp" />
+    <ClCompile Include="Hooks\StandardOut.cpp" />
+    <ClCompile Include="Hooks\ServerReplicator.cpp" />
+    <ClCompile Include="Hooks\Http.cpp" />
    <ClCompile Include="Util.cpp" />
-    <ClCompile Include="Crypt.cpp" />
+    <ClCompile Include="Hooks\Crypt.cpp" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/PolygonClientUtilities/PolygonClientUtilities.vcxproj.filters
+++ b/PolygonClientUtilities/PolygonClientUtilities.vcxproj.filters
@ -21,42 +21,42 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="pch.h">
+    <ClInclude Include="Include\pch.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Classes.h">
+    <ClInclude Include="Include\Patches.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Patches.h">
+    <ClInclude Include="Include\Config.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Config.h">
+    <ClInclude Include="Include\Util.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Util.h">
+    <ClInclude Include="Include\Hooks\Crypt.h">
+      <Filter>Header Files\Hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\Hooks\CRoblox.h">
+      <Filter>Header Files\Hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\Hooks\Application.h">
+      <Filter>Header Files\Hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\Hooks\ServerReplicator.h">
+      <Filter>Header Files\Hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\Hooks\StandardOut.h">
+      <Filter>Header Files\Hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\Hooks\Http.h">
+      <Filter>Header Files\Hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\Hooks\Context.h">
+      <Filter>Header Files\Hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="Include\Classes.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Crypt.h">
-      <Filter>Header Files\Hooks</Filter>
-    </ClInclude>
-    <ClInclude Include="CRoblox.h">
-      <Filter>Header Files\Hooks</Filter>
-    </ClInclude>
-    <ClInclude Include="Application.h">
-      <Filter>Header Files\Hooks</Filter>
-    </ClInclude>
-    <ClInclude Include="ServerReplicator.h">
-      <Filter>Header Files\Hooks</Filter>
-    </ClInclude>
-    <ClInclude Include="StandardOut.h">
-      <Filter>Header Files\Hooks</Filter>
-    </ClInclude>
-    <ClInclude Include="Http.h">
-      <Filter>Header Files\Hooks</Filter>
-    </ClInclude>
-    <ClInclude Include="Context.h">
-      <Filter>Header Files\Hooks</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp">
@ -71,25 +71,25 @@
    <ClCompile Include="Util.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Crypt.cpp">
+    <ClCompile Include="Hooks\Crypt.cpp">
      <Filter>Source Files\Hooks</Filter>
    </ClCompile>
-    <ClCompile Include="CRoblox.cpp">
+    <ClCompile Include="Hooks\CRoblox.cpp">
      <Filter>Source Files\Hooks</Filter>
    </ClCompile>
-    <ClCompile Include="Application.cpp">
+    <ClCompile Include="Hooks\Application.cpp">
      <Filter>Source Files\Hooks</Filter>
    </ClCompile>
-    <ClCompile Include="ServerReplicator.cpp">
+    <ClCompile Include="Hooks\ServerReplicator.cpp">
      <Filter>Source Files\Hooks</Filter>
    </ClCompile>
-    <ClCompile Include="StandardOut.cpp">
+    <ClCompile Include="Hooks\StandardOut.cpp">
      <Filter>Source Files\Hooks</Filter>
    </ClCompile>
-    <ClCompile Include="Http.cpp">
+    <ClCompile Include="Hooks\Http.cpp">
      <Filter>Source Files\Hooks</Filter>
    </ClCompile>
-    <ClCompile Include="Context.cpp">
+    <ClCompile Include="Hooks\Context.cpp">
      <Filter>Source Files\Hooks</Filter>
    </ClCompile>
  </ItemGroup>
--- a/PolygonClientUtilities/Util.cpp
+++ b/PolygonClientUtilities/Util.cpp
@ -1,4 +1,5 @@
 #include "pch.h"
+
 #include "Util.h"

 // this is ifdef guarded so that the public key cannot easily be replaced
--- a/PolygonClientUtilities/dllmain.cpp
+++ b/PolygonClientUtilities/dllmain.cpp
@ -2,27 +2,27 @@
 #include "Config.h"
 #include "Patches.h"

-#include "Http.h"
-#include "Crypt.h"
+#include "Hooks/Http.h"
+#include "Hooks/Crypt.h"

 #ifdef _DEBUG
-#include "Context.h"
+#include "Hooks/Context.h"
 #endif

 #if defined(ARBITERBUILD)
-#include "StandardOut.h"
+#include "Hooks/StandardOut.h"
 #endif

 #if defined(ARBITERBUILD) && defined(MFC2011)
-#include "ReplicatorSecurity.h"
+#include "Hooks/ReplicatorSecurity.h"
 #endif

 #if defined(ARBITERBUILD) && defined(PLAYER2012)
-#include "Application.h"
+#include "Hooks/Application.h"
 #endif

 #if defined(MFC2010) || defined(MFC2011)
-#include "CRoblox.h"
+#include "Hooks/CRoblox.h"
 #endif

 START_PATCH_LIST()