From 3a03f478e407f35bfafd192c22f82bc8c6e25a38 Mon Sep 17 00:00:00 2001
From: jbzdarkid <jbzdarkid@gmail.com>
Date: Wed, 6 Nov 2019 09:19:21 -0800
Subject: And... it works?

---
 Test/Temp.cpp        | 64 ++++++++++++++++++++++++++--------------------------
 Test/Test.vcxproj    | 16 +++++++++----
 Test/packages.config |  2 +-
 3 files changed, 45 insertions(+), 37 deletions(-)

(limited to 'Test')

diff --git a/Test/Temp.cpp b/Test/Temp.cpp
index 6a45140..3b31539 100644
--- a/Test/Temp.cpp
+++ b/Test/Temp.cpp
@@ -6,45 +6,45 @@
 class Temp : public testing::Test
 {
 protected:
-	std::vector<char> ReadSubtitles(int size) {
-		Memory memory("witness64_d3d11.exe");
-		std::vector<char> data;
-		data.resize(size);
-		ReadProcessMemory(memory._handle, (LPVOID)0x3D89F000, &data[0], sizeof(char) * size, nullptr);
-		return data;
-	}
+    std::shared_ptr<Memory> _memory = std::make_shared<Memory>("witness64_d3d11.exe");
+    // std::vector<char> ReadSubtitles(int size) {
+    //      Memory memory("witness64_d3d11.exe");
+    //      std::vector<char> data;
+    //      data.resize(size);
+    //      ReadProcessMemory(memory._handle, (LPVOID)0x3D89F000, &data[0], sizeof(char) * size, nullptr);
+    //      return data;
+    // }
 };
 
-TEST(SwapTests, Shipwreck) {
-	Randomizer randomizer;
-	int shipwreck = 0xAFB;
-	int thEntry = 0x288C;
-	int si1 = 0x00000022;
-	int bu1 = 0x6;
-	int td1 = 0x5D;
-	int ypp = 0x33EA;
-	int ramp_activation_shapers = 0x21D5;
-	int mill_upper_5 = 0x146C;
-	int mill_entry_left = 0x1E5A;
-	int mill_upper_7 = 0x03686;
-
-	randomizer.SwapPanels(ypp, mill_upper_7, Randomizer::SWAP::LINES);
-
-}
+// TEST_F(Temp, Shipwreck) {
+//     Randomizer randomizer(_memory);
+//     int shipwreck = 0xAFB;
+//     int thEntry = 0x288C;
+//     int si1 = 0x00000022;
+//     int bu1 = 0x6;
+//     int td1 = 0x5D;
+//     int ypp = 0x33EA;
+//     int ramp_activation_shapers = 0x21D5;
+//     int mill_upper_5 = 0x146C;
+//     int mill_entry_left = 0x1E5A;
+//     int mill_upper_7 = 0x03686;
+// 
+//     randomizer.SwapPanels(ypp, mill_upper_7, Randomizer::SWAP::LINES);
+// }
 
 /*
 TEST_F(Temp, Extract) {
-//	std::vector<byte> data = ReadSubtitles(166480);
-	std::vector<char> data = ReadSubtitles(166480);
-	std::ofstream file("raw.txt");
-	ASSERT_TRUE(file.is_open());
+//    std::vector<byte> data = ReadSubtitles(166480);
+    std::vector<char> data = ReadSubtitles(166480);
+    std::ofstream file("raw.txt");
+    ASSERT_TRUE(file.is_open());
 
-	std::string hex = "0123456789ABCDEF";
-	for (int i=0; i<data.size(); i++) {
-		if (data[i] == '\r') continue;
-		file << data[i];
+    std::string hex = "0123456789ABCDEF";
+    for (int i=0; i<data.size(); i++) {
+        if (data[i] == '\r') continue;
+        file << data[i];
 
-	}
+    }
     file.close();
 }
 */
\ No newline at end of file
diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj
index 1beb5a4..d36f4af 100644
--- a/Test/Test.vcxproj
+++ b/Test/Test.vcxproj
@@ -37,13 +37,17 @@
       <Project>{6b5df051-a51a-48cb-8acd-c6fad726019f}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="RandomTests.cpp" />
+    <ClCompile Include="Temp.cpp" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
+    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -51,7 +55,8 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -70,7 +75,8 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -94,6 +100,7 @@
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -113,6 +120,7 @@
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -125,6 +133,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Test/packages.config b/Test/packages.config
index 1dcab87..a412a41 100644
--- a/Test/packages.config
+++ b/Test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.0" targetFramework="native" />
+  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1" targetFramework="native" />
 </packages>
\ No newline at end of file
-- 
cgit 1.4.1