summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorjbzdarkid <jbzdarkid@gmail.com>2018-11-05 10:06:37 -0800
committerjbzdarkid <jbzdarkid@gmail.com>2018-11-05 10:06:37 -0800
commit669717268201197412c69df36e65883b0af6fac8 (patch)
tree6345c3acd1ca42bbd31c3702e649a09512e5aed6
parenta828620c6447e8c51f6e9d1767eabe0fc5ade0a0 (diff)
downloadwitness-tutorializer-669717268201197412c69df36e65883b0af6fac8.tar.gz
witness-tutorializer-669717268201197412c69df36e65883b0af6fac8.tar.bz2
witness-tutorializer-669717268201197412c69df36e65883b0af6fac8.zip
Tests work now, + other cleanup
Diffstat
-rw-r--r--App/App.icobin46227 -> 0 bytes
-rw-r--r--App/App.vcxproj32


-rw-r--r--App/App.vcxproj.filters43


-rw-r--r--App/Main.cpp30


-rw-r--r--App/small.icobin46227 -> 0 bytes
-rw-r--r--Installer/Installer.vdproj400


-rw-r--r--Source/Random.cpp4


-rw-r--r--Source/Source.vcxproj81


-rw-r--r--Source/Source.vcxproj.filters57


-rw-r--r--Test/Foo.cpp11


-rw-r--r--Test/RandomTests.cpp36


-rw-r--r--Test/Test.vcxproj46


-rw-r--r--Test/packages.config2


-rw-r--r--WitnessRandomizer.sln73


-rw-r--r--WitnessRandomizer.vcxproj122


-rw-r--r--WitnessRandomizer.vcxproj.filters17


16 files changed, 377 insertions, 577 deletions
diff --git a/App/App.ico b/App/App.ico
deleted file mode 100644
index b3ec03b..0000000
--- a/App/App.ico
+++ /dev/null

Binary files differ
diff --git a/App/App.vcxproj b/App/App.vcxproj
index b17f7a6..fbcb337 100644
--- a/App/App.vcxproj
+++ b/App/App.vcxproj

@@ -20,11 +20,10 @@

20  </ItemGroup>
20  </ItemGroup>

21  <PropertyGroup Label="Globals">
21  <PropertyGroup Label="Globals">

22    <VCProjectVersion>15.0</VCProjectVersion>
22    <VCProjectVersion>15.0</VCProjectVersion>

23    <ProjectGuid>{CED79182-F36B-4D07-AD0E-249C15BFAD73}</ProjectGuid>
23    <ProjectGuid>{235D27F1-9907-489B-8D58-636A0C5CD079}</ProjectGuid>

24    <Keyword>Win32Proj</Keyword>
24    <Keyword>Win32Proj</Keyword>

25    <RootNamespace>App</RootNamespace>
25    <RootNamespace>App</RootNamespace>

26    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
26    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>

27    <ProjectName>App</ProjectName>


28  </PropertyGroup>
27  </PropertyGroup>

29  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

30  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -82,7 +81,6 @@

82  </PropertyGroup>
81  </PropertyGroup>

83  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
82  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

84    <LinkIncremental>false</LinkIncremental>
83    <LinkIncremental>false</LinkIncremental>

85    <TargetName>WitnessRandomizer</TargetName>


86  </PropertyGroup>
84  </PropertyGroup>

87  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
85  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

88    <ClCompile>
86    <ClCompile>
@@ -92,9 +90,8 @@

92      <SDLCheck>true</SDLCheck>
90      <SDLCheck>true</SDLCheck>

93      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

94      <ConformanceMode>true</ConformanceMode>
92      <ConformanceMode>true</ConformanceMode>

95      <TreatWarningAsError>true</TreatWarningAsError>
93      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

96      <LanguageStandard>stdcpp17</LanguageStandard>
94      <LanguageStandard>stdcpp17</LanguageStandard>

97      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>


98    </ClCompile>
95    </ClCompile>

99    <Link>
96    <Link>

100      <SubSystem>Windows</SubSystem>
97      <SubSystem>Windows</SubSystem>
@@ -104,15 +101,14 @@

104  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
101  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

105    <ClCompile>
102    <ClCompile>

106      <PrecompiledHeader>NotUsing</PrecompiledHeader>
103      <PrecompiledHeader>NotUsing</PrecompiledHeader>

107      <WarningLevel>Level2</WarningLevel>
104      <WarningLevel>Level3</WarningLevel>

108      <Optimization>Disabled</Optimization>
105      <Optimization>Disabled</Optimization>

109      <SDLCheck>true</SDLCheck>
106      <SDLCheck>true</SDLCheck>

110      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

111      <ConformanceMode>true</ConformanceMode>
108      <ConformanceMode>true</ConformanceMode>

112      <TreatWarningAsError>true</TreatWarningAsError>


113      <LanguageStandard>stdcpp17</LanguageStandard>
109      <LanguageStandard>stdcpp17</LanguageStandard>


110      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

114      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
111      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

115      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>


116    </ClCompile>
112    </ClCompile>

117    <Link>
113    <Link>

118      <SubSystem>Windows</SubSystem>
114      <SubSystem>Windows</SubSystem>
@@ -129,10 +125,8 @@

129      <SDLCheck>true</SDLCheck>
125      <SDLCheck>true</SDLCheck>

130      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

131      <ConformanceMode>true</ConformanceMode>
127      <ConformanceMode>true</ConformanceMode>

132      <TreatWarningAsError>true</TreatWarningAsError>


133      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>


134      <LanguageStandard>stdcpp17</LanguageStandard>
128      <LanguageStandard>stdcpp17</LanguageStandard>

135      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
129      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

136    </ClCompile>
130    </ClCompile>

137    <Link>
131    <Link>

138      <SubSystem>Windows</SubSystem>
132      <SubSystem>Windows</SubSystem>
@@ -144,18 +138,15 @@

144  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
138  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

145    <ClCompile>
139    <ClCompile>

146      <PrecompiledHeader>NotUsing</PrecompiledHeader>
140      <PrecompiledHeader>NotUsing</PrecompiledHeader>

147      <WarningLevel>Level2</WarningLevel>
141      <WarningLevel>Level3</WarningLevel>

148      <Optimization>MaxSpeed</Optimization>
142      <Optimization>MaxSpeed</Optimization>

149      <FunctionLevelLinking>true</FunctionLevelLinking>
143      <FunctionLevelLinking>true</FunctionLevelLinking>

150      <IntrinsicFunctions>true</IntrinsicFunctions>
144      <IntrinsicFunctions>true</IntrinsicFunctions>

151      <SDLCheck>true</SDLCheck>
145      <SDLCheck>true</SDLCheck>

152      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

153      <ConformanceMode>true</ConformanceMode>
147      <ConformanceMode>true</ConformanceMode>

154      <TreatWarningAsError>true</TreatWarningAsError>


155      <LanguageStandard>stdcpp17</LanguageStandard>
148      <LanguageStandard>stdcpp17</LanguageStandard>

156      <DebugInformationFormat>None</DebugInformationFormat>
149      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

157      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>


158      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>


159    </ClCompile>
150    </ClCompile>

160    <Link>
151    <Link>

161      <SubSystem>Windows</SubSystem>
152      <SubSystem>Windows</SubSystem>
@@ -165,6 +156,7 @@

165    </Link>
156    </Link>

166  </ItemDefinitionGroup>
157  </ItemDefinitionGroup>

167  <ItemGroup>
158  <ItemGroup>


159    <ClInclude Include="Resource.h" />

168    <ClInclude Include="Version.h" />
160    <ClInclude Include="Version.h" />

169  </ItemGroup>
161  </ItemGroup>

170  <ItemGroup>
162  <ItemGroup>
@@ -174,11 +166,9 @@

174    <ResourceCompile Include="Version.rc" />
166    <ResourceCompile Include="Version.rc" />

175  </ItemGroup>
167  </ItemGroup>

176  <ItemGroup>
168  <ItemGroup>

177    <Image Include="small.ico" />
169    <ProjectReference Include="..\Source\Source.vcxproj">

178    <Image Include="App.ico" />
170      <Project>{6b5df051-a51a-48cb-8acd-c6fad726019f}</Project>

179  </ItemGroup>
171    </ProjectReference>

180  <ItemGroup>


181    <None Include="App.aps" />


182  </ItemGroup>
172  </ItemGroup>

183  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
173  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

184  <ImportGroup Label="ExtensionTargets">
174  <ImportGroup Label="ExtensionTargets">
diff --git a/App/App.vcxproj.filters b/App/App.vcxproj.filters
deleted file mode 100644
index 26b3d34..0000000
--- a/App/App.vcxproj.filters
+++ /dev/null

@@ -1,43 +0,0 @@

1<?xml version="1.0" encoding="utf-8"?>


2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


3  <ItemGroup>


4    <Filter Include="Source Files">


5      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>


6      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>


7    </Filter>


8    <Filter Include="Header Files">


9      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>


10      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>


11    </Filter>


12    <Filter Include="Resource Files">


13      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>


14      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>


15    </Filter>


16  </ItemGroup>


17  <ItemGroup>


18    <ClInclude Include="Version.h">


19      <Filter>Header Files</Filter>


20    </ClInclude>


21  </ItemGroup>


22  <ItemGroup>


23    <ClCompile Include="Main.cpp">


24      <Filter>Source Files</Filter>


25    </ClCompile>


26  </ItemGroup>


27  <ItemGroup>


28    <ResourceCompile Include="Version.rc">


29      <Filter>Resource Files</Filter>


30    </ResourceCompile>


31  </ItemGroup>


32  <ItemGroup>


33    <Image Include="small.ico">


34      <Filter>Resource Files</Filter>


35    </Image>


36    <Image Include="App.ico">


37      <Filter>Resource Files</Filter>


38    </Image>


39  </ItemGroup>


40  <ItemGroup>


41    <None Include="App.aps" />


42  </ItemGroup>


43</Project>
\ No newline at end of file

diff --git a/App/Main.cpp b/App/Main.cpp
index ce0e550..48cb93d 100644
--- a/App/Main.cpp
+++ b/App/Main.cpp

@@ -3,9 +3,9 @@

3
3

4#include <string>
4#include <string>

5
5

6#include "Randomizer.h"


7#include "Version.h"
6#include "Version.h"

8#include "Random.h"
7#include "Random.h"


8#include "Randomizer.h"

9#include "Panel.h"
9#include "Panel.h"

10
10

11#define IDC_RANDOMIZE 0x401
11#define IDC_RANDOMIZE 0x401
@@ -18,8 +18,8 @@

18#define IDC_DUMP 0x408
18#define IDC_DUMP 0x408

19
19

20HWND hwndSeed, hwndRandomize;
20HWND hwndSeed, hwndRandomize;

21// int panel = 0x18AF;
21int panel = 0x18AF;

22int panel = 0x33D4;
22// int panel = 0x33D4;

23std::shared_ptr<Panel> _panel;
23std::shared_ptr<Panel> _panel;

24
24

25LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
25LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -53,16 +53,16 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)

53                                        wasSeedRandomlyGenerated = false;
53                                        wasSeedRandomlyGenerated = false;

54                                }
54                                }

55
55

56                                Randomizer randomizer;
56                                Randomizer randomizer;

57                                short metadata = randomizer.Randomize(seed);
57                                short metadata = randomizer.Randomize(seed);

58                                if (metadata & 0x1) break; // Was already randomized
58                                if (metadata & 0x1) break; // Was already randomized

59
59

60                                std::wstring seedString = std::to_wstring(seed);
60                                std::wstring seedString = std::to_wstring(seed);

61                                SetWindowText(hwndSeed, seedString.c_str());
61                                SetWindowText(hwndSeed, seedString.c_str());

62                                if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) {
62                                if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) {

63                                        randomizer.AdjustSpeed();
63                                        randomizer.AdjustSpeed();

64                                }
64                                }

65                                SetWindowText(hwndRandomize, L"Randomized!");
65                                SetWindowText(hwndRandomize, L"Randomized!");

66                                break;
66                                break;

67                        }
67                        }

68                        case IDC_READ:
68                        case IDC_READ:
@@ -75,7 +75,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)

75                                _panel->Write(panel);
75                                _panel->Write(panel);

76                                break;
76                                break;

77                        case IDC_DUMP:
77                        case IDC_DUMP:

78                                _panel->Serialize();
78                                // _panel->Serialize();

79                                break;
79                                break;

80                }
80                }

81        }
81        }
@@ -113,7 +113,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd

113                WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,
113                WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,

114                10, 15, 90, 16, hwnd, NULL, hInstance, NULL);
114                10, 15, 90, 16, hwnd, NULL, hInstance, NULL);

115        hwndSeed = CreateWindow(MSFTEDIT_CLASS, L"",
115        hwndSeed = CreateWindow(MSFTEDIT_CLASS, L"",

116        WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, 
116        WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER,

117        100, 10, 50, 26, hwnd, NULL, hInstance, NULL);
117        100, 10, 50, 26, hwnd, NULL, hInstance, NULL);

118        hwndRandomize = CreateWindow(L"BUTTON", L"Randomize",
118        hwndRandomize = CreateWindow(L"BUTTON", L"Randomize",

119                WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,
119                WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,
@@ -176,7 +176,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd

176        CreateWindow(L"STATIC", L"Prevent sniping certain puzzles",
176        CreateWindow(L"STATIC", L"Prevent sniping certain puzzles",

177                WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,
177                WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,

178                27, 50, 205, 16, hwnd, NULL, hInstance, NULL);
178                27, 50, 205, 16, hwnd, NULL, hInstance, NULL);

179                
179

180*/
180*/

181
181

182        ShowWindow(hwnd, nCmdShow);
182        ShowWindow(hwnd, nCmdShow);
diff --git a/App/small.ico b/App/small.ico
deleted file mode 100644
index b3ec03b..0000000
--- a/App/small.ico
+++ /dev/null

Binary files differ
diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj
index a8ae585..970230a 100644
--- a/Installer/Installer.vdproj
+++ b/Installer/Installer.vdproj

@@ -15,7 +15,19 @@

15    {
15    {

16        "Entry"
16        "Entry"

17        {
17        {

18        "MsmKey" = "8:_E86F0F0DE4B646B6956C8E30890951D2"
18        "MsmKey" = "8:_9B0B145056B94677E2CA3A16390E0831"


19        "OwnerKey" = "8:_F4835D5BBF3E437390127C4C49888F07"


20        "MsmSig" = "8:_UNDEFINED"


21        }


22        "Entry"


23        {


24        "MsmKey" = "8:_BB64C67B615508AECF6F57AF00F172BE"


25        "OwnerKey" = "8:_F4835D5BBF3E437390127C4C49888F07"


26        "MsmSig" = "8:_UNDEFINED"


27        }


28        "Entry"


29        {


30        "MsmKey" = "8:_F4835D5BBF3E437390127C4C49888F07"

19        "OwnerKey" = "8:_UNDEFINED"
31        "OwnerKey" = "8:_UNDEFINED"

20        "MsmSig" = "8:_UNDEFINED"
32        "MsmSig" = "8:_UNDEFINED"

21        }
33        }
@@ -44,14 +56,6 @@

44            "PrerequisitesLocation" = "2:1"
56            "PrerequisitesLocation" = "2:1"

45            "Url" = "8:"
57            "Url" = "8:"

46            "ComponentsUrl" = "8:"
58            "ComponentsUrl" = "8:"

47                "Items"


48                {


49                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"


50                    {


51                    "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"


52                    "ProductCode" = "8:.NETFramework,Version=v4.6.1"


53                    }


54                }


55            }
59            }

56        }
60        }

57        "Release"
61        "Release"
@@ -59,11 +63,11 @@

59        "DisplayName" = "8:Release"
63        "DisplayName" = "8:Release"

60        "IsDebugOnly" = "11:FALSE"
64        "IsDebugOnly" = "11:FALSE"

61        "IsReleaseOnly" = "11:TRUE"
65        "IsReleaseOnly" = "11:TRUE"

62        "OutputFilename" = "8:WitnessRandomizerInstaller.msi"
66        "OutputFilename" = "8:Release\\Installer.msi"

63        "PackageFilesAs" = "3:2"
67        "PackageFilesAs" = "3:2"

64        "PackageFileSize" = "3:-2147483648"
68        "PackageFileSize" = "3:-2147483648"

65        "CabType" = "3:1"
69        "CabType" = "3:1"

66        "Compression" = "3:3"
70        "Compression" = "3:2"

67        "SignOutput" = "11:FALSE"
71        "SignOutput" = "11:FALSE"

68        "CertificateFile" = "8:"
72        "CertificateFile" = "8:"

69        "PrivateKeyFile" = "8:"
73        "PrivateKeyFile" = "8:"
@@ -76,14 +80,6 @@

76            "PrerequisitesLocation" = "2:1"
80            "PrerequisitesLocation" = "2:1"

77            "Url" = "8:"
81            "Url" = "8:"

78            "ComponentsUrl" = "8:"
82            "ComponentsUrl" = "8:"

79                "Items"


80                {


81                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"


82                    {


83                    "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"


84                    "ProductCode" = "8:.NETFramework,Version=v4.6.1"


85                    }


86                }


87            }
83            }

88        }
84        }

89    }
85    }
@@ -106,13 +102,53 @@

106        }
102        }

107        "File"
103        "File"

108        {
104        {


105            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B0B145056B94677E2CA3A16390E0831"


106            {


107            "SourcePath" = "8:ucrtbased.dll"


108            "TargetName" = "8:ucrtbased.dll"


109            "Tag" = "8:"


110            "Folder" = "8:_8E9D847124D34D9D9008762077D816DE"


111            "Condition" = "8:"


112            "Transitive" = "11:FALSE"


113            "Vital" = "11:TRUE"


114            "ReadOnly" = "11:FALSE"


115            "Hidden" = "11:FALSE"


116            "System" = "11:FALSE"


117            "Permanent" = "11:FALSE"


118            "SharedLegacy" = "11:FALSE"


119            "PackageAs" = "3:1"


120            "Register" = "3:1"


121            "Exclude" = "11:FALSE"


122            "IsDependency" = "11:TRUE"


123            "IsolateTo" = "8:"


124            }


125            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BB64C67B615508AECF6F57AF00F172BE"


126            {


127            "SourcePath" = "8:VCRUNTIME140D.dll"


128            "TargetName" = "8:VCRUNTIME140D.dll"


129            "Tag" = "8:"


130            "Folder" = "8:_8E9D847124D34D9D9008762077D816DE"


131            "Condition" = "8:"


132            "Transitive" = "11:FALSE"


133            "Vital" = "11:TRUE"


134            "ReadOnly" = "11:FALSE"


135            "Hidden" = "11:FALSE"


136            "System" = "11:FALSE"


137            "Permanent" = "11:FALSE"


138            "SharedLegacy" = "11:FALSE"


139            "PackageAs" = "3:1"


140            "Register" = "3:1"


141            "Exclude" = "11:FALSE"


142            "IsDependency" = "11:TRUE"


143            "IsolateTo" = "8:"


144            }

109        }
145        }

110        "FileType"
146        "FileType"

111        {
147        {

112        }
148        }

113        "Folder"
149        "Folder"

114        {
150        {

115            "{1525181F-901A-416C-8A58-119130FE478E}:_4D19640D10EA43E68046262546954A5E"
151            "{1525181F-901A-416C-8A58-119130FE478E}:_1FD5AD1232C84F478EFC94AAEE035210"

116            {
152            {

117            "Name" = "8:#1916"
153            "Name" = "8:#1916"

118            "AlwaysCreate" = "11:FALSE"
154            "AlwaysCreate" = "11:FALSE"
@@ -123,9 +159,9 @@

123                {
159                {

124                }
160                }

125            }
161            }

126            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_5393EB12357E4BF29E8149058ABE909F"
162            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_8E9D847124D34D9D9008762077D816DE"

127            {
163            {

128            "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]"
164            "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"

129            "Name" = "8:#1925"
165            "Name" = "8:#1925"

130            "AlwaysCreate" = "11:FALSE"
166            "AlwaysCreate" = "11:FALSE"

131            "Condition" = "8:"
167            "Condition" = "8:"
@@ -135,7 +171,7 @@

135                {
171                {

136                }
172                }

137            }
173            }

138            "{1525181F-901A-416C-8A58-119130FE478E}:_B2294C987D6245B881C99CC1494F9A53"
174            "{1525181F-901A-416C-8A58-119130FE478E}:_ADBF9BEF249647A7B9E33B56D9B4F497"

139            {
175            {

140            "Name" = "8:#1919"
176            "Name" = "8:#1919"

141            "AlwaysCreate" = "11:FALSE"
177            "AlwaysCreate" = "11:FALSE"
@@ -162,19 +198,19 @@

162        {
198        {

163        "Name" = "8:Microsoft Visual Studio"
199        "Name" = "8:Microsoft Visual Studio"

164        "ProductName" = "8:Witness Randomizer"
200        "ProductName" = "8:Witness Randomizer"

165        "ProductCode" = "8:{17E1D8DB-4EB6-4165-AFBD-CBEDE030B290}"
201        "ProductCode" = "8:{FC619212-7FAE-44BB-B057-149C773DD44D}"

166        "PackageCode" = "8:{BFEA7087-93FF-40C4-B533-F9A4DDD63532}"
202        "PackageCode" = "8:{24312282-901A-4661-9B87-E04AC1FC4609}"

167        "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"
203        "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"

168        "AspNetVersion" = "8:2.0.50727.0"
204        "AspNetVersion" = "8:2.0.50727.0"

169        "RestartWWWService" = "11:FALSE"
205        "RestartWWWService" = "11:FALSE"

170        "RemovePreviousVersions" = "11:TRUE"
206        "RemovePreviousVersions" = "11:FALSE"

171        "DetectNewerInstalledVersion" = "11:TRUE"
207        "DetectNewerInstalledVersion" = "11:TRUE"

172        "InstallAllUsers" = "11:FALSE"
208        "InstallAllUsers" = "11:FALSE"

173        "ProductVersion" = "8:4.0.0"
209        "ProductVersion" = "8:4.0.3"

174        "Manufacturer" = "8:jbzdarkid"
210        "Manufacturer" = "8:jbzdarkid"

175        "ARPHELPTELEPHONE" = "8:"
211        "ARPHELPTELEPHONE" = "8:"

176        "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues"
212        "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues"

177        "Title" = "8:Witness Randomizer"
213        "Title" = "8:Installer"

178        "Subject" = "8:"
214        "Subject" = "8:"

179        "ARPCONTACT" = "8:jbzdarkid"
215        "ARPCONTACT" = "8:jbzdarkid"

180        "Keywords" = "8:"
216        "Keywords" = "8:"
@@ -184,7 +220,7 @@

184        "ARPIconIndex" = "3:0"
220        "ARPIconIndex" = "3:0"

185        "SearchPath" = "8:"
221        "SearchPath" = "8:"

186        "UseSystemSearchPath" = "11:TRUE"
222        "UseSystemSearchPath" = "11:TRUE"

187        "TargetPlatform" = "3:1"
223        "TargetPlatform" = "3:0"

188        "PreBuildEvent" = "8:"
224        "PreBuildEvent" = "8:"

189        "PostBuildEvent" = "8:"
225        "PostBuildEvent" = "8:"

190        "RunPostBuildEvent" = "3:0"
226        "RunPostBuildEvent" = "3:0"
@@ -195,7 +231,7 @@

195            {
231            {

196                "Keys"
232                "Keys"

197                {
233                {

198                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_3AE5560C1C264507AB6064EFD59C1D29"
234                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_30C31E4026394D739C781A8F615DBD1B"

199                    {
235                    {

200                    "Name" = "8:Software"
236                    "Name" = "8:Software"

201                    "Condition" = "8:"
237                    "Condition" = "8:"
@@ -204,7 +240,7 @@

204                    "Transitive" = "11:FALSE"
240                    "Transitive" = "11:FALSE"

205                        "Keys"
241                        "Keys"

206                        {
242                        {

207                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_63A12348E59E4B23AF4A320B583CE259"
243                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_CC3FFD5EF5A24864B8921B3D11FF87C9"

208                            {
244                            {

209                            "Name" = "8:[Manufacturer]"
245                            "Name" = "8:[Manufacturer]"

210                            "Condition" = "8:"
246                            "Condition" = "8:"
@@ -229,7 +265,7 @@

229            {
265            {

230                "Keys"
266                "Keys"

231                {
267                {

232                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_8B27FF000D99412E935E3A18279A2050"
268                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_86EAB0D9996C4DD4A7730F79B46BA7E9"

233                    {
269                    {

234                    "Name" = "8:Software"
270                    "Name" = "8:Software"

235                    "Condition" = "8:"
271                    "Condition" = "8:"
@@ -238,7 +274,7 @@

238                    "Transitive" = "11:FALSE"
274                    "Transitive" = "11:FALSE"

239                        "Keys"
275                        "Keys"

240                        {
276                        {

241                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_4BF3DC672AFD411A93142B3B6422DB19"
277                            "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_065C31ABC29D44A8AACC5C1DF0B00FFA"

242                            {
278                            {

243                            "Name" = "8:[Manufacturer]"
279                            "Name" = "8:[Manufacturer]"

244                            "Condition" = "8:"
280                            "Condition" = "8:"
@@ -283,7 +319,7 @@

283        }
319        }

284        "Shortcut"
320        "Shortcut"

285        {
321        {

286            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_B30BF820F5E14F0DA12BBD906ADF0C86"
322            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_704973B0673F47C2A7EDC37615A5C901"

287            {
323            {

288            "Name" = "8:WitnessRandomizer"
324            "Name" = "8:WitnessRandomizer"

289            "Arguments" = "8:"
325            "Arguments" = "8:"
@@ -291,79 +327,29 @@

291            "ShowCmd" = "3:1"
327            "ShowCmd" = "3:1"

292            "IconIndex" = "3:0"
328            "IconIndex" = "3:0"

293            "Transitive" = "11:FALSE"
329            "Transitive" = "11:FALSE"

294            "Target" = "8:_E86F0F0DE4B646B6956C8E30890951D2"
330            "Target" = "8:_F4835D5BBF3E437390127C4C49888F07"

295            "Folder" = "8:_B2294C987D6245B881C99CC1494F9A53"
331            "Folder" = "8:_ADBF9BEF249647A7B9E33B56D9B4F497"

296            "WorkingFolder" = "8:_5393EB12357E4BF29E8149058ABE909F"
332            "WorkingFolder" = "8:_8E9D847124D34D9D9008762077D816DE"

297            "Icon" = "8:"
333            "Icon" = "8:"

298            "Feature" = "8:"
334            "Feature" = "8:"

299            }
335            }

300        }
336        }

301        "UserInterface"
337        "UserInterface"

302        {
338        {

303            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_38760CCB3C7C473E8E648E0E721B588D"
339            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_38A567649FEB44008A1D1E584BC151FE"

304            {
340            {

305            "UseDynamicProperties" = "11:FALSE"
341            "Name" = "8:#1902"

306            "IsDependency" = "11:FALSE"
342            "Sequence" = "3:1"

307            "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
343            "Attributes" = "3:3"

308            }


309            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3A89F4E5009C49478B393C505B87F9E1"


310            {


311            "Name" = "8:#1900"


312            "Sequence" = "3:2"


313            "Attributes" = "3:1"


314                "Dialogs"
344                "Dialogs"

315                {
345                {

316                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_53574943921E4B3DB4C03DD3D6CA432C"
346                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4091B2BBD40E4FB984D12FE05CC179C8"

317                    {


318                    "Sequence" = "3:300"


319                    "DisplayName" = "8:Confirm Installation"


320                    "UseDynamicProperties" = "11:TRUE"


321                    "IsDependency" = "11:FALSE"


322                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"


323                        "Properties"


324                        {


325                            "BannerBitmap"


326                            {


327                            "Name" = "8:BannerBitmap"


328                            "DisplayName" = "8:#1001"


329                            "Description" = "8:#1101"


330                            "Type" = "3:8"


331                            "ContextData" = "8:Bitmap"


332                            "Attributes" = "3:4"


333                            "Setting" = "3:1"


334                            "UsePlugInResources" = "11:TRUE"


335                            }


336                        }


337                    }


338                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E1C9373AA1F84906A77B0A402FC41089"


339                    {


340                    "Sequence" = "3:200"


341                    "DisplayName" = "8:Installation Folder"


342                    "UseDynamicProperties" = "11:TRUE"


343                    "IsDependency" = "11:FALSE"


344                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"


345                        "Properties"


346                        {


347                            "BannerBitmap"


348                            {


349                            "Name" = "8:BannerBitmap"


350                            "DisplayName" = "8:#1001"


351                            "Description" = "8:#1101"


352                            "Type" = "3:8"


353                            "ContextData" = "8:Bitmap"


354                            "Attributes" = "3:4"


355                            "Setting" = "3:1"


356                            "UsePlugInResources" = "11:TRUE"


357                            }


358                        }


359                    }


360                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E9B774D828F444DBB21D89182BC27A21"


361                    {
347                    {

362                    "Sequence" = "3:100"
348                    "Sequence" = "3:100"

363                    "DisplayName" = "8:Welcome"
349                    "DisplayName" = "8:Finished"

364                    "UseDynamicProperties" = "11:TRUE"
350                    "UseDynamicProperties" = "11:TRUE"

365                    "IsDependency" = "11:FALSE"
351                    "IsDependency" = "11:FALSE"

366                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
352                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"

367                        "Properties"
353                        "Properties"

368                        {
354                        {

369                            "BannerBitmap"
355                            "BannerBitmap"
@@ -377,50 +363,31 @@

377                            "Setting" = "3:1"
363                            "Setting" = "3:1"

378                            "UsePlugInResources" = "11:TRUE"
364                            "UsePlugInResources" = "11:TRUE"

379                            }
365                            }

380                            "CopyrightWarning"
366                            "UpdateText"

381                            {


382                            "Name" = "8:CopyrightWarning"


383                            "DisplayName" = "8:#1002"


384                            "Description" = "8:#1102"


385                            "Type" = "3:3"


386                            "ContextData" = "8:"


387                            "Attributes" = "3:0"


388                            "Setting" = "3:1"


389                            "Value" = "8:#1202"


390                            "DefaultValue" = "8:#1202"


391                            "UsePlugInResources" = "11:TRUE"


392                            }


393                            "Welcome"


394                            {
367                            {

395                            "Name" = "8:Welcome"
368                            "Name" = "8:UpdateText"

396                            "DisplayName" = "8:#1003"
369                            "DisplayName" = "8:#1058"

397                            "Description" = "8:#1103"
370                            "Description" = "8:#1158"

398                            "Type" = "3:3"
371                            "Type" = "3:15"

399                            "ContextData" = "8:"
372                            "ContextData" = "8:"

400                            "Attributes" = "3:0"
373                            "Attributes" = "3:0"

401                            "Setting" = "3:1"
374                            "Setting" = "3:1"

402                            "Value" = "8:#1203"
375                            "Value" = "8:#1258"

403                            "DefaultValue" = "8:#1203"
376                            "DefaultValue" = "8:#1258"

404                            "UsePlugInResources" = "11:TRUE"
377                            "UsePlugInResources" = "11:TRUE"

405                            }
378                            }

406                        }
379                        }

407                    }
380                    }

408                }
381                }

409            }
382            }

410            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_525FC4F1C72C4EE3984593146DD26634"
383            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3BB80DCD2F404C34BC76213696E81E08"

411            {


412            "UseDynamicProperties" = "11:FALSE"


413            "IsDependency" = "11:FALSE"


414            "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"


415            }


416            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_8808DD7C245240A9954C040BF06F2B9D"


417            {
384            {

418            "Name" = "8:#1902"
385            "Name" = "8:#1902"

419            "Sequence" = "3:2"
386            "Sequence" = "3:2"

420            "Attributes" = "3:3"
387            "Attributes" = "3:3"

421                "Dialogs"
388                "Dialogs"

422                {
389                {

423                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F7031E39D9854967A8FBADF12A890B0B"
390                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_89142FD957DE4CFB80E4BE8A71967884"

424                    {
391                    {

425                    "Sequence" = "3:100"
392                    "Sequence" = "3:100"

426                    "DisplayName" = "8:Finished"
393                    "DisplayName" = "8:Finished"
@@ -444,20 +411,20 @@

444                    }
411                    }

445                }
412                }

446            }
413            }

447            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9359F122FC5E433F9E5A9EFF22C28425"
414            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_4F2068C04B0E466AA38331A55C59C41C"

448            {
415            {

449            "Name" = "8:#1901"
416            "Name" = "8:#1901"

450            "Sequence" = "3:1"
417            "Sequence" = "3:2"

451            "Attributes" = "3:2"
418            "Attributes" = "3:2"

452                "Dialogs"
419                "Dialogs"

453                {
420                {

454                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B03CE8F39FF4BA2B82BFADB5CE02784"
421                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AE5C7BA6BD854603B2596FACA0B67D15"

455                    {
422                    {

456                    "Sequence" = "3:100"
423                    "Sequence" = "3:100"

457                    "DisplayName" = "8:Progress"
424                    "DisplayName" = "8:Progress"

458                    "UseDynamicProperties" = "11:TRUE"
425                    "UseDynamicProperties" = "11:TRUE"

459                    "IsDependency" = "11:FALSE"
426                    "IsDependency" = "11:FALSE"

460                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
427                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"

461                        "Properties"
428                        "Properties"

462                        {
429                        {

463                            "BannerBitmap"
430                            "BannerBitmap"
@@ -488,20 +455,20 @@

488                    }
455                    }

489                }
456                }

490            }
457            }

491            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A1DF86A3EDDD44E594A0CDFC7F58D821"
458            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_6C920D4CA33D4B6599231DE1EF0E32C4"

492            {
459            {

493            "Name" = "8:#1900"
460            "Name" = "8:#1901"

494            "Sequence" = "3:1"
461            "Sequence" = "3:1"

495            "Attributes" = "3:1"
462            "Attributes" = "3:2"

496                "Dialogs"
463                "Dialogs"

497                {
464                {

498                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_19BB8ECC0C3A4153BF658C0F22142794"
465                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1D0F1B147BF440128F8062B38CC1C1F2"

499                    {
466                    {

500                    "Sequence" = "3:200"
467                    "Sequence" = "3:100"

501                    "DisplayName" = "8:Installation Folder"
468                    "DisplayName" = "8:Progress"

502                    "UseDynamicProperties" = "11:TRUE"
469                    "UseDynamicProperties" = "11:TRUE"

503                    "IsDependency" = "11:FALSE"
470                    "IsDependency" = "11:FALSE"

504                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
471                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"

505                        "Properties"
472                        "Properties"

506                        {
473                        {

507                            "BannerBitmap"
474                            "BannerBitmap"
@@ -515,11 +482,11 @@

515                            "Setting" = "3:1"
482                            "Setting" = "3:1"

516                            "UsePlugInResources" = "11:TRUE"
483                            "UsePlugInResources" = "11:TRUE"

517                            }
484                            }

518                            "InstallAllUsersVisible"
485                            "ShowProgress"

519                            {
486                            {

520                            "Name" = "8:InstallAllUsersVisible"
487                            "Name" = "8:ShowProgress"

521                            "DisplayName" = "8:#1059"
488                            "DisplayName" = "8:#1009"

522                            "Description" = "8:#1159"
489                            "Description" = "8:#1109"

523                            "Type" = "3:5"
490                            "Type" = "3:5"

524                            "ContextData" = "8:1;True=1;False=0"
491                            "ContextData" = "8:1;True=1;False=0"

525                            "Attributes" = "3:0"
492                            "Attributes" = "3:0"
@@ -530,13 +497,28 @@

530                            }
497                            }

531                        }
498                        }

532                    }
499                    }

533                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3433DFF95F204C7B8A83783FA361BFCE"
500                }


501            }


502            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_76D36C4D9B234E4AA4BC14C3045F8B20"


503            {


504            "UseDynamicProperties" = "11:FALSE"


505            "IsDependency" = "11:FALSE"


506            "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"


507            }


508            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B57EB774BE5C453B9EFE1692DDCAEE56"


509            {


510            "Name" = "8:#1900"


511            "Sequence" = "3:2"


512            "Attributes" = "3:1"


513                "Dialogs"


514                {


515                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_15DF03155E9B4F54AE8E67807A4EFE1F"

534                    {
516                    {

535                    "Sequence" = "3:100"
517                    "Sequence" = "3:100"

536                    "DisplayName" = "8:Welcome"
518                    "DisplayName" = "8:Welcome"

537                    "UseDynamicProperties" = "11:TRUE"
519                    "UseDynamicProperties" = "11:TRUE"

538                    "IsDependency" = "11:FALSE"
520                    "IsDependency" = "11:FALSE"

539                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
521                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"

540                        "Properties"
522                        "Properties"

541                        {
523                        {

542                            "BannerBitmap"
524                            "BannerBitmap"
@@ -578,13 +560,35 @@

578                            }
560                            }

579                        }
561                        }

580                    }
562                    }

581                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AF4B4DA9EB504C71B314DF4C68CE15EA"
563                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_25F82B1977D443ED87D578E106EA29F3"


564                    {


565                    "Sequence" = "3:200"


566                    "DisplayName" = "8:Installation Folder"


567                    "UseDynamicProperties" = "11:TRUE"


568                    "IsDependency" = "11:FALSE"


569                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"


570                        "Properties"


571                        {


572                            "BannerBitmap"


573                            {


574                            "Name" = "8:BannerBitmap"


575                            "DisplayName" = "8:#1001"


576                            "Description" = "8:#1101"


577                            "Type" = "3:8"


578                            "ContextData" = "8:Bitmap"


579                            "Attributes" = "3:4"


580                            "Setting" = "3:1"


581                            "UsePlugInResources" = "11:TRUE"


582                            }


583                        }


584                    }


585                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C338B6DBF24844F0B3605A0A75B1DCF3"

582                    {
586                    {

583                    "Sequence" = "3:300"
587                    "Sequence" = "3:300"

584                    "DisplayName" = "8:Confirm Installation"
588                    "DisplayName" = "8:Confirm Installation"

585                    "UseDynamicProperties" = "11:TRUE"
589                    "UseDynamicProperties" = "11:TRUE"

586                    "IsDependency" = "11:FALSE"
590                    "IsDependency" = "11:FALSE"

587                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
591                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"

588                        "Properties"
592                        "Properties"

589                        {
593                        {

590                            "BannerBitmap"
594                            "BannerBitmap"
@@ -602,20 +606,26 @@

602                    }
606                    }

603                }
607                }

604            }
608            }

605            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_AAE51F7F58C64A4B996423B01E3D8921"
609            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_C535242FE14D4956804B076BF1391396"

606            {
610            {

607            "Name" = "8:#1902"
611            "UseDynamicProperties" = "11:FALSE"


612            "IsDependency" = "11:FALSE"


613            "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"


614            }


615            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E3238729ED69443C9AC277130A087C7D"


616            {


617            "Name" = "8:#1900"

608            "Sequence" = "3:1"
618            "Sequence" = "3:1"

609            "Attributes" = "3:3"
619            "Attributes" = "3:1"

610                "Dialogs"
620                "Dialogs"

611                {
621                {

612                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4AF1C2264E804EE9BA6E2E014EFACBD1"
622                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_048E6ACAB7D346DE98118F422CABA006"

613                    {
623                    {

614                    "Sequence" = "3:100"
624                    "Sequence" = "3:200"

615                    "DisplayName" = "8:Finished"
625                    "DisplayName" = "8:Installation Folder"

616                    "UseDynamicProperties" = "11:TRUE"
626                    "UseDynamicProperties" = "11:TRUE"

617                    "IsDependency" = "11:FALSE"
627                    "IsDependency" = "11:FALSE"

618                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
628                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"

619                        "Properties"
629                        "Properties"

620                        {
630                        {

621                            "BannerBitmap"
631                            "BannerBitmap"
@@ -629,37 +639,28 @@

629                            "Setting" = "3:1"
639                            "Setting" = "3:1"

630                            "UsePlugInResources" = "11:TRUE"
640                            "UsePlugInResources" = "11:TRUE"

631                            }
641                            }

632                            "UpdateText"
642                            "InstallAllUsersVisible"

633                            {
643                            {

634                            "Name" = "8:UpdateText"
644                            "Name" = "8:InstallAllUsersVisible"

635                            "DisplayName" = "8:#1058"
645                            "DisplayName" = "8:#1059"

636                            "Description" = "8:#1158"
646                            "Description" = "8:#1159"

637                            "Type" = "3:15"
647                            "Type" = "3:5"

638                            "ContextData" = "8:"
648                            "ContextData" = "8:1;True=1;False=0"

639                            "Attributes" = "3:0"
649                            "Attributes" = "3:0"

640                            "Setting" = "3:1"
650                            "Setting" = "3:0"

641                            "Value" = "8:#1258"
651                            "Value" = "3:1"

642                            "DefaultValue" = "8:#1258"
652                            "DefaultValue" = "3:1"

643                            "UsePlugInResources" = "11:TRUE"
653                            "UsePlugInResources" = "11:TRUE"

644                            }
654                            }

645                        }
655                        }

646                    }
656                    }

647                }
657                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_63EC6443964E453FAC02347F7F5B94C9"

648            }


649            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_C45FE7F2B865461AB6313DD4AEB2833D"


650            {


651            "Name" = "8:#1901"


652            "Sequence" = "3:2"


653            "Attributes" = "3:2"


654                "Dialogs"


655                {


656                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_640F85EA14454CEEAD495CDCCD0BCB76"


657                    {
658                    {

658                    "Sequence" = "3:100"
659                    "Sequence" = "3:100"

659                    "DisplayName" = "8:Progress"
660                    "DisplayName" = "8:Welcome"

660                    "UseDynamicProperties" = "11:TRUE"
661                    "UseDynamicProperties" = "11:TRUE"

661                    "IsDependency" = "11:FALSE"
662                    "IsDependency" = "11:FALSE"

662                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
663                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"

663                        "Properties"
664                        "Properties"

664                        {
665                        {

665                            "BannerBitmap"
666                            "BannerBitmap"
@@ -673,17 +674,52 @@

673                            "Setting" = "3:1"
674                            "Setting" = "3:1"

674                            "UsePlugInResources" = "11:TRUE"
675                            "UsePlugInResources" = "11:TRUE"

675                            }
676                            }

676                            "ShowProgress"
677                            "CopyrightWarning"

677                            {
678                            {

678                            "Name" = "8:ShowProgress"
679                            "Name" = "8:CopyrightWarning"

679                            "DisplayName" = "8:#1009"
680                            "DisplayName" = "8:#1002"

680                            "Description" = "8:#1109"
681                            "Description" = "8:#1102"

681                            "Type" = "3:5"
682                            "Type" = "3:3"

682                            "ContextData" = "8:1;True=1;False=0"
683                            "ContextData" = "8:"

683                            "Attributes" = "3:0"
684                            "Attributes" = "3:0"

684                            "Setting" = "3:0"
685                            "Setting" = "3:1"

685                            "Value" = "3:1"
686                            "Value" = "8:#1202"

686                            "DefaultValue" = "3:1"
687                            "DefaultValue" = "8:#1202"


688                            "UsePlugInResources" = "11:TRUE"


689                            }


690                            "Welcome"


691                            {


692                            "Name" = "8:Welcome"


693                            "DisplayName" = "8:#1003"


694                            "Description" = "8:#1103"


695                            "Type" = "3:3"


696                            "ContextData" = "8:"


697                            "Attributes" = "3:0"


698                            "Setting" = "3:1"


699                            "Value" = "8:#1203"


700                            "DefaultValue" = "8:#1203"


701                            "UsePlugInResources" = "11:TRUE"


702                            }


703                        }


704                    }


705                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C5D7E2F30F564B78B6463ECCBF213F65"


706                    {


707                    "Sequence" = "3:300"


708                    "DisplayName" = "8:Confirm Installation"


709                    "UseDynamicProperties" = "11:TRUE"


710                    "IsDependency" = "11:FALSE"


711                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"


712                        "Properties"


713                        {


714                            "BannerBitmap"


715                            {


716                            "Name" = "8:BannerBitmap"


717                            "DisplayName" = "8:#1001"


718                            "Description" = "8:#1101"


719                            "Type" = "3:8"


720                            "ContextData" = "8:Bitmap"


721                            "Attributes" = "3:4"


722                            "Setting" = "3:1"

687                            "UsePlugInResources" = "11:TRUE"
723                            "UsePlugInResources" = "11:TRUE"

688                            }
724                            }

689                        }
725                        }
@@ -696,12 +732,12 @@

696        }
732        }

697        "ProjectOutput"
733        "ProjectOutput"

698        {
734        {

699            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E86F0F0DE4B646B6956C8E30890951D2"
735            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F4835D5BBF3E437390127C4C49888F07"

700            {
736            {

701            "SourcePath" = "8:..\\x64\\Release\\WitnessRandomizer.exe"
737            "SourcePath" = "8:..\\x64\\Debug\\App.exe"

702            "TargetName" = "8:"
738            "TargetName" = "8:"

703            "Tag" = "8:"
739            "Tag" = "8:"

704            "Folder" = "8:_5393EB12357E4BF29E8149058ABE909F"
740            "Folder" = "8:_8E9D847124D34D9D9008762077D816DE"

705            "Condition" = "8:"
741            "Condition" = "8:"

706            "Transitive" = "11:FALSE"
742            "Transitive" = "11:FALSE"

707            "Vital" = "11:TRUE"
743            "Vital" = "11:TRUE"
@@ -718,7 +754,7 @@

718            "ProjectOutputGroupRegister" = "3:1"
754            "ProjectOutputGroupRegister" = "3:1"

719            "OutputConfiguration" = "8:"
755            "OutputConfiguration" = "8:"

720            "OutputGroupCanonicalName" = "8:Built"
756            "OutputGroupCanonicalName" = "8:Built"

721            "OutputProjectGuid" = "8:{CED79182-F36B-4D07-AD0E-249C15BFAD73}"
757            "OutputProjectGuid" = "8:{235D27F1-9907-489B-8D58-636A0C5CD079}"

722            "ShowKeyOutput" = "11:TRUE"
758            "ShowKeyOutput" = "11:TRUE"

723                "ExcludeFilters"
759                "ExcludeFilters"

724                {
760                {
diff --git a/Source/Random.cpp b/Source/Random.cpp
index c921e58..d8f5eb2 100644
--- a/Source/Random.cpp
+++ b/Source/Random.cpp

@@ -7,8 +7,8 @@ void Random::SetSeed(int seed) {

7        s_seed = seed;
7        s_seed = seed;

8}
8}

9
9


10// Returns a random integer in [min, max]

10int Random::RandInt(int min, int max) {
11int Random::RandInt(int min, int max) {

11        s_seed = (214013 * s_seed + 2531011) % 2147483648;
12        s_seed = (214013 * s_seed + 2531011) % 2147483648;

12        if (min == max) return min;
13        return (s_seed % (max - min + 1)) + min;

13        return (s_seed % (max - (min - 1))) + min;


14}
14}
diff --git a/Source/Source.vcxproj b/Source/Source.vcxproj
index d140781..8d13e00 100644
--- a/Source/Source.vcxproj
+++ b/Source/Source.vcxproj

@@ -18,25 +18,9 @@

18      <Platform>x64</Platform>
18      <Platform>x64</Platform>

19    </ProjectConfiguration>
19    </ProjectConfiguration>

20  </ItemGroup>
20  </ItemGroup>

21  <ItemGroup>


22    <ClInclude Include="json.hpp" />


23    <ClInclude Include="Memory.h" />


24    <ClInclude Include="Panel.h" />


25    <ClInclude Include="Panels.h" />


26    <ClInclude Include="Random.h" />


27    <ClInclude Include="Randomizer.h" />


28    <ClInclude Include="RandomizerCore.h" />


29  </ItemGroup>


30  <ItemGroup>


31    <ClCompile Include="Memory.cpp" />


32    <ClCompile Include="Panel.cpp" />


33    <ClCompile Include="Random.cpp" />


34    <ClCompile Include="Randomizer.cpp" />


35    <ClCompile Include="RandomizerCore.cpp" />


36  </ItemGroup>


37  <PropertyGroup Label="Globals">
21  <PropertyGroup Label="Globals">

38    <VCProjectVersion>15.0</VCProjectVersion>
22    <VCProjectVersion>15.0</VCProjectVersion>

39    <ProjectGuid>{5C019BEA-E0B4-4215-825F-6A228CD3AE27}</ProjectGuid>
23    <ProjectGuid>{6B5DF051-A51A-48CB-8ACD-C6FAD726019F}</ProjectGuid>

40    <Keyword>Win32Proj</Keyword>
24    <Keyword>Win32Proj</Keyword>

41    <RootNamespace>Source</RootNamespace>
25    <RootNamespace>Source</RootNamespace>

42    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
26    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
@@ -86,9 +70,6 @@

86    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

87  </ImportGroup>
71  </ImportGroup>

88  <PropertyGroup Label="UserMacros" />
72  <PropertyGroup Label="UserMacros" />

89  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">


90    <LinkIncremental>false</LinkIncremental>


91  </PropertyGroup>


92  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

93    <LinkIncremental>true</LinkIncremental>
74    <LinkIncremental>true</LinkIncremental>

94  </PropertyGroup>
75  </PropertyGroup>
@@ -98,66 +79,70 @@

98  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
79  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

99    <LinkIncremental>false</LinkIncremental>
80    <LinkIncremental>false</LinkIncremental>

100  </PropertyGroup>
81  </PropertyGroup>

101  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
82  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">


83    <LinkIncremental>false</LinkIncremental>


84  </PropertyGroup>


85  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

102    <ClCompile>
86    <ClCompile>

103      <PrecompiledHeader>NotUsing</PrecompiledHeader>
87      <PrecompiledHeader>NotUsing</PrecompiledHeader>

104      <WarningLevel>Level2</WarningLevel>
88      <WarningLevel>Level3</WarningLevel>

105      <Optimization>MaxSpeed</Optimization>
89      <Optimization>Disabled</Optimization>

106      <FunctionLevelLinking>true</FunctionLevelLinking>


107      <IntrinsicFunctions>true</IntrinsicFunctions>


108      <SDLCheck>true</SDLCheck>
90      <SDLCheck>true</SDLCheck>

109      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

110      <ConformanceMode>true</ConformanceMode>
92      <ConformanceMode>true</ConformanceMode>

111      <LanguageStandard>stdcpp17</LanguageStandard>
93      <LanguageStandard>stdcpp17</LanguageStandard>

112      <TreatWarningAsError>true</TreatWarningAsError>


113    </ClCompile>
94    </ClCompile>

114    <Link>
95    <Link>

115      <SubSystem>Windows</SubSystem>
96      <SubSystem>Windows</SubSystem>

116      <EnableCOMDATFolding>true</EnableCOMDATFolding>


117      <OptimizeReferences>true</OptimizeReferences>


118      <GenerateDebugInformation>true</GenerateDebugInformation>
97      <GenerateDebugInformation>true</GenerateDebugInformation>

119    </Link>
98    </Link>

120  </ItemDefinitionGroup>
99  </ItemDefinitionGroup>

121  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
100  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

122    <ClCompile>
101    <ClCompile>

123      <PrecompiledHeader>Use</PrecompiledHeader>
102      <PrecompiledHeader>NotUsing</PrecompiledHeader>

124      <WarningLevel>Level3</WarningLevel>
103      <WarningLevel>Level3</WarningLevel>

125      <Optimization>Disabled</Optimization>
104      <Optimization>Disabled</Optimization>

126      <SDLCheck>true</SDLCheck>
105      <SDLCheck>true</SDLCheck>

127      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

128      <ConformanceMode>true</ConformanceMode>
107      <ConformanceMode>true</ConformanceMode>


108      <LanguageStandard>stdcpp17</LanguageStandard>


109      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

129    </ClCompile>
110    </ClCompile>

130    <Link>
111    <Link>

131      <SubSystem>Windows</SubSystem>
112      <SubSystem>Windows</SubSystem>

132      <GenerateDebugInformation>true</GenerateDebugInformation>
113      <GenerateDebugInformation>true</GenerateDebugInformation>

133    </Link>
114    </Link>

134  </ItemDefinitionGroup>
115  </ItemDefinitionGroup>

135  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
116  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

136    <ClCompile>
117    <ClCompile>

137      <PrecompiledHeader>NotUsing</PrecompiledHeader>
118      <PrecompiledHeader>NotUsing</PrecompiledHeader>

138      <WarningLevel>Level2</WarningLevel>
119      <WarningLevel>Level3</WarningLevel>

139      <Optimization>Disabled</Optimization>
120      <Optimization>MaxSpeed</Optimization>


121      <FunctionLevelLinking>true</FunctionLevelLinking>


122      <IntrinsicFunctions>true</IntrinsicFunctions>

140      <SDLCheck>true</SDLCheck>
123      <SDLCheck>true</SDLCheck>

141      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

142      <ConformanceMode>true</ConformanceMode>
125      <ConformanceMode>true</ConformanceMode>

143      <LanguageStandard>stdcpp17</LanguageStandard>
126      <LanguageStandard>stdcpp17</LanguageStandard>

144      <TreatWarningAsError>true</TreatWarningAsError>


145    </ClCompile>
127    </ClCompile>

146    <Link>
128    <Link>

147      <SubSystem>Windows</SubSystem>
129      <SubSystem>Windows</SubSystem>


130      <EnableCOMDATFolding>true</EnableCOMDATFolding>


131      <OptimizeReferences>true</OptimizeReferences>

148      <GenerateDebugInformation>true</GenerateDebugInformation>
132      <GenerateDebugInformation>true</GenerateDebugInformation>

149    </Link>
133    </Link>

150  </ItemDefinitionGroup>
134  </ItemDefinitionGroup>

151  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
135  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

152    <ClCompile>
136    <ClCompile>

153      <PrecompiledHeader>Use</PrecompiledHeader>
137      <PrecompiledHeader>NotUsing</PrecompiledHeader>

154      <WarningLevel>Level3</WarningLevel>
138      <WarningLevel>Level3</WarningLevel>

155      <Optimization>MaxSpeed</Optimization>
139      <Optimization>MaxSpeed</Optimization>

156      <FunctionLevelLinking>true</FunctionLevelLinking>
140      <FunctionLevelLinking>true</FunctionLevelLinking>

157      <IntrinsicFunctions>true</IntrinsicFunctions>
141      <IntrinsicFunctions>true</IntrinsicFunctions>

158      <SDLCheck>true</SDLCheck>
142      <SDLCheck>true</SDLCheck>

159      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

160      <ConformanceMode>true</ConformanceMode>
144      <ConformanceMode>true</ConformanceMode>


145      <LanguageStandard>stdcpp17</LanguageStandard>

161    </ClCompile>
146    </ClCompile>

162    <Link>
147    <Link>

163      <SubSystem>Windows</SubSystem>
148      <SubSystem>Windows</SubSystem>
@@ -166,6 +151,22 @@

166      <GenerateDebugInformation>true</GenerateDebugInformation>
151      <GenerateDebugInformation>true</GenerateDebugInformation>

167    </Link>
152    </Link>

168  </ItemDefinitionGroup>
153  </ItemDefinitionGroup>


154  <ItemGroup>


155    <ClInclude Include="json.hpp" />


156    <ClInclude Include="Memory.h" />


157    <ClInclude Include="Panel.h" />


158    <ClInclude Include="Panels.h" />


159    <ClInclude Include="Random.h" />


160    <ClInclude Include="Randomizer.h" />


161    <ClInclude Include="RandomizerCore.h" />


162  </ItemGroup>


163  <ItemGroup>


164    <ClCompile Include="Memory.cpp" />


165    <ClCompile Include="Panel.cpp" />


166    <ClCompile Include="Random.cpp" />


167    <ClCompile Include="Randomizer.cpp" />


168    <ClCompile Include="RandomizerCore.cpp" />


169  </ItemGroup>

169  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
170  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

170  <ImportGroup Label="ExtensionTargets">
171  <ImportGroup Label="ExtensionTargets">

171  </ImportGroup>
172  </ImportGroup>
diff --git a/Source/Source.vcxproj.filters b/Source/Source.vcxproj.filters
deleted file mode 100644
index fe9204f..0000000
--- a/Source/Source.vcxproj.filters
+++ /dev/null

@@ -1,57 +0,0 @@

1<?xml version="1.0" encoding="utf-8"?>


2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


3  <ItemGroup>


4    <Filter Include="Source Files">


5      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>


6      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>


7    </Filter>


8    <Filter Include="Header Files">


9      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>


10      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>


11    </Filter>


12    <Filter Include="Resource Files">


13      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>


14      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>


15    </Filter>


16  </ItemGroup>


17  <ItemGroup>


18    <ClInclude Include="json.hpp">


19      <Filter>Header Files</Filter>


20    </ClInclude>


21    <ClInclude Include="Memory.h">


22      <Filter>Header Files</Filter>


23    </ClInclude>


24    <ClInclude Include="Panel.h">


25      <Filter>Header Files</Filter>


26    </ClInclude>


27    <ClInclude Include="Panels.h">


28      <Filter>Header Files</Filter>


29    </ClInclude>


30    <ClInclude Include="Random.h">


31      <Filter>Header Files</Filter>


32    </ClInclude>


33    <ClInclude Include="Randomizer.h">


34      <Filter>Header Files</Filter>


35    </ClInclude>


36    <ClInclude Include="RandomizerCore.h">


37      <Filter>Header Files</Filter>


38    </ClInclude>


39  </ItemGroup>


40  <ItemGroup>


41    <ClCompile Include="Memory.cpp">


42      <Filter>Source Files</Filter>


43    </ClCompile>


44    <ClCompile Include="Panel.cpp">


45      <Filter>Source Files</Filter>


46    </ClCompile>


47    <ClCompile Include="Random.cpp">


48      <Filter>Source Files</Filter>


49    </ClCompile>


50    <ClCompile Include="Randomizer.cpp">


51      <Filter>Source Files</Filter>


52    </ClCompile>


53    <ClCompile Include="RandomizerCore.cpp">


54      <Filter>Source Files</Filter>


55    </ClCompile>


56  </ItemGroup>


57</Project>
\ No newline at end of file

diff --git a/Test/Foo.cpp b/Test/Foo.cpp
deleted file mode 100644
index d9d155e..0000000
--- a/Test/Foo.cpp
+++ /dev/null

@@ -1,11 +0,0 @@

1#include "gtest/gtest.h"


2#include "Random.h"


3


4TEST(Foo, Bar) {


5        int random1 = Random::RandInt(0, 1 << 30);


6        int random2 = Random::RandInt(0, 1 << 30);


7        ASSERT_NE(random1, random2);


8        int random3 = Random::RandInt(random1, random2);


9        ASSERT_GE(random3, random1);


10        ASSERT_LT(random3, random2);


11}

diff --git a/Test/RandomTests.cpp b/Test/RandomTests.cpp
new file mode 100644
index 0000000..a322752
--- /dev/null
+++ b/Test/RandomTests.cpp

@@ -0,0 +1,36 @@


1#include "gtest/gtest.h"


2#include "Random.h"


3


4TEST(RandomTests, RandomInRange) {


5        int random1 = Random::RandInt(0, 1 << 30);


6        int random2 = Random::RandInt(0, 1 << 30);


7        ASSERT_NE(random1, random2);


8        if (random1 > random2) std::swap(random1, random2);


9        int random3 = Random::RandInt(random1, random2);


10        std::cout << random1 << " " << random2 << " " << random3 << std::endl;


11        ASSERT_GE(random3, random1);


12        ASSERT_LE(random3, random2);


13}


14


15TEST(RandomTests, SeedWorks) {


16        Random::SetSeed(0);


17        ASSERT_EQ(2531011, Random::RandInt(0, 1 << 30));


18        ASSERT_EQ(505908858, Random::RandInt(0, 1 << 30));


19        ASSERT_EQ(318135124, Random::RandInt(0, 1 << 30));


20        ASSERT_EQ(159719620, Random::RandInt(0, 1 << 30));


21        Random::SetSeed(0);


22        ASSERT_EQ(2531011, Random::RandInt(0, 1 << 30));


23}


24


25TEST(RandomTests, SeedChangesInitialValue) {


26        Random::SetSeed(0);


27        int random1 = Random::RandInt(0, 1 << 30);


28        Random::SetSeed(1);


29        int random2 = Random::RandInt(0, 1 << 30);


30        ASSERT_NE(random1, random2);


31


32        Random::SetSeed(2);


33        int random3 = Random::RandInt(0, 1 << 30);


34        ASSERT_NE(random3, random1);


35        ASSERT_NE(random3, random2);


36}
\ No newline at end of file
diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj
index 36b192a..b53800b 100644
--- a/Test/Test.vcxproj
+++ b/Test/Test.vcxproj

@@ -19,7 +19,7 @@

19    </ProjectConfiguration>
19    </ProjectConfiguration>

20  </ItemGroup>
20  </ItemGroup>

21  <PropertyGroup Label="Globals">
21  <PropertyGroup Label="Globals">

22    <ProjectGuid>{2208ee21-5366-4042-89d6-1a3c4bd79ad4}</ProjectGuid>
22    <ProjectGuid>{128784c2-9157-4291-8fd6-44637be162fb}</ProjectGuid>

23    <Keyword>Win32Proj</Keyword>
23    <Keyword>Win32Proj</Keyword>

24    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
24    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>

25    <ConfigurationType>Application</ConfigurationType>
25    <ConfigurationType>Application</ConfigurationType>
@@ -32,38 +32,33 @@

32  <ImportGroup Label="Shared" />
32  <ImportGroup Label="Shared" />

33  <ImportGroup Label="PropertySheets" />
33  <ImportGroup Label="PropertySheets" />

34  <PropertyGroup Label="UserMacros" />
34  <PropertyGroup Label="UserMacros" />

35  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
35  <ItemGroup>

36    <IncludePath>$(IncludePath)</IncludePath>
36    <ClCompile Include="RandomTests.cpp" />

37  </PropertyGroup>
37  </ItemGroup>

38  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">


39    <IncludePath>$(IncludePath)</IncludePath>


40  </PropertyGroup>


41  <ItemGroup>
38  <ItemGroup>

42    <ProjectReference Include="..\Source\Source.vcxproj">
39    <ProjectReference Include="..\Source\Source.vcxproj">

43      <Project>{5c019bea-e0b4-4215-825f-6a228cd3ae27}</Project>
40      <Project>{6b5df051-a51a-48cb-8acd-c6fad726019f}</Project>

44    </ProjectReference>
41    </ProjectReference>

45  </ItemGroup>
42  </ItemGroup>

46  <ItemGroup>
43  <ItemGroup>

47    <None Include="packages.config" />
44    <None Include="packages.config" />

48  </ItemGroup>
45  </ItemGroup>

49  <ItemGroup>


50    <ClCompile Include="Foo.cpp" />


51  </ItemGroup>


52  <ItemDefinitionGroup />
46  <ItemDefinitionGroup />

53  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
47  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

54  <ImportGroup Label="ExtensionTargets">
48  <ImportGroup Label="ExtensionTargets">

55    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
49    <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')" />

56  </ImportGroup>
50  </ImportGroup>

57  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
51  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

58    <ClCompile>
52    <ClCompile>

59      <PrecompiledHeader>Use</PrecompiledHeader>
53      <PrecompiledHeader>NotUsing</PrecompiledHeader>

60      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
54      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

61      <Optimization>Disabled</Optimization>
55      <Optimization>Disabled</Optimization>

62      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
56      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

63      <MinimalRebuild>true</MinimalRebuild>
57      <MinimalRebuild>true</MinimalRebuild>

64      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
58      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

65      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
59      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

66      <WarningLevel>Level3</WarningLevel>
60      <WarningLevel>Level3</WarningLevel>


61      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

67    </ClCompile>
62    </ClCompile>

68    <Link>
63    <Link>

69      <GenerateDebugInformation>true</GenerateDebugInformation>
64      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -78,11 +73,9 @@

78      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
73      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

79      <MinimalRebuild>true</MinimalRebuild>
74      <MinimalRebuild>true</MinimalRebuild>

80      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
75      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

81      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
76      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

82      <WarningLevel>Level2</WarningLevel>
77      <WarningLevel>Level3</WarningLevel>

83      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
78      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

84      <TreatWarningAsError>true</TreatWarningAsError>


85      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>


86    </ClCompile>
79    </ClCompile>

87    <Link>
80    <Link>

88      <GenerateDebugInformation>true</GenerateDebugInformation>
81      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -91,12 +84,13 @@

91  </ItemDefinitionGroup>
84  </ItemDefinitionGroup>

92  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
85  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

93    <ClCompile>
86    <ClCompile>

94      <PrecompiledHeader>Use</PrecompiledHeader>
87      <PrecompiledHeader>NotUsing</PrecompiledHeader>

95      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
88      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

96      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

97      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
90      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

98      <WarningLevel>Level3</WarningLevel>
91      <WarningLevel>Level3</WarningLevel>

99      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
92      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>


93      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

100    </ClCompile>
94    </ClCompile>

101    <Link>
95    <Link>

102      <GenerateDebugInformation>true</GenerateDebugInformation>
96      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -110,12 +104,10 @@

110      <PrecompiledHeader>NotUsing</PrecompiledHeader>
104      <PrecompiledHeader>NotUsing</PrecompiledHeader>

111      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
105      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

112      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

113      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
107      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

114      <WarningLevel>Level2</WarningLevel>
108      <WarningLevel>Level3</WarningLevel>

115      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
109      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

116      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
110      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

117      <TreatWarningAsError>true</TreatWarningAsError>


118      <AdditionalIncludeDirectories>C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>


119    </ClCompile>
111    </ClCompile>

120    <Link>
112    <Link>

121      <GenerateDebugInformation>true</GenerateDebugInformation>
113      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -128,6 +120,6 @@

128    <PropertyGroup>
120    <PropertyGroup>

129      <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>
121      <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>

130    </PropertyGroup>
122    </PropertyGroup>

131    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
123    <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'))" />

132  </Target>
124  </Target>

133</Project>
\ No newline at end of file
125</Project>
\ No newline at end of file
diff --git a/Test/packages.config b/Test/packages.config
index 0acd30a..1dcab87 100644
--- a/Test/packages.config
+++ b/Test/packages.config

@@ -1,4 +1,4 @@

1<?xml version="1.0" encoding="utf-8"?>
1<?xml version="1.0" encoding="utf-8"?>

2<packages>
2<packages>

3  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.0" targetFramework="native" />
3  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.0" targetFramework="native" />

4</packages>
\ No newline at end of file
4</packages>
\ No newline at end of file
diff --git a/WitnessRandomizer.sln b/WitnessRandomizer.sln
index a9d1f7e..7821549 100644
--- a/WitnessRandomizer.sln
+++ b/WitnessRandomizer.sln

@@ -3,19 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00

3# Visual Studio 15
3# Visual Studio 15

4VisualStudioVersion = 15.0.28010.2048
4VisualStudioVersion = 15.0.28010.2048

5MinimumVisualStudioVersion = 10.0.40219.1
5MinimumVisualStudioVersion = 10.0.40219.1

6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{CED79182-F36B-4D07-AD0E-249C15BFAD73}"
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{235D27F1-9907-489B-8D58-636A0C5CD079}"

7        ProjectSection(ProjectDependencies) = postProject
7        ProjectSection(ProjectDependencies) = postProject

8                {5C019BEA-E0B4-4215-825F-6A228CD3AE27} = {5C019BEA-E0B4-4215-825F-6A228CD3AE27}
8                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F} = {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}

9        EndProjectSection
9        EndProjectSection

10EndProject
10EndProject

11Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}"
11Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{6B5DF051-A51A-48CB-8ACD-C6FAD726019F}"

12        ProjectSection(ProjectDependencies) = postProject


13                {5C019BEA-E0B4-4215-825F-6A228CD3AE27} = {5C019BEA-E0B4-4215-825F-6A228CD3AE27}


14        EndProjectSection


15EndProject
12EndProject

16Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{5C019BEA-E0B4-4215-825F-6A228CD3AE27}"
13Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{78DEDBBE-AC84-496D-8907-40089B464A5B}"

17EndProject
14EndProject

18Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{2208EE21-5366-4042-89D6-1A3C4BD79AD4}"
15Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{128784C2-9157-4291-8FD6-44637BE162FB}"

19EndProject
16EndProject

20Global
17Global

21        GlobalSection(SolutionConfigurationPlatforms) = preSolution
18        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,41 +22,39 @@ Global

25                Release|x86 = Release|x86
22                Release|x86 = Release|x86

26        EndGlobalSection
23        EndGlobalSection

27        GlobalSection(ProjectConfigurationPlatforms) = postSolution
24        GlobalSection(ProjectConfigurationPlatforms) = postSolution

28                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.ActiveCfg = Debug|x64
25                {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x64.ActiveCfg = Debug|x64

29                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.Build.0 = Debug|x64
26                {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x64.Build.0 = Debug|x64

30                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.ActiveCfg = Release|x64
27                {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x86.ActiveCfg = Debug|Win32

31                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.Build.0 = Release|x64
28                {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x86.Build.0 = Debug|Win32

32                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.ActiveCfg = Debug|x64
29                {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x64.ActiveCfg = Release|x64

33                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.Build.0 = Debug|x64
30                {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x64.Build.0 = Release|x64

34                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.ActiveCfg = Release|Win32
31                {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x86.ActiveCfg = Release|Win32

35                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.Build.0 = Release|Win32
32                {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x86.Build.0 = Release|Win32

36                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.ActiveCfg = Debug
33                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x64.ActiveCfg = Debug|x64

37                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.Build.0 = Debug
34                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x64.Build.0 = Debug|x64

38                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x86.ActiveCfg = Release
35                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x86.ActiveCfg = Debug|Win32

39                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.ActiveCfg = Debug
36                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x86.Build.0 = Debug|Win32

40                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.Build.0 = Debug
37                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x64.ActiveCfg = Release|x64

41                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x86.ActiveCfg = Release
38                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x64.Build.0 = Release|x64

42                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x64.ActiveCfg = Debug|x64
39                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.ActiveCfg = Release|Win32

43                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x64.Build.0 = Debug|x64
40                {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.Build.0 = Release|Win32

44                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x86.ActiveCfg = Debug|Win32
41                {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x64.ActiveCfg = Debug

45                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x86.Build.0 = Debug|Win32
42                {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x86.ActiveCfg = Debug

46                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x64.ActiveCfg = Debug|x64
43                {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x64.ActiveCfg = Release

47                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x64.Build.0 = Debug|x64
44                {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x86.ActiveCfg = Release

48                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x86.ActiveCfg = Release|Win32
45                {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.ActiveCfg = Debug|x64

49                {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x86.Build.0 = Release|Win32
46                {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.Build.0 = Debug|x64

50                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x64.ActiveCfg = Debug|x64
47                {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x86.ActiveCfg = Debug|Win32

51                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x64.Build.0 = Debug|x64
48                {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x86.Build.0 = Debug|Win32

52                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x86.ActiveCfg = Debug|Win32
49                {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x64.ActiveCfg = Release|x64

53                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x86.Build.0 = Debug|Win32
50                {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x64.Build.0 = Release|x64

54                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x64.ActiveCfg = Debug|x64
51                {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.ActiveCfg = Release|Win32

55                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x64.Build.0 = Debug|x64
52                {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.Build.0 = Release|Win32

56                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x86.ActiveCfg = Release|Win32


57                {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x86.Build.0 = Release|Win32


58        EndGlobalSection
53        EndGlobalSection

59        GlobalSection(SolutionProperties) = preSolution
54        GlobalSection(SolutionProperties) = preSolution

60                HideSolutionNode = FALSE
55                HideSolutionNode = FALSE

61        EndGlobalSection
56        EndGlobalSection

62        GlobalSection(ExtensibilityGlobals) = postSolution
57        GlobalSection(ExtensibilityGlobals) = postSolution

63                SolutionGuid = {FA6FC0F4-9C3E-4A88-91BD-BB64F7455207}
58                SolutionGuid = {CAE16173-9C75-4436-899B-6A2AC4264283}

64        EndGlobalSection
59        EndGlobalSection

65EndGlobal
60EndGlobal
diff --git a/WitnessRandomizer.vcxproj b/WitnessRandomizer.vcxproj
deleted file mode 100644
index e70c453..0000000
--- a/WitnessRandomizer.vcxproj
+++ /dev/null

@@ -1,122 +0,0 @@

1<?xml version="1.0" encoding="utf-8"?>


2<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


3  <ItemGroup Label="ProjectConfigurations">


4    <ProjectConfiguration Include="Debug|Win32">


5      <Configuration>Debug</Configuration>


6      <Platform>Win32</Platform>


7    </ProjectConfiguration>


8    <ProjectConfiguration Include="Release|Win32">


9      <Configuration>Release</Configuration>


10      <Platform>Win32</Platform>


11    </ProjectConfiguration>


12    <ProjectConfiguration Include="Debug|x64">


13      <Configuration>Debug</Configuration>


14      <Platform>x64</Platform>


15    </ProjectConfiguration>


16    <ProjectConfiguration Include="Release|x64">


17      <Configuration>Release</Configuration>


18      <Platform>x64</Platform>


19    </ProjectConfiguration>


20  </ItemGroup>


21  <PropertyGroup Label="Globals">


22    <VCProjectVersion>15.0</VCProjectVersion>


23    <ProjectGuid>{B1AF0C99-EDE5-464E-9092-7817365235F1}</ProjectGuid>


24    <RootNamespace>WitnessRandomizer</RootNamespace>


25    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>


26  </PropertyGroup>


27  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />


28  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">


29    <ConfigurationType>Application</ConfigurationType>


30    <UseDebugLibraries>true</UseDebugLibraries>


31    <PlatformToolset>v141</PlatformToolset>


32    <CharacterSet>MultiByte</CharacterSet>


33  </PropertyGroup>


34  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">


35    <ConfigurationType>Application</ConfigurationType>


36    <UseDebugLibraries>false</UseDebugLibraries>


37    <PlatformToolset>v141</PlatformToolset>


38    <WholeProgramOptimization>true</WholeProgramOptimization>


39    <CharacterSet>MultiByte</CharacterSet>


40  </PropertyGroup>


41  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">


42    <ConfigurationType>Application</ConfigurationType>


43    <UseDebugLibraries>true</UseDebugLibraries>


44    <PlatformToolset>v141</PlatformToolset>


45    <CharacterSet>MultiByte</CharacterSet>


46  </PropertyGroup>


47  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">


48    <ConfigurationType>Application</ConfigurationType>


49    <UseDebugLibraries>false</UseDebugLibraries>


50    <PlatformToolset>v141</PlatformToolset>


51    <WholeProgramOptimization>true</WholeProgramOptimization>


52    <CharacterSet>MultiByte</CharacterSet>


53  </PropertyGroup>


54  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />


55  <ImportGroup Label="ExtensionSettings">


56  </ImportGroup>


57  <ImportGroup Label="Shared">


58  </ImportGroup>


59  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">


60    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />


61  </ImportGroup>


62  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">


63    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />


64  </ImportGroup>


65  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">


66    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />


67  </ImportGroup>


68  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">


69    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />


70  </ImportGroup>


71  <PropertyGroup Label="UserMacros" />


72  <PropertyGroup />


73  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">


74    <ClCompile>


75      <WarningLevel>Level3</WarningLevel>


76      <Optimization>Disabled</Optimization>


77      <SDLCheck>true</SDLCheck>


78      <ConformanceMode>true</ConformanceMode>


79    </ClCompile>


80  </ItemDefinitionGroup>


81  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">


82    <ClCompile>


83      <WarningLevel>Level3</WarningLevel>


84      <Optimization>Disabled</Optimization>


85      <SDLCheck>true</SDLCheck>


86      <ConformanceMode>true</ConformanceMode>


87    </ClCompile>


88  </ItemDefinitionGroup>


89  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">


90    <ClCompile>


91      <WarningLevel>Level3</WarningLevel>


92      <Optimization>MaxSpeed</Optimization>


93      <FunctionLevelLinking>true</FunctionLevelLinking>


94      <IntrinsicFunctions>true</IntrinsicFunctions>


95      <SDLCheck>true</SDLCheck>


96      <ConformanceMode>true</ConformanceMode>


97    </ClCompile>


98    <Link>


99      <EnableCOMDATFolding>true</EnableCOMDATFolding>


100      <OptimizeReferences>true</OptimizeReferences>


101    </Link>


102  </ItemDefinitionGroup>


103  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">


104    <ClCompile>


105      <WarningLevel>Level3</WarningLevel>


106      <Optimization>MaxSpeed</Optimization>


107      <FunctionLevelLinking>true</FunctionLevelLinking>


108      <IntrinsicFunctions>true</IntrinsicFunctions>


109      <SDLCheck>true</SDLCheck>


110      <ConformanceMode>true</ConformanceMode>


111    </ClCompile>


112    <Link>


113      <EnableCOMDATFolding>true</EnableCOMDATFolding>


114      <OptimizeReferences>true</OptimizeReferences>


115    </Link>


116  </ItemDefinitionGroup>


117  <ItemGroup>


118  </ItemGroup>


119  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />


120  <ImportGroup Label="ExtensionTargets">


121  </ImportGroup>


122</Project>
\ No newline at end of file

diff --git a/WitnessRandomizer.vcxproj.filters b/WitnessRandomizer.vcxproj.filters
deleted file mode 100644
index 4863ddb..0000000
--- a/WitnessRandomizer.vcxproj.filters
+++ /dev/null

@@ -1,17 +0,0 @@

1<?xml version="1.0" encoding="utf-8"?>


2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


3  <ItemGroup>


4    <Filter Include="Source Files">


5      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>


6      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>


7    </Filter>


8    <Filter Include="Header Files">


9      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>


10      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>


11    </Filter>


12    <Filter Include="Resource Files">


13      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>


14      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>


15    </Filter>


16  </ItemGroup>


17</Project>
\ No newline at end of file

 

generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 02:18:19 +0000