From d6b6b51663127a4b3ea81a29a37aac274c75a701 Mon Sep 17 00:00:00 2001
From: _ <🐱>
Date: Tue, 1 Dec 2020 20:22:30 -0700
Subject: [PATCH] Sort tiny-AES-c files to its own folder and filter

---
 SpotifyKeyDumper/SpotifyKeyDumper.vcxproj     | 75 +------------------
 .../SpotifyKeyDumper.vcxproj.filters          | 18 +++--
 SpotifyKeyDumper/Utils.cpp                    |  2 +-
 SpotifyKeyDumper/{ => tiny-AES-c}/aes.cpp     |  0
 SpotifyKeyDumper/{ => tiny-AES-c}/aes.h       |  0
 SpotifyKeyDumper/{ => tiny-AES-c}/aes.hpp     |  0
 6 files changed, 16 insertions(+), 79 deletions(-)
 rename SpotifyKeyDumper/{ => tiny-AES-c}/aes.cpp (100%)
 rename SpotifyKeyDumper/{ => tiny-AES-c}/aes.h (100%)
 rename SpotifyKeyDumper/{ => tiny-AES-c}/aes.hpp (100%)

diff --git a/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj b/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj
index 073af86..dfe6e71 100644
--- a/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj
+++ b/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj
@@ -9,14 +9,6 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -39,19 +31,6 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -63,12 +42,6 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -76,12 +49,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -120,58 +87,22 @@
       <EnableUAC>false</EnableUAC>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;SPOTIFYKEYDUMPER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;SPOTIFYKEYDUMPER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="aes.h" />
-    <ClInclude Include="aes.hpp" />
     <ClInclude Include="framework.h" />
     <ClInclude Include="Hooks.h" />
     <ClInclude Include="pch.h" />
+    <ClInclude Include="tiny-AES-c\aes.h" />
+    <ClInclude Include="tiny-AES-c\aes.hpp" />
     <ClInclude Include="Utils.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="aes.cpp" />
     <ClCompile Include="Hooks.cpp" />
     <ClCompile Include="SpotifyKeyDumper.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="tiny-AES-c\aes.cpp" />
     <ClCompile Include="Utils.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj.filters b/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj.filters
index d136835..f0c0dea 100644
--- a/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj.filters
+++ b/SpotifyKeyDumper/SpotifyKeyDumper.vcxproj.filters
@@ -13,6 +13,12 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Header Files\tiny-AES-c">
+      <UniqueIdentifier>{8e76b192-c74c-4f62-befa-c8117e9defe5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\tiny-AES-c">
+      <UniqueIdentifier>{794ebf5e-1d3a-45c2-8727-cd75a158fd2f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="framework.h">
@@ -27,11 +33,11 @@
     <ClInclude Include="Utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="aes.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="tiny-AES-c\aes.h">
+      <Filter>Header Files\tiny-AES-c</Filter>
     </ClInclude>
-    <ClInclude Include="aes.hpp">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="tiny-AES-c\aes.hpp">
+      <Filter>Header Files\tiny-AES-c</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -47,8 +53,8 @@
     <ClCompile Include="Utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="aes.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="tiny-AES-c\aes.cpp">
+      <Filter>Source Files\tiny-AES-c</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SpotifyKeyDumper/Utils.cpp b/SpotifyKeyDumper/Utils.cpp
index ed35d52..a389bab 100644
--- a/SpotifyKeyDumper/Utils.cpp
+++ b/SpotifyKeyDumper/Utils.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "Utils.h"
-#include "aes.h"
+#include "tiny-AES-c/aes.h"
 
 const uint8_t IV[] = { 0x72, 0xE0, 0x67, 0xFB, 0xDD, 0xCB, 0xCF, 0x77, 0xEB, 0xE8, 0xBC, 0x64, 0x3F, 0x63, 0x0D, 0x93 };
 
diff --git a/SpotifyKeyDumper/aes.cpp b/SpotifyKeyDumper/tiny-AES-c/aes.cpp
similarity index 100%
rename from SpotifyKeyDumper/aes.cpp
rename to SpotifyKeyDumper/tiny-AES-c/aes.cpp
diff --git a/SpotifyKeyDumper/aes.h b/SpotifyKeyDumper/tiny-AES-c/aes.h
similarity index 100%
rename from SpotifyKeyDumper/aes.h
rename to SpotifyKeyDumper/tiny-AES-c/aes.h
diff --git a/SpotifyKeyDumper/aes.hpp b/SpotifyKeyDumper/tiny-AES-c/aes.hpp
similarity index 100%
rename from SpotifyKeyDumper/aes.hpp
rename to SpotifyKeyDumper/tiny-AES-c/aes.hpp