about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorjbzdarkid <jbzdarkid@gmail.com>2018-10-27 23:28:42 -0700
committerjbzdarkid <jbzdarkid@gmail.com>2018-10-27 23:28:42 -0700
commit2c9afc07fe5cc53fefb90540d5db2ca424c71a51 (patch)
tree55ba19ae0e3f52f732d9382b6deccf6d879035c7
parentecc14a3463c0c1c52b5de17d2aeb719ce2942a4a (diff)
downloadwitness-tutorializer-2c9afc07fe5cc53fefb90540d5db2ca424c71a51.tar.gz
witness-tutorializer-2c9afc07fe5cc53fefb90540d5db2ca424c71a51.tar.bz2
witness-tutorializer-2c9afc07fe5cc53fefb90540d5db2ca424c71a51.zip
Major restructuring -- also set up for UI work tomorrow
Diffstat
-rw-r--r--Installer/Installer.vdproj (renamed from WitnessRandomizerInstaller.vdproj)394


-rw-r--r--Source/Main.cppbin0 -> 9990 bytes
-rw-r--r--Source/Main.hbin0 -> 80 bytes
-rw-r--r--Source/Memory.cpp (renamed from WitnessRandomizer/Memory.cpp)0


-rw-r--r--Source/Memory.h (renamed from WitnessRandomizer/Memory.h)0


-rw-r--r--Source/Panels.h (renamed from WitnessRandomizer/Panels.h)0


-rw-r--r--Source/Randomizer.cpp (renamed from WitnessRandomizer/WitnessRandomizer.cpp)14


-rw-r--r--Source/Randomizer.h (renamed from WitnessRandomizer/WitnessRandomizer.h)13


-rw-r--r--Source/Resource.hbin0 -> 1456 bytes
-rw-r--r--Source/Source.icobin0 -> 46227 bytes
-rw-r--r--Source/Source.rcbin0 -> 6810 bytes
-rw-r--r--Source/Source.vcxproj (renamed from WitnessRandomizer/WitnessRandomizer.vcxproj)58


-rw-r--r--Source/Source.vcxproj.filters67


-rw-r--r--Source/small.icobin0 -> 46227 bytes
-rw-r--r--Source/stdafx.cppbin0 -> 44 bytes
-rw-r--r--Source/stdafx.hbin0 -> 1046 bytes
-rw-r--r--Source/targetver.hbin0 -> 630 bytes
-rw-r--r--Test/OrderingTests.cpp7


-rw-r--r--Test/Test.vcxproj124


-rw-r--r--Test/packages.config4


-rw-r--r--WitnessRandomizer.sln38


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


-rw-r--r--WitnessRandomizer.vcxproj.filters (renamed from WitnessRandomizer/WitnessRandomizer.vcxproj.filters)19


-rw-r--r--WitnessRandomizerInstaller.sln41


24 files changed, 579 insertions, 322 deletions
diff --git a/WitnessRandomizerInstaller.vdproj b/Installer/Installer.vdproj
index 922b7d1..b86b787 100644
--- a/WitnessRandomizerInstaller.vdproj
+++ b/Installer/Installer.vdproj

@@ -3,7 +3,7 @@

3"VSVersion" = "3:800"
3"VSVersion" = "3:800"

4"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
4"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"

5"IsWebType" = "8:FALSE"
5"IsWebType" = "8:FALSE"

6"ProjectName" = "8:WitnessRandomizerInstaller"
6"ProjectName" = "8:Installer"

7"LanguageId" = "3:1033"
7"LanguageId" = "3:1033"

8"CodePage" = "3:1252"
8"CodePage" = "3:1252"

9"UILanguageId" = "3:1033"
9"UILanguageId" = "3:1033"
@@ -15,7 +15,7 @@

15    {
15    {

16        "Entry"
16        "Entry"

17        {
17        {

18        "MsmKey" = "8:_99BCB0A7745940D890C011AEB10ED05F"
18        "MsmKey" = "8:_E86F0F0DE4B646B6956C8E30890951D2"

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

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

21        }
21        }
@@ -27,7 +27,7 @@

27        "DisplayName" = "8:Debug"
27        "DisplayName" = "8:Debug"

28        "IsDebugOnly" = "11:TRUE"
28        "IsDebugOnly" = "11:TRUE"

29        "IsReleaseOnly" = "11:FALSE"
29        "IsReleaseOnly" = "11:FALSE"

30        "OutputFilename" = "8:Debug\\WitnessRandomizerInstaller.msi"
30        "OutputFilename" = "8:Debug\\Installer.msi"

31        "PackageFilesAs" = "3:2"
31        "PackageFilesAs" = "3:2"

32        "PackageFileSize" = "3:-2147483648"
32        "PackageFileSize" = "3:-2147483648"

33        "CabType" = "3:1"
33        "CabType" = "3:1"
@@ -37,29 +37,13 @@

37        "PrivateKeyFile" = "8:"
37        "PrivateKeyFile" = "8:"

38        "TimeStampServer" = "8:"
38        "TimeStampServer" = "8:"

39        "InstallerBootstrapper" = "3:2"
39        "InstallerBootstrapper" = "3:2"

40            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"


41            {


42            "Enabled" = "11:TRUE"


43            "PromptEnabled" = "11:TRUE"


44            "PrerequisitesLocation" = "2:1"


45            "Url" = "8:"


46            "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            }


56        }
40        }

57        "Release"
41        "Release"

58        {
42        {

59        "DisplayName" = "8:Release"
43        "DisplayName" = "8:Release"

60        "IsDebugOnly" = "11:FALSE"
44        "IsDebugOnly" = "11:FALSE"

61        "IsReleaseOnly" = "11:TRUE"
45        "IsReleaseOnly" = "11:TRUE"

62        "OutputFilename" = "8:Release\\WitnessRandomizer.msi"
46        "OutputFilename" = "8:Installer.msi"

63        "PackageFilesAs" = "3:2"
47        "PackageFilesAs" = "3:2"

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

65        "CabType" = "3:1"
49        "CabType" = "3:1"
@@ -69,22 +53,6 @@

69        "PrivateKeyFile" = "8:"
53        "PrivateKeyFile" = "8:"

70        "TimeStampServer" = "8:"
54        "TimeStampServer" = "8:"

71        "InstallerBootstrapper" = "3:2"
55        "InstallerBootstrapper" = "3:2"

72            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"


73            {


74            "Enabled" = "11:TRUE"


75            "PromptEnabled" = "11:TRUE"


76            "PrerequisitesLocation" = "2:1"


77            "Url" = "8:"


78            "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            }


88        }
56        }

89    }
57    }

90    "Deployable"
58    "Deployable"
@@ -112,30 +80,30 @@

112        }
80        }

113        "Folder"
81        "Folder"

114        {
82        {

115            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_D9D31B4A38DF41E78ABAD33DDC72CD52"
83            "{1525181F-901A-416C-8A58-119130FE478E}:_4D19640D10EA43E68046262546954A5E"

116            {
84            {

117            "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]"
85            "Name" = "8:#1916"

118            "Name" = "8:#1925"


119            "AlwaysCreate" = "11:FALSE"
86            "AlwaysCreate" = "11:FALSE"

120            "Condition" = "8:"
87            "Condition" = "8:"

121            "Transitive" = "11:FALSE"
88            "Transitive" = "11:FALSE"

122            "Property" = "8:TARGETDIR"
89            "Property" = "8:DesktopFolder"

123                "Folders"
90                "Folders"

124                {
91                {

125                }
92                }

126            }
93            }

127            "{1525181F-901A-416C-8A58-119130FE478E}:_E6EFC2A563B94B588E829ED15D2EE070"
94            "{3C67513D-01DD-4637-8A68-80971EB9504F}:_5393EB12357E4BF29E8149058ABE909F"

128            {
95            {

129            "Name" = "8:#1916"
96            "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]"


97            "Name" = "8:#1925"

130            "AlwaysCreate" = "11:FALSE"
98            "AlwaysCreate" = "11:FALSE"

131            "Condition" = "8:"
99            "Condition" = "8:"

132            "Transitive" = "11:FALSE"
100            "Transitive" = "11:FALSE"

133            "Property" = "8:DesktopFolder"
101            "Property" = "8:TARGETDIR"

134                "Folders"
102                "Folders"

135                {
103                {

136                }
104                }

137            }
105            }

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

139            {
107            {

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

141            "AlwaysCreate" = "11:FALSE"
109            "AlwaysCreate" = "11:FALSE"
@@ -161,25 +129,25 @@

161        "Product"
129        "Product"

162        {
130        {

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

164        "ProductName" = "8:WitnessRandomizer"
132        "ProductName" = "8:Installer"

165        "ProductCode" = "8:{CFA35C1B-207B-4F9A-AF67-3D3FC8B47530}"
133        "ProductCode" = "8:{34868EC7-346B-490E-A881-16189741A4A1}"

166        "PackageCode" = "8:{EB510A81-D971-401F-BCA1-03DB37ED9F10}"
134        "PackageCode" = "8:{5699DE4A-74E2-4F40-BEE5-B5518D72CA61}"

167        "UpgradeCode" = "8:{B2AF0F34-4917-4AEC-B892-FE4FD4B9584A}"
135        "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"

168        "AspNetVersion" = "8:2.0.50727.0"
136        "AspNetVersion" = "8:2.0.50727.0"

169        "RestartWWWService" = "11:FALSE"
137        "RestartWWWService" = "11:FALSE"

170        "RemovePreviousVersions" = "11:TRUE"
138        "RemovePreviousVersions" = "11:TRUE"

171        "DetectNewerInstalledVersion" = "11:TRUE"
139        "DetectNewerInstalledVersion" = "11:TRUE"

172        "InstallAllUsers" = "11:FALSE"
140        "InstallAllUsers" = "11:FALSE"

173        "ProductVersion" = "8:1.0.3"
141        "ProductVersion" = "8:2.0.0"

174        "Manufacturer" = "8:jbzdarkid"
142        "Manufacturer" = "8:jbzdarkid"

175        "ARPHELPTELEPHONE" = "8:"
143        "ARPHELPTELEPHONE" = "8:"

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

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

178        "Subject" = "8:"
146        "Subject" = "8:"

179        "ARPCONTACT" = "8:jbzdarkid"
147        "ARPCONTACT" = "8:jbzdarkid"

180        "Keywords" = "8:"
148        "Keywords" = "8:"

181        "ARPCOMMENTS" = "8:Randomizer for The Witness"
149        "ARPCOMMENTS" = "8:Randomizer for The Witness"

182        "ARPURLINFOABOUT" = "8:www.github.com/jbzdarkid/witness-randomizer"
150        "ARPURLINFOABOUT" = "8:https://www.github.com/jbzdarkid/witness-randomizer"

183        "ARPPRODUCTICON" = "8:"
151        "ARPPRODUCTICON" = "8:"

184        "ARPIconIndex" = "3:0"
152        "ARPIconIndex" = "3:0"

185        "SearchPath" = "8:"
153        "SearchPath" = "8:"
@@ -195,7 +163,7 @@

195            {
163            {

196                "Keys"
164                "Keys"

197                {
165                {

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

199                    {
167                    {

200                    "Name" = "8:Software"
168                    "Name" = "8:Software"

201                    "Condition" = "8:"
169                    "Condition" = "8:"
@@ -204,7 +172,7 @@

204                    "Transitive" = "11:FALSE"
172                    "Transitive" = "11:FALSE"

205                        "Keys"
173                        "Keys"

206                        {
174                        {

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

208                            {
176                            {

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

210                            "Condition" = "8:"
178                            "Condition" = "8:"
@@ -229,7 +197,7 @@

229            {
197            {

230                "Keys"
198                "Keys"

231                {
199                {

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

233                    {
201                    {

234                    "Name" = "8:Software"
202                    "Name" = "8:Software"

235                    "Condition" = "8:"
203                    "Condition" = "8:"
@@ -238,7 +206,7 @@

238                    "Transitive" = "11:FALSE"
206                    "Transitive" = "11:FALSE"

239                        "Keys"
207                        "Keys"

240                        {
208                        {

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

242                            {
210                            {

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

244                            "Condition" = "8:"
212                            "Condition" = "8:"
@@ -283,7 +251,7 @@

283        }
251        }

284        "Shortcut"
252        "Shortcut"

285        {
253        {

286            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_17BDAE346F194FD0B84D3B6F64454455"
254            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_B30BF820F5E14F0DA12BBD906ADF0C86"

287            {
255            {

288            "Name" = "8:WitnessRandomizer"
256            "Name" = "8:WitnessRandomizer"

289            "Arguments" = "8:"
257            "Arguments" = "8:"
@@ -291,29 +259,35 @@

291            "ShowCmd" = "3:1"
259            "ShowCmd" = "3:1"

292            "IconIndex" = "3:0"
260            "IconIndex" = "3:0"

293            "Transitive" = "11:FALSE"
261            "Transitive" = "11:FALSE"

294            "Target" = "8:_99BCB0A7745940D890C011AEB10ED05F"
262            "Target" = "8:_E86F0F0DE4B646B6956C8E30890951D2"

295            "Folder" = "8:_EC75B6D2E5304ADCACB28DC7CA4365A2"
263            "Folder" = "8:_B2294C987D6245B881C99CC1494F9A53"

296            "WorkingFolder" = "8:_D9D31B4A38DF41E78ABAD33DDC72CD52"
264            "WorkingFolder" = "8:_5393EB12357E4BF29E8149058ABE909F"

297            "Icon" = "8:"
265            "Icon" = "8:"

298            "Feature" = "8:"
266            "Feature" = "8:"

299            }
267            }

300        }
268        }

301        "UserInterface"
269        "UserInterface"

302        {
270        {

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

304            {
272            {

305            "Name" = "8:#1901"
273            "UseDynamicProperties" = "11:FALSE"


274            "IsDependency" = "11:FALSE"


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


276            }


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


278            {


279            "Name" = "8:#1900"

306            "Sequence" = "3:2"
280            "Sequence" = "3:2"

307            "Attributes" = "3:2"
281            "Attributes" = "3:1"

308                "Dialogs"
282                "Dialogs"

309                {
283                {

310                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_246CF02A71224692AE1FCD645D0C550C"
284                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_53574943921E4B3DB4C03DD3D6CA432C"

311                    {
285                    {

312                    "Sequence" = "3:100"
286                    "Sequence" = "3:300"

313                    "DisplayName" = "8:Progress"
287                    "DisplayName" = "8:Confirm Installation"

314                    "UseDynamicProperties" = "11:TRUE"
288                    "UseDynamicProperties" = "11:TRUE"

315                    "IsDependency" = "11:FALSE"
289                    "IsDependency" = "11:FALSE"

316                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
290                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"

317                        "Properties"
291                        "Properties"

318                        {
292                        {

319                            "BannerBitmap"
293                            "BannerBitmap"
@@ -327,37 +301,15 @@

327                            "Setting" = "3:1"
301                            "Setting" = "3:1"

328                            "UsePlugInResources" = "11:TRUE"
302                            "UsePlugInResources" = "11:TRUE"

329                            }
303                            }

330                            "ShowProgress"


331                            {


332                            "Name" = "8:ShowProgress"


333                            "DisplayName" = "8:#1009"


334                            "Description" = "8:#1109"


335                            "Type" = "3:5"


336                            "ContextData" = "8:1;True=1;False=0"


337                            "Attributes" = "3:0"


338                            "Setting" = "3:0"


339                            "Value" = "3:1"


340                            "DefaultValue" = "3:1"


341                            "UsePlugInResources" = "11:TRUE"


342                            }


343                        }
304                        }

344                    }
305                    }

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

346            }


347            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_1F1DB42220714DF3AD764FE81693D17B"


348            {


349            "Name" = "8:#1901"


350            "Sequence" = "3:1"


351            "Attributes" = "3:2"


352                "Dialogs"


353                {


354                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3BB25E5F9B10409982B7C4A22029DABC"


355                    {
307                    {

356                    "Sequence" = "3:100"
308                    "Sequence" = "3:200"

357                    "DisplayName" = "8:Progress"
309                    "DisplayName" = "8:Installation Folder"

358                    "UseDynamicProperties" = "11:TRUE"
310                    "UseDynamicProperties" = "11:TRUE"

359                    "IsDependency" = "11:FALSE"
311                    "IsDependency" = "11:FALSE"

360                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
312                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"

361                        "Properties"
313                        "Properties"

362                        {
314                        {

363                            "BannerBitmap"
315                            "BannerBitmap"
@@ -371,43 +323,15 @@

371                            "Setting" = "3:1"
323                            "Setting" = "3:1"

372                            "UsePlugInResources" = "11:TRUE"
324                            "UsePlugInResources" = "11:TRUE"

373                            }
325                            }

374                            "ShowProgress"


375                            {


376                            "Name" = "8:ShowProgress"


377                            "DisplayName" = "8:#1009"


378                            "Description" = "8:#1109"


379                            "Type" = "3:5"


380                            "ContextData" = "8:1;True=1;False=0"


381                            "Attributes" = "3:0"


382                            "Setting" = "3:0"


383                            "Value" = "3:1"


384                            "DefaultValue" = "3:1"


385                            "UsePlugInResources" = "11:TRUE"


386                            }


387                        }
326                        }

388                    }
327                    }

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

390            }


391            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_315683E864204DC28444A9A6E1235D0F"


392            {


393            "UseDynamicProperties" = "11:FALSE"


394            "IsDependency" = "11:FALSE"


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


396            }


397            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_31D3A86D6A484695A7AB5AB54D880CCB"


398            {


399            "Name" = "8:#1902"


400            "Sequence" = "3:1"


401            "Attributes" = "3:3"


402                "Dialogs"


403                {


404                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_96ED40E6C3E94DC3944345555DAC2381"


405                    {
329                    {

406                    "Sequence" = "3:100"
330                    "Sequence" = "3:100"

407                    "DisplayName" = "8:Finished"
331                    "DisplayName" = "8:Welcome"

408                    "UseDynamicProperties" = "11:TRUE"
332                    "UseDynamicProperties" = "11:TRUE"

409                    "IsDependency" = "11:FALSE"
333                    "IsDependency" = "11:FALSE"

410                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
334                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"

411                        "Properties"
335                        "Properties"

412                        {
336                        {

413                            "BannerBitmap"
337                            "BannerBitmap"
@@ -421,31 +345,50 @@

421                            "Setting" = "3:1"
345                            "Setting" = "3:1"

422                            "UsePlugInResources" = "11:TRUE"
346                            "UsePlugInResources" = "11:TRUE"

423                            }
347                            }

424                            "UpdateText"
348                            "CopyrightWarning"

425                            {
349                            {

426                            "Name" = "8:UpdateText"
350                            "Name" = "8:CopyrightWarning"

427                            "DisplayName" = "8:#1058"
351                            "DisplayName" = "8:#1002"

428                            "Description" = "8:#1158"
352                            "Description" = "8:#1102"

429                            "Type" = "3:15"
353                            "Type" = "3:3"

430                            "ContextData" = "8:"
354                            "ContextData" = "8:"

431                            "Attributes" = "3:0"
355                            "Attributes" = "3:0"

432                            "Setting" = "3:1"
356                            "Setting" = "3:1"

433                            "Value" = "8:#1258"
357                            "Value" = "8:#1202"

434                            "DefaultValue" = "8:#1258"
358                            "DefaultValue" = "8:#1202"


359                            "UsePlugInResources" = "11:TRUE"


360                            }


361                            "Welcome"


362                            {


363                            "Name" = "8:Welcome"


364                            "DisplayName" = "8:#1003"


365                            "Description" = "8:#1103"


366                            "Type" = "3:3"


367                            "ContextData" = "8:"


368                            "Attributes" = "3:0"


369                            "Setting" = "3:1"


370                            "Value" = "8:#1203"


371                            "DefaultValue" = "8:#1203"

435                            "UsePlugInResources" = "11:TRUE"
372                            "UsePlugInResources" = "11:TRUE"

436                            }
373                            }

437                        }
374                        }

438                    }
375                    }

439                }
376                }

440            }
377            }

441            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_43BD3ADF347E4D599B648929E79D2905"
378            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_525FC4F1C72C4EE3984593146DD26634"


379            {


380            "UseDynamicProperties" = "11:FALSE"


381            "IsDependency" = "11:FALSE"


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


383            }


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

442            {
385            {

443            "Name" = "8:#1902"
386            "Name" = "8:#1902"

444            "Sequence" = "3:2"
387            "Sequence" = "3:2"

445            "Attributes" = "3:3"
388            "Attributes" = "3:3"

446                "Dialogs"
389                "Dialogs"

447                {
390                {

448                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_17CF2961248B47F1BE9F048C2821F5AA"
391                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F7031E39D9854967A8FBADF12A890B0B"

449                    {
392                    {

450                    "Sequence" = "3:100"
393                    "Sequence" = "3:100"

451                    "DisplayName" = "8:Finished"
394                    "DisplayName" = "8:Finished"
@@ -469,26 +412,20 @@

469                    }
412                    }

470                }
413                }

471            }
414            }

472            "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_75C34DD0EF274A3C961526CAE494EB05"
415            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9359F122FC5E433F9E5A9EFF22C28425"

473            {
416            {

474            "UseDynamicProperties" = "11:FALSE"
417            "Name" = "8:#1901"

475            "IsDependency" = "11:FALSE"
418            "Sequence" = "3:1"

476            "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
419            "Attributes" = "3:2"

477            }


478            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_94854F44F47B4AB68C268B55F9272AC8"


479            {


480            "Name" = "8:#1900"


481            "Sequence" = "3:2"


482            "Attributes" = "3:1"


483                "Dialogs"
420                "Dialogs"

484                {
421                {

485                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_91CB7820557245A78F2BEC28E128F5A6"
422                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B03CE8F39FF4BA2B82BFADB5CE02784"

486                    {
423                    {

487                    "Sequence" = "3:200"
424                    "Sequence" = "3:100"

488                    "DisplayName" = "8:Installation Folder"
425                    "DisplayName" = "8:Progress"

489                    "UseDynamicProperties" = "11:TRUE"
426                    "UseDynamicProperties" = "11:TRUE"

490                    "IsDependency" = "11:FALSE"
427                    "IsDependency" = "11:FALSE"

491                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
428                    "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"

492                        "Properties"
429                        "Properties"

493                        {
430                        {

494                            "BannerBitmap"
431                            "BannerBitmap"
@@ -502,15 +439,37 @@

502                            "Setting" = "3:1"
439                            "Setting" = "3:1"

503                            "UsePlugInResources" = "11:TRUE"
440                            "UsePlugInResources" = "11:TRUE"

504                            }
441                            }


442                            "ShowProgress"


443                            {


444                            "Name" = "8:ShowProgress"


445                            "DisplayName" = "8:#1009"


446                            "Description" = "8:#1109"


447                            "Type" = "3:5"


448                            "ContextData" = "8:1;True=1;False=0"


449                            "Attributes" = "3:0"


450                            "Setting" = "3:0"


451                            "Value" = "3:1"


452                            "DefaultValue" = "3:1"


453                            "UsePlugInResources" = "11:TRUE"


454                            }

505                        }
455                        }

506                    }
456                    }

507                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F03A13F3FD82442D9A60ABA8F387556D"
457                }


458            }


459            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A1DF86A3EDDD44E594A0CDFC7F58D821"


460            {


461            "Name" = "8:#1900"


462            "Sequence" = "3:1"


463            "Attributes" = "3:1"


464                "Dialogs"


465                {


466                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_19BB8ECC0C3A4153BF658C0F22142794"

508                    {
467                    {

509                    "Sequence" = "3:300"
468                    "Sequence" = "3:200"

510                    "DisplayName" = "8:Confirm Installation"
469                    "DisplayName" = "8:Installation Folder"

511                    "UseDynamicProperties" = "11:TRUE"
470                    "UseDynamicProperties" = "11:TRUE"

512                    "IsDependency" = "11:FALSE"
471                    "IsDependency" = "11:FALSE"

513                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
472                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"

514                        "Properties"
473                        "Properties"

515                        {
474                        {

516                            "BannerBitmap"
475                            "BannerBitmap"
@@ -524,15 +483,28 @@

524                            "Setting" = "3:1"
483                            "Setting" = "3:1"

525                            "UsePlugInResources" = "11:TRUE"
484                            "UsePlugInResources" = "11:TRUE"

526                            }
485                            }


486                            "InstallAllUsersVisible"


487                            {


488                            "Name" = "8:InstallAllUsersVisible"


489                            "DisplayName" = "8:#1059"


490                            "Description" = "8:#1159"


491                            "Type" = "3:5"


492                            "ContextData" = "8:1;True=1;False=0"


493                            "Attributes" = "3:0"


494                            "Setting" = "3:0"


495                            "Value" = "3:1"


496                            "DefaultValue" = "3:1"


497                            "UsePlugInResources" = "11:TRUE"


498                            }

527                        }
499                        }

528                    }
500                    }

529                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F767EFBE51C14BEEBDDDE4EE34194C2F"
501                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3433DFF95F204C7B8A83783FA361BFCE"

530                    {
502                    {

531                    "Sequence" = "3:100"
503                    "Sequence" = "3:100"

532                    "DisplayName" = "8:Welcome"
504                    "DisplayName" = "8:Welcome"

533                    "UseDynamicProperties" = "11:TRUE"
505                    "UseDynamicProperties" = "11:TRUE"

534                    "IsDependency" = "11:FALSE"
506                    "IsDependency" = "11:FALSE"

535                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
507                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"

536                        "Properties"
508                        "Properties"

537                        {
509                        {

538                            "BannerBitmap"
510                            "BannerBitmap"
@@ -574,22 +546,13 @@

574                            }
546                            }

575                        }
547                        }

576                    }
548                    }

577                }
549                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AF4B4DA9EB504C71B314DF4C68CE15EA"

578            }


579            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_ADBB7C7C5F1C44A5BDF8196F2B399117"


580            {


581            "Name" = "8:#1900"


582            "Sequence" = "3:1"


583            "Attributes" = "3:1"


584                "Dialogs"


585                {


586                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_12ABE080AB25431587017EA259F5EE77"


587                    {
550                    {

588                    "Sequence" = "3:100"
551                    "Sequence" = "3:300"

589                    "DisplayName" = "8:Welcome"
552                    "DisplayName" = "8:Confirm Installation"

590                    "UseDynamicProperties" = "11:TRUE"
553                    "UseDynamicProperties" = "11:TRUE"

591                    "IsDependency" = "11:FALSE"
554                    "IsDependency" = "11:FALSE"

592                    "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
555                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"

593                        "Properties"
556                        "Properties"

594                        {
557                        {

595                            "BannerBitmap"
558                            "BannerBitmap"
@@ -603,41 +566,24 @@

603                            "Setting" = "3:1"
566                            "Setting" = "3:1"

604                            "UsePlugInResources" = "11:TRUE"
567                            "UsePlugInResources" = "11:TRUE"

605                            }
568                            }

606                            "CopyrightWarning"


607                            {


608                            "Name" = "8:CopyrightWarning"


609                            "DisplayName" = "8:#1002"


610                            "Description" = "8:#1102"


611                            "Type" = "3:3"


612                            "ContextData" = "8:"


613                            "Attributes" = "3:0"


614                            "Setting" = "3:1"


615                            "Value" = "8:#1202"


616                            "DefaultValue" = "8:#1202"


617                            "UsePlugInResources" = "11:TRUE"


618                            }


619                            "Welcome"


620                            {


621                            "Name" = "8:Welcome"


622                            "DisplayName" = "8:#1003"


623                            "Description" = "8:#1103"


624                            "Type" = "3:3"


625                            "ContextData" = "8:"


626                            "Attributes" = "3:0"


627                            "Setting" = "3:1"


628                            "Value" = "8:#1203"


629                            "DefaultValue" = "8:#1203"


630                            "UsePlugInResources" = "11:TRUE"


631                            }


632                        }
569                        }

633                    }
570                    }

634                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_342FF2D8B1B84AEF99509E470D61F8DB"
571                }


572            }


573            "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_AAE51F7F58C64A4B996423B01E3D8921"


574            {


575            "Name" = "8:#1902"


576            "Sequence" = "3:1"


577            "Attributes" = "3:3"


578                "Dialogs"


579                {


580                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4AF1C2264E804EE9BA6E2E014EFACBD1"

635                    {
581                    {

636                    "Sequence" = "3:200"
582                    "Sequence" = "3:100"

637                    "DisplayName" = "8:Installation Folder"
583                    "DisplayName" = "8:Finished"

638                    "UseDynamicProperties" = "11:TRUE"
584                    "UseDynamicProperties" = "11:TRUE"

639                    "IsDependency" = "11:FALSE"
585                    "IsDependency" = "11:FALSE"

640                    "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
586                    "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"

641                        "Properties"
587                        "Properties"

642                        {
588                        {

643                            "BannerBitmap"
589                            "BannerBitmap"
@@ -651,28 +597,37 @@

651                            "Setting" = "3:1"
597                            "Setting" = "3:1"

652                            "UsePlugInResources" = "11:TRUE"
598                            "UsePlugInResources" = "11:TRUE"

653                            }
599                            }

654                            "InstallAllUsersVisible"
600                            "UpdateText"

655                            {
601                            {

656                            "Name" = "8:InstallAllUsersVisible"
602                            "Name" = "8:UpdateText"

657                            "DisplayName" = "8:#1059"
603                            "DisplayName" = "8:#1058"

658                            "Description" = "8:#1159"
604                            "Description" = "8:#1158"

659                            "Type" = "3:5"
605                            "Type" = "3:15"

660                            "ContextData" = "8:1;True=1;False=0"
606                            "ContextData" = "8:"

661                            "Attributes" = "3:0"
607                            "Attributes" = "3:0"

662                            "Setting" = "3:0"
608                            "Setting" = "3:1"

663                            "Value" = "3:1"
609                            "Value" = "8:#1258"

664                            "DefaultValue" = "3:1"
610                            "DefaultValue" = "8:#1258"

665                            "UsePlugInResources" = "11:TRUE"
611                            "UsePlugInResources" = "11:TRUE"

666                            }
612                            }

667                        }
613                        }

668                    }
614                    }

669                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7FA0E634601A4E15A45B2B6BB4AE5C39"
615                }


616            }


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


618            {


619            "Name" = "8:#1901"


620            "Sequence" = "3:2"


621            "Attributes" = "3:2"


622                "Dialogs"


623                {


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

670                    {
625                    {

671                    "Sequence" = "3:300"
626                    "Sequence" = "3:100"

672                    "DisplayName" = "8:Confirm Installation"
627                    "DisplayName" = "8:Progress"

673                    "UseDynamicProperties" = "11:TRUE"
628                    "UseDynamicProperties" = "11:TRUE"

674                    "IsDependency" = "11:FALSE"
629                    "IsDependency" = "11:FALSE"

675                    "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
630                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"

676                        "Properties"
631                        "Properties"

677                        {
632                        {

678                            "BannerBitmap"
633                            "BannerBitmap"
@@ -686,6 +641,19 @@

686                            "Setting" = "3:1"
641                            "Setting" = "3:1"

687                            "UsePlugInResources" = "11:TRUE"
642                            "UsePlugInResources" = "11:TRUE"

688                            }
643                            }


644                            "ShowProgress"


645                            {


646                            "Name" = "8:ShowProgress"


647                            "DisplayName" = "8:#1009"


648                            "Description" = "8:#1109"


649                            "Type" = "3:5"


650                            "ContextData" = "8:1;True=1;False=0"


651                            "Attributes" = "3:0"


652                            "Setting" = "3:0"


653                            "Value" = "3:1"


654                            "DefaultValue" = "3:1"


655                            "UsePlugInResources" = "11:TRUE"


656                            }

689                        }
657                        }

690                    }
658                    }

691                }
659                }
@@ -696,12 +664,12 @@

696        }
664        }

697        "ProjectOutput"
665        "ProjectOutput"

698        {
666        {

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

700            {
668            {

701            "SourcePath" = "8:x64\\Release\\WitnessRandomizer.exe"
669            "SourcePath" = "8:..\\x64\\Release\\Source.exe"

702            "TargetName" = "8:"
670            "TargetName" = "8:"

703            "Tag" = "8:"
671            "Tag" = "8:"

704            "Folder" = "8:_D9D31B4A38DF41E78ABAD33DDC72CD52"
672            "Folder" = "8:_5393EB12357E4BF29E8149058ABE909F"

705            "Condition" = "8:"
673            "Condition" = "8:"

706            "Transitive" = "11:FALSE"
674            "Transitive" = "11:FALSE"

707            "Vital" = "11:TRUE"
675            "Vital" = "11:TRUE"
@@ -718,7 +686,7 @@

718            "ProjectOutputGroupRegister" = "3:1"
686            "ProjectOutputGroupRegister" = "3:1"

719            "OutputConfiguration" = "8:"
687            "OutputConfiguration" = "8:"

720            "OutputGroupCanonicalName" = "8:Built"
688            "OutputGroupCanonicalName" = "8:Built"

721            "OutputProjectGuid" = "8:{1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}"
689            "OutputProjectGuid" = "8:{CED79182-F36B-4D07-AD0E-249C15BFAD73}"

722            "ShowKeyOutput" = "11:TRUE"
690            "ShowKeyOutput" = "11:TRUE"

723                "ExcludeFilters"
691                "ExcludeFilters"

724                {
692                {
diff --git a/Source/Main.cpp b/Source/Main.cpp
new file mode 100644
index 0000000..0b9d8c5
--- /dev/null
+++ b/Source/Main.cpp

Binary files differ
diff --git a/Source/Main.h b/Source/Main.h
new file mode 100644
index 0000000..c4aafa3
--- /dev/null
+++ b/Source/Main.h

Binary files differ
diff --git a/WitnessRandomizer/Memory.cpp b/Source/Memory.cpp
index 0afeded..0afeded 100644
--- a/WitnessRandomizer/Memory.cpp
+++ b/Source/Memory.cpp

diff --git a/WitnessRandomizer/Memory.h b/Source/Memory.h
index 8e8bbc3..8e8bbc3 100644
--- a/WitnessRandomizer/Memory.h
+++ b/Source/Memory.h

diff --git a/WitnessRandomizer/Panels.h b/Source/Panels.h
index e070005..e070005 100644
--- a/WitnessRandomizer/Panels.h
+++ b/Source/Panels.h

diff --git a/WitnessRandomizer/WitnessRandomizer.cpp b/Source/Randomizer.cpp
index cf98a3a..75b3cf7 100644
--- a/WitnessRandomizer/WitnessRandomizer.cpp
+++ b/Source/Randomizer.cpp

@@ -21,7 +21,7 @@

21 * Increase odds of mountain oranges garbage on other panels?
21 * Increase odds of mountain oranges garbage on other panels?

22*/
22*/

23#include "Memory.h"
23#include "Memory.h"

24#include "WitnessRandomizer.h"
24#include "Randomizer.h"

25#include "Panels.h"
25#include "Panels.h"

26#include <string>
26#include <string>

27#include <iostream>
27#include <iostream>
@@ -39,7 +39,7 @@ size_t find(const std::vector<T> &data, T search, size_t startIndex = 0) {

39
39

40int main(int argc, char** argv)
40int main(int argc, char** argv)

41{
41{

42        WitnessRandomizer randomizer = WitnessRandomizer();
42        Randomizer randomizer = Randomizer();

43
43

44        if (argc == 2) {
44        if (argc == 2) {

45                srand(atoi(argv[1])); // Seed from the command line
45                srand(atoi(argv[1])); // Seed from the command line
@@ -115,7 +115,7 @@ int main(int argc, char** argv)

115        */
115        */

116}
116}

117
117

118WitnessRandomizer::WitnessRandomizer()
118Randomizer::Randomizer()

119{
119{

120        // Turn off desert surface 8
120        // Turn off desert surface 8

121        WritePanelData<float>(0x09F94, POWER, {0.0, 0.0});
121        WritePanelData<float>(0x09F94, POWER, {0.0, 0.0});
@@ -141,12 +141,12 @@ WitnessRandomizer::WitnessRandomizer()

141        WritePanelData<float>(0x002C2, CURSOR_SPEED_SCALE, {1.0});
141        WritePanelData<float>(0x002C2, CURSOR_SPEED_SCALE, {1.0});

142}
142}

143
143

144void WitnessRandomizer::Randomize(std::vector<int>& panels, int flags) {
144void Randomizer::Randomize(std::vector<int>& panels, int flags) {

145        return RandomizeRange(panels, flags, 0, panels.size());
145        return RandomizeRange(panels, flags, 0, panels.size());

146}
146}

147
147

148// Range is [start, end)
148// Range is [start, end)

149void WitnessRandomizer::RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex) {
149void Randomizer::RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex) {

150        if (panels.size() == 0) return;
150        if (panels.size() == 0) return;

151        if (startIndex >= endIndex) return;
151        if (startIndex >= endIndex) return;

152        if (endIndex >= panels.size()) endIndex = panels.size();
152        if (endIndex >= panels.size()) endIndex = panels.size();
@@ -160,7 +160,7 @@ void WitnessRandomizer::RandomizeRange(std::vector<int> &panels, int flags, size

160        }
160        }

161}
161}

162
162

163void WitnessRandomizer::SwapPanels(int panel1, int panel2, int flags) {
163void Randomizer::SwapPanels(int panel1, int panel2, int flags) {

164        std::map<int, int> offsets;
164        std::map<int, int> offsets;

165
165

166        if (flags & SWAP_TARGETS) {
166        if (flags & SWAP_TARGETS) {
@@ -234,7 +234,7 @@ void WitnessRandomizer::SwapPanels(int panel1, int panel2, int flags) {

234        }
234        }

235}
235}

236
236

237void WitnessRandomizer::ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order) {
237void Randomizer::ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order) {

238        // This list is offset by 1, so the target of the Nth panel is in position N (aka the N+1th element)
238        // This list is offset by 1, so the target of the Nth panel is in position N (aka the N+1th element)

239        // The first panel may not have a wire to power it, so we use the panel ID itself.
239        // The first panel may not have a wire to power it, so we use the panel ID itself.

240        std::vector<int> targetToActivatePanel = {panels[0] + 1};
240        std::vector<int> targetToActivatePanel = {panels[0] + 1};
diff --git a/WitnessRandomizer/WitnessRandomizer.h b/Source/Randomizer.h
index d65cce3..b644a1d 100644
--- a/WitnessRandomizer/WitnessRandomizer.h
+++ b/Source/Randomizer.h

@@ -1,16 +1,17 @@

1#pragma once
1#pragma once


2#include "Memory.h"

2
3

3// #define GLOBALS 0x5B28C0
4// #define GLOBALS 0x5B28C0

4#define GLOBALS 0x62A080
5#define GLOBALS 0x62A080

5
6

6int SWAP_NONE = 0x0;
7__declspec(selectany) int SWAP_NONE = 0x0;

7int SWAP_TARGETS = 0x1;
8__declspec(selectany) int SWAP_TARGETS = 0x1;

8int SWAP_LINES = 0x2;
9__declspec(selectany) int SWAP_LINES = 0x2;

9int SWAP_STYLE = 0x4;
10__declspec(selectany) int SWAP_STYLE = 0x4;

10
11

11class WitnessRandomizer {
12class Randomizer {

12public:
13public:

13        WitnessRandomizer();
14        Randomizer();

14
15

15        void Randomize(std::vector<int>& panels, int flags);
16        void Randomize(std::vector<int>& panels, int flags);

16        void RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex);
17        void RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex);
diff --git a/Source/Resource.h b/Source/Resource.h
new file mode 100644
index 0000000..c26455a
--- /dev/null
+++ b/Source/Resource.h

Binary files differ
diff --git a/Source/Source.ico b/Source/Source.ico
new file mode 100644
index 0000000..b3ec03b
--- /dev/null
+++ b/Source/Source.ico

Binary files differ
diff --git a/Source/Source.rc b/Source/Source.rc
new file mode 100644
index 0000000..a26e599
--- /dev/null
+++ b/Source/Source.rc

Binary files differ
diff --git a/WitnessRandomizer/WitnessRandomizer.vcxproj b/Source/Source.vcxproj
index 80a7f0c..8a6c8eb 100644
--- a/WitnessRandomizer/WitnessRandomizer.vcxproj
+++ b/Source/Source.vcxproj

@@ -20,9 +20,9 @@

20  </ItemGroup>
20  </ItemGroup>

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

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

23    <ProjectGuid>{1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}</ProjectGuid>
23    <ProjectGuid>{CED79182-F36B-4D07-AD0E-249C15BFAD73}</ProjectGuid>

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

25    <RootNamespace>WitnessRandomizer</RootNamespace>
25    <RootNamespace>Source</RootNamespace>

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

27  </PropertyGroup>
27  </PropertyGroup>

28  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -46,7 +46,7 @@

46    <CharacterSet>Unicode</CharacterSet>
46    <CharacterSet>Unicode</CharacterSet>

47  </PropertyGroup>
47  </PropertyGroup>

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

49    <ConfigurationType>Application</ConfigurationType>
49    <ConfigurationType>StaticLibrary</ConfigurationType>

50    <UseDebugLibraries>false</UseDebugLibraries>
50    <UseDebugLibraries>false</UseDebugLibraries>

51    <PlatformToolset>v141</PlatformToolset>
51    <PlatformToolset>v141</PlatformToolset>

52    <WholeProgramOptimization>true</WholeProgramOptimization>
52    <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -81,8 +81,6 @@

81  </PropertyGroup>
81  </PropertyGroup>

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

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

84    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>


85    <RunCodeAnalysis>true</RunCodeAnalysis>


86  </PropertyGroup>
84  </PropertyGroup>

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

88    <ClCompile>
86    <ClCompile>
@@ -90,28 +88,25 @@

90      <WarningLevel>Level3</WarningLevel>
88      <WarningLevel>Level3</WarningLevel>

91      <Optimization>Disabled</Optimization>
89      <Optimization>Disabled</Optimization>

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

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

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

95      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


96    </ClCompile>
93    </ClCompile>

97    <Link>
94    <Link>

98      <SubSystem>Console</SubSystem>
95      <SubSystem>Windows</SubSystem>

99      <GenerateDebugInformation>true</GenerateDebugInformation>
96      <GenerateDebugInformation>true</GenerateDebugInformation>

100    </Link>
97    </Link>

101  </ItemDefinitionGroup>
98  </ItemDefinitionGroup>

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

103    <ClCompile>
100    <ClCompile>

104      <PrecompiledHeader>NotUsing</PrecompiledHeader>
101      <PrecompiledHeader>Use</PrecompiledHeader>

105      <WarningLevel>Level3</WarningLevel>
102      <WarningLevel>Level3</WarningLevel>

106      <Optimization>Disabled</Optimization>
103      <Optimization>Disabled</Optimization>

107      <SDLCheck>true</SDLCheck>
104      <SDLCheck>true</SDLCheck>

108      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

109      <ConformanceMode>true</ConformanceMode>
106      <ConformanceMode>true</ConformanceMode>

110      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


111      <LanguageStandard>stdcpp17</LanguageStandard>


112    </ClCompile>
107    </ClCompile>

113    <Link>
108    <Link>

114      <SubSystem>Console</SubSystem>
109      <SubSystem>Windows</SubSystem>

115      <GenerateDebugInformation>true</GenerateDebugInformation>
110      <GenerateDebugInformation>true</GenerateDebugInformation>

116    </Link>
111    </Link>

117  </ItemDefinitionGroup>
112  </ItemDefinitionGroup>
@@ -123,12 +118,11 @@

123      <FunctionLevelLinking>true</FunctionLevelLinking>
118      <FunctionLevelLinking>true</FunctionLevelLinking>

124      <IntrinsicFunctions>true</IntrinsicFunctions>
119      <IntrinsicFunctions>true</IntrinsicFunctions>

125      <SDLCheck>true</SDLCheck>
120      <SDLCheck>true</SDLCheck>

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

127      <ConformanceMode>true</ConformanceMode>
122      <ConformanceMode>true</ConformanceMode>

128      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


129    </ClCompile>
123    </ClCompile>

130    <Link>
124    <Link>

131      <SubSystem>Console</SubSystem>
125      <SubSystem>Windows</SubSystem>

132      <EnableCOMDATFolding>true</EnableCOMDATFolding>
126      <EnableCOMDATFolding>true</EnableCOMDATFolding>

133      <OptimizeReferences>true</OptimizeReferences>
127      <OptimizeReferences>true</OptimizeReferences>

134      <GenerateDebugInformation>true</GenerateDebugInformation>
128      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -142,17 +136,13 @@

142      <FunctionLevelLinking>true</FunctionLevelLinking>
136      <FunctionLevelLinking>true</FunctionLevelLinking>

143      <IntrinsicFunctions>true</IntrinsicFunctions>
137      <IntrinsicFunctions>true</IntrinsicFunctions>

144      <SDLCheck>true</SDLCheck>
138      <SDLCheck>true</SDLCheck>

145      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

146      <ConformanceMode>true</ConformanceMode>
140      <ConformanceMode>true</ConformanceMode>

147      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


148      <LanguageStandard>stdcpp17</LanguageStandard>


149      <EnablePREfast>true</EnablePREfast>


150      <TreatWarningAsError>true</TreatWarningAsError>
141      <TreatWarningAsError>true</TreatWarningAsError>

151      <DisableSpecificWarnings>26451</DisableSpecificWarnings>
142      <LanguageStandard>stdcpp17</LanguageStandard>

152      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>


153    </ClCompile>
143    </ClCompile>

154    <Link>
144    <Link>

155      <SubSystem>Console</SubSystem>
145      <SubSystem>Windows</SubSystem>

156      <EnableCOMDATFolding>true</EnableCOMDATFolding>
146      <EnableCOMDATFolding>true</EnableCOMDATFolding>

157      <OptimizeReferences>true</OptimizeReferences>
147      <OptimizeReferences>true</OptimizeReferences>

158      <GenerateDebugInformation>true</GenerateDebugInformation>
148      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -161,11 +151,29 @@

161  <ItemGroup>
151  <ItemGroup>

162    <ClInclude Include="Memory.h" />
152    <ClInclude Include="Memory.h" />

163    <ClInclude Include="Panels.h" />
153    <ClInclude Include="Panels.h" />

164    <ClInclude Include="WitnessRandomizer.h" />
154    <ClInclude Include="Randomizer.h" />


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


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


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


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

165  </ItemGroup>
159  </ItemGroup>

166  <ItemGroup>
160  <ItemGroup>


161    <ClCompile Include="Main.cpp" />

167    <ClCompile Include="Memory.cpp" />
162    <ClCompile Include="Memory.cpp" />

168    <ClCompile Include="WitnessRandomizer.cpp" />
163    <ClCompile Include="Randomizer.cpp" />


164    <ClCompile Include="stdafx.cpp">


165      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>


166      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>


167      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>


168      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>


169    </ClCompile>


170  </ItemGroup>


171  <ItemGroup>


172    <ResourceCompile Include="Source.rc" />


173  </ItemGroup>


174  <ItemGroup>


175    <Image Include="small.ico" />


176    <Image Include="Source.ico" />

169  </ItemGroup>
177  </ItemGroup>

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

171  <ImportGroup Label="ExtensionTargets">
179  <ImportGroup Label="ExtensionTargets">
diff --git a/Source/Source.vcxproj.filters b/Source/Source.vcxproj.filters
new file mode 100644
index 0000000..aad417a
--- /dev/null
+++ b/Source/Source.vcxproj.filters

@@ -0,0 +1,67 @@


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="stdafx.h">


19      <Filter>Header Files</Filter>


20    </ClInclude>


21    <ClInclude Include="targetver.h">


22      <Filter>Header Files</Filter>


23    </ClInclude>


24    <ClInclude Include="Resource.h">


25      <Filter>Header Files</Filter>


26    </ClInclude>


27    <ClInclude Include="Main.h">


28      <Filter>Header Files</Filter>


29    </ClInclude>


30    <ClInclude Include="Memory.h">


31      <Filter>Header Files</Filter>


32    </ClInclude>


33    <ClInclude Include="Panels.h">


34      <Filter>Header Files</Filter>


35    </ClInclude>


36    <ClInclude Include="Randomizer.h">


37      <Filter>Header Files</Filter>


38    </ClInclude>


39  </ItemGroup>


40  <ItemGroup>


41    <ClCompile Include="stdafx.cpp">


42      <Filter>Source Files</Filter>


43    </ClCompile>


44    <ClCompile Include="Main.cpp">


45      <Filter>Source Files</Filter>


46    </ClCompile>


47    <ClCompile Include="Memory.cpp">


48      <Filter>Source Files</Filter>


49    </ClCompile>


50    <ClCompile Include="Randomizer.cpp">


51      <Filter>Source Files</Filter>


52    </ClCompile>


53  </ItemGroup>


54  <ItemGroup>


55    <ResourceCompile Include="Source.rc">


56      <Filter>Resource Files</Filter>


57    </ResourceCompile>


58  </ItemGroup>


59  <ItemGroup>


60    <Image Include="small.ico">


61      <Filter>Resource Files</Filter>


62    </Image>


63    <Image Include="Source.ico">


64      <Filter>Resource Files</Filter>


65    </Image>


66  </ItemGroup>


67</Project>
\ No newline at end of file
diff --git a/Source/small.ico b/Source/small.ico
new file mode 100644
index 0000000..b3ec03b
--- /dev/null
+++ b/Source/small.ico

Binary files differ
diff --git a/Source/stdafx.cpp b/Source/stdafx.cpp
new file mode 100644
index 0000000..08343af
--- /dev/null
+++ b/Source/stdafx.cpp

Binary files differ
diff --git a/Source/stdafx.h b/Source/stdafx.h
new file mode 100644
index 0000000..345292c
--- /dev/null
+++ b/Source/stdafx.h

Binary files differ
diff --git a/Source/targetver.h b/Source/targetver.h
new file mode 100644
index 0000000..567cd34
--- /dev/null
+++ b/Source/targetver.h

Binary files differ
diff --git a/Test/OrderingTests.cpp b/Test/OrderingTests.cpp
new file mode 100644
index 0000000..79163d6
--- /dev/null
+++ b/Test/OrderingTests.cpp

@@ -0,0 +1,7 @@


1#include "gtest/gtest.h"


2#include "../Source/Randomizer.h"


3#include "../Source/Memory.h"


4


5TEST(OrderingTests, TestJungleOrder) {


6        Randomizer _randomizer;


7}
\ No newline at end of file
diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj
new file mode 100644
index 0000000..6905605
--- /dev/null
+++ b/Test/Test.vcxproj

@@ -0,0 +1,124 @@


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    <ProjectGuid>{98bc35b9-ee1a-4d77-85f2-adaa72db16f7}</ProjectGuid>


23    <Keyword>Win32Proj</Keyword>


24    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>


25    <ConfigurationType>Application</ConfigurationType>


26    <PlatformToolset>v141</PlatformToolset>


27    <CharacterSet>Unicode</CharacterSet>


28  </PropertyGroup>


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


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


31  <ImportGroup Label="ExtensionSettings" />


32  <ImportGroup Label="Shared" />


33  <ImportGroup Label="PropertySheets" />


34  <PropertyGroup Label="UserMacros" />


35  <ItemGroup>


36    <ClCompile Include="OrderingTests.cpp" />


37  </ItemGroup>


38  <ItemGroup>


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


40      <Project>{ced79182-f36b-4d07-ad0e-249c15bfad73}</Project>


41    </ProjectReference>


42  </ItemGroup>


43  <ItemGroup>


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


45  </ItemGroup>


46  <ItemDefinitionGroup />


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


48  <ImportGroup Label="ExtensionTargets">


49    <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')" />


50  </ImportGroup>


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


52    <ClCompile>


53      <PrecompiledHeader>Use</PrecompiledHeader>


54      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


55      <Optimization>Disabled</Optimization>


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


57      <MinimalRebuild>true</MinimalRebuild>


58      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>


59      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>


60      <WarningLevel>Level3</WarningLevel>


61    </ClCompile>


62    <Link>


63      <GenerateDebugInformation>true</GenerateDebugInformation>


64      <SubSystem>Console</SubSystem>


65    </Link>


66  </ItemDefinitionGroup>


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


68    <ClCompile>


69      <PrecompiledHeader>Use</PrecompiledHeader>


70      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


71      <Optimization>Disabled</Optimization>


72      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>


73      <MinimalRebuild>true</MinimalRebuild>


74      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>


75      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>


76      <WarningLevel>Level3</WarningLevel>


77    </ClCompile>


78    <Link>


79      <GenerateDebugInformation>true</GenerateDebugInformation>


80      <SubSystem>Console</SubSystem>


81    </Link>


82  </ItemDefinitionGroup>


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


84    <ClCompile>


85      <PrecompiledHeader>Use</PrecompiledHeader>


86      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


87      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>


88      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>


89      <WarningLevel>Level3</WarningLevel>


90      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>


91    </ClCompile>


92    <Link>


93      <GenerateDebugInformation>true</GenerateDebugInformation>


94      <SubSystem>Console</SubSystem>


95      <OptimizeReferences>true</OptimizeReferences>


96      <EnableCOMDATFolding>true</EnableCOMDATFolding>


97    </Link>


98  </ItemDefinitionGroup>


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


100    <ClCompile>


101      <PrecompiledHeader>NotUsing</PrecompiledHeader>


102      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>


103      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>


104      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>


105      <WarningLevel>Level3</WarningLevel>


106      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>


107      <LanguageStandard>


108      </LanguageStandard>


109      <DisableSpecificWarnings>4996</DisableSpecificWarnings>


110    </ClCompile>


111    <Link>


112      <GenerateDebugInformation>true</GenerateDebugInformation>


113      <SubSystem>Console</SubSystem>


114      <OptimizeReferences>true</OptimizeReferences>


115      <EnableCOMDATFolding>true</EnableCOMDATFolding>


116    </Link>


117  </ItemDefinitionGroup>


118  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">


119    <PropertyGroup>


120      <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    </PropertyGroup>


122    <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  </Target>


124</Project>
\ No newline at end of file
diff --git a/Test/packages.config b/Test/packages.config
new file mode 100644
index 0000000..0acd30a
--- /dev/null
+++ b/Test/packages.config

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


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


2<packages>


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


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

@@ -1,9 +1,13 @@

1
1

2Microsoft Visual Studio Solution File, Format Version 12.00
2Microsoft Visual Studio Solution File, Format Version 12.00

3# Visual Studio 15
3# Visual Studio 15

4VisualStudioVersion = 15.0.28010.2046
4VisualStudioVersion = 15.0.28010.2048

5MinimumVisualStudioVersion = 10.0.40219.1
5MinimumVisualStudioVersion = 10.0.40219.1

6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WitnessRandomizer", "WitnessRandomizer\WitnessRandomizer.vcxproj", "{1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}"
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{CED79182-F36B-4D07-AD0E-249C15BFAD73}"


7EndProject


8Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}"


9EndProject


10Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}"

7EndProject
11EndProject

8Global
12Global

9        GlobalSection(SolutionConfigurationPlatforms) = preSolution
13        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,19 +17,31 @@ Global

13                Release|x86 = Release|x86
17                Release|x86 = Release|x86

14        EndGlobalSection
18        EndGlobalSection

15        GlobalSection(ProjectConfigurationPlatforms) = postSolution
19        GlobalSection(ProjectConfigurationPlatforms) = postSolution

16                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x64.ActiveCfg = Debug|x64
20                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.ActiveCfg = Debug|x64

17                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x64.Build.0 = Debug|x64
21                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.Build.0 = Debug|x64

18                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x86.ActiveCfg = Debug|Win32
22                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.ActiveCfg = Release|x64

19                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x86.Build.0 = Debug|Win32
23                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.Build.0 = Release|x64

20                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x64.ActiveCfg = Release|x64
24                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.ActiveCfg = Release|x64

21                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x64.Build.0 = Release|x64
25                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.Build.0 = Release|x64

22                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x86.ActiveCfg = Release|Win32
26                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.ActiveCfg = Release|Win32

23                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x86.Build.0 = Release|Win32
27                {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.Build.0 = Release|Win32


28                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.ActiveCfg = Debug


29                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x86.ActiveCfg = Release


30                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.ActiveCfg = Release


31                {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x86.ActiveCfg = Release


32                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x64.ActiveCfg = Debug|x64


33                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x64.Build.0 = Debug|x64


34                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x86.ActiveCfg = Release|x64


35                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Debug|x86.Build.0 = Release|x64


36                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x64.ActiveCfg = Release|x64


37                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x64.Build.0 = Release|x64


38                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x86.ActiveCfg = Release|Win32


39                {98BC35B9-EE1A-4D77-85F2-ADAA72DB16F7}.Release|x86.Build.0 = Release|Win32

24        EndGlobalSection
40        EndGlobalSection

25        GlobalSection(SolutionProperties) = preSolution
41        GlobalSection(SolutionProperties) = preSolution

26                HideSolutionNode = FALSE
42                HideSolutionNode = FALSE

27        EndGlobalSection
43        EndGlobalSection

28        GlobalSection(ExtensibilityGlobals) = postSolution
44        GlobalSection(ExtensibilityGlobals) = postSolution

29                SolutionGuid = {16A86E99-24E8-45C7-A6E2-1FA2C179A898}
45                SolutionGuid = {FA6FC0F4-9C3E-4A88-91BD-BB64F7455207}

30        EndGlobalSection
46        EndGlobalSection

31EndGlobal
47EndGlobal
diff --git a/WitnessRandomizer.vcxproj b/WitnessRandomizer.vcxproj
new file mode 100644
index 0000000..e70c453
--- /dev/null
+++ b/WitnessRandomizer.vcxproj

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


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/WitnessRandomizer.vcxproj.filters b/WitnessRandomizer.vcxproj.filters
index 30ef78f..4863ddb 100644
--- a/WitnessRandomizer/WitnessRandomizer.vcxproj.filters
+++ b/WitnessRandomizer.vcxproj.filters

@@ -14,23 +14,4 @@

14      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
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>
15    </Filter>

16  </ItemGroup>
16  </ItemGroup>

17  <ItemGroup>


18    <ClInclude Include="Memory.h">


19      <Filter>Header Files</Filter>


20    </ClInclude>


21    <ClInclude Include="WitnessRandomizer.h">


22      <Filter>Header Files</Filter>


23    </ClInclude>


24    <ClInclude Include="Panels.h">


25      <Filter>Header Files</Filter>


26    </ClInclude>


27  </ItemGroup>


28  <ItemGroup>


29    <ClCompile Include="WitnessRandomizer.cpp">


30      <Filter>Source Files</Filter>


31    </ClCompile>


32    <ClCompile Include="Memory.cpp">


33      <Filter>Source Files</Filter>


34    </ClCompile>


35  </ItemGroup>


36</Project>
\ No newline at end of file
17</Project>
\ No newline at end of file
diff --git a/WitnessRandomizerInstaller.sln b/WitnessRandomizerInstaller.sln
deleted file mode 100644
index 005650d..0000000
--- a/WitnessRandomizerInstaller.sln
+++ /dev/null

@@ -1,41 +0,0 @@

1


2Microsoft Visual Studio Solution File, Format Version 12.00


3# Visual Studio 15


4VisualStudioVersion = 15.0.28010.2046


5MinimumVisualStudioVersion = 10.0.40219.1


6Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "WitnessRandomizerInstaller", "WitnessRandomizerInstaller.vdproj", "{BBF9ED06-A4A7-4574-A15A-CF12489F45B8}"


7EndProject


8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WitnessRandomizer", "WitnessRandomizer\WitnessRandomizer.vcxproj", "{1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}"


9EndProject


10Global


11        GlobalSection(SolutionConfigurationPlatforms) = preSolution


12                Debug|x64 = Debug|x64


13                Debug|x86 = Debug|x86


14                Release|x64 = Release|x64


15                Release|x86 = Release|x86


16        EndGlobalSection


17        GlobalSection(ProjectConfigurationPlatforms) = postSolution


18                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Debug|x64.ActiveCfg = Debug


19                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Debug|x64.Build.0 = Debug


20                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Debug|x86.ActiveCfg = Debug


21                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Debug|x86.Build.0 = Debug


22                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Release|x64.ActiveCfg = Release


23                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Release|x64.Build.0 = Release


24                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Release|x86.ActiveCfg = Release


25                {BBF9ED06-A4A7-4574-A15A-CF12489F45B8}.Release|x86.Build.0 = Release


26                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x64.ActiveCfg = Debug|x64


27                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x64.Build.0 = Debug|x64


28                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x86.ActiveCfg = Debug|Win32


29                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Debug|x86.Build.0 = Debug|Win32


30                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x64.ActiveCfg = Release|x64


31                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x64.Build.0 = Release|x64


32                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x86.ActiveCfg = Release|Win32


33                {1563D1E2-0A18-4AFC-8D6F-9F8D9A433F31}.Release|x86.Build.0 = Release|Win32


34        EndGlobalSection


35        GlobalSection(SolutionProperties) = preSolution


36                HideSolutionNode = FALSE


37        EndGlobalSection


38        GlobalSection(ExtensibilityGlobals) = postSolution


39                SolutionGuid = {16A86E99-24E8-45C7-A6E2-1FA2C179A898}


40        EndGlobalSection


41EndGlobal

 

generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 09:40:50 +0000