From 669717268201197412c69df36e65883b0af6fac8 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Mon, 5 Nov 2018 10:06:37 -0800 Subject: Tests work now, + other cleanup --- App/App.ico | Bin 46227 -> 0 bytes App/App.vcxproj | 32 ++- App/App.vcxproj.filters | 43 ---- App/Main.cpp | 30 +-- App/small.ico | Bin 46227 -> 0 bytes Installer/Installer.vdproj | 400 +++++++++++++++++++++----------------- Source/Random.cpp | 4 +- Source/Source.vcxproj | 81 ++++---- Source/Source.vcxproj.filters | 57 ------ Test/Foo.cpp | 11 -- Test/RandomTests.cpp | 36 ++++ Test/Test.vcxproj | 46 ++--- Test/packages.config | 2 +- WitnessRandomizer.sln | 73 ++++--- WitnessRandomizer.vcxproj | 122 ------------ WitnessRandomizer.vcxproj.filters | 17 -- 16 files changed, 377 insertions(+), 577 deletions(-) delete mode 100644 App/App.ico delete mode 100644 App/App.vcxproj.filters delete mode 100644 App/small.ico delete mode 100644 Source/Source.vcxproj.filters delete mode 100644 Test/Foo.cpp create mode 100644 Test/RandomTests.cpp delete mode 100644 WitnessRandomizer.vcxproj delete mode 100644 WitnessRandomizer.vcxproj.filters diff --git a/App/App.ico b/App/App.ico deleted file mode 100644 index b3ec03b..0000000 Binary files a/App/App.ico and /dev/null 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 @@ 15.0 - {CED79182-F36B-4D07-AD0E-249C15BFAD73} + {235D27F1-9907-489B-8D58-636A0C5CD079} Win32Proj App 10.0.17134.0 - App @@ -82,7 +81,6 @@ false - WitnessRandomizer @@ -92,9 +90,8 @@ true WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) stdcpp17 - MultiThreadedDebug Windows @@ -104,15 +101,14 @@ NotUsing - Level2 + Level3 Disabled true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true stdcpp17 + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) MultiThreadedDebug - C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories) Windows @@ -129,10 +125,8 @@ true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true - EditAndContinue stdcpp17 - MultiThreaded + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) Windows @@ -144,18 +138,15 @@ NotUsing - Level2 + Level3 MaxSpeed true true true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true stdcpp17 - None - MultiThreaded - C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories) + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) Windows @@ -165,6 +156,7 @@ + @@ -174,11 +166,9 @@ - - - - - + + {6b5df051-a51a-48cb-8acd-c6fad726019f} + 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 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - - - - \ 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 @@ #include -#include "Randomizer.h" #include "Version.h" #include "Random.h" +#include "Randomizer.h" #include "Panel.h" #define IDC_RANDOMIZE 0x401 @@ -18,8 +18,8 @@ #define IDC_DUMP 0x408 HWND hwndSeed, hwndRandomize; -// int panel = 0x18AF; -int panel = 0x33D4; +int panel = 0x18AF; +// int panel = 0x33D4; std::shared_ptr _panel; LRESULT 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) wasSeedRandomlyGenerated = false; } - Randomizer randomizer; - short metadata = randomizer.Randomize(seed); - if (metadata & 0x1) break; // Was already randomized + Randomizer randomizer; + short metadata = randomizer.Randomize(seed); + if (metadata & 0x1) break; // Was already randomized - std::wstring seedString = std::to_wstring(seed); - SetWindowText(hwndSeed, seedString.c_str()); - if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) { - randomizer.AdjustSpeed(); - } - SetWindowText(hwndRandomize, L"Randomized!"); + std::wstring seedString = std::to_wstring(seed); + SetWindowText(hwndSeed, seedString.c_str()); + if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) { + randomizer.AdjustSpeed(); + } + SetWindowText(hwndRandomize, L"Randomized!"); break; } case IDC_READ: @@ -75,7 +75,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) _panel->Write(panel); break; case IDC_DUMP: - _panel->Serialize(); + // _panel->Serialize(); break; } } @@ -113,7 +113,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, 10, 15, 90, 16, hwnd, NULL, hInstance, NULL); hwndSeed = CreateWindow(MSFTEDIT_CLASS, L"", - WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, + WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, 100, 10, 50, 26, hwnd, NULL, hInstance, NULL); hwndRandomize = CreateWindow(L"BUTTON", L"Randomize", WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, @@ -176,7 +176,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd CreateWindow(L"STATIC", L"Prevent sniping certain puzzles", WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); - + */ ShowWindow(hwnd, nCmdShow); diff --git a/App/small.ico b/App/small.ico deleted file mode 100644 index b3ec03b..0000000 Binary files a/App/small.ico and /dev/null 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 @@ { "Entry" { - "MsmKey" = "8:_E86F0F0DE4B646B6956C8E30890951D2" + "MsmKey" = "8:_9B0B145056B94677E2CA3A16390E0831" + "OwnerKey" = "8:_F4835D5BBF3E437390127C4C49888F07" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BB64C67B615508AECF6F57AF00F172BE" + "OwnerKey" = "8:_F4835D5BBF3E437390127C4C49888F07" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F4835D5BBF3E437390127C4C49888F07" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -44,14 +56,6 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } } } "Release" @@ -59,11 +63,11 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:WitnessRandomizerInstaller.msi" + "OutputFilename" = "8:Release\\Installer.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" - "Compression" = "3:3" + "Compression" = "3:2" "SignOutput" = "11:FALSE" "CertificateFile" = "8:" "PrivateKeyFile" = "8:" @@ -76,14 +80,6 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } } } } @@ -106,13 +102,53 @@ } "File" { + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B0B145056B94677E2CA3A16390E0831" + { + "SourcePath" = "8:ucrtbased.dll" + "TargetName" = "8:ucrtbased.dll" + "Tag" = "8:" + "Folder" = "8:_8E9D847124D34D9D9008762077D816DE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BB64C67B615508AECF6F57AF00F172BE" + { + "SourcePath" = "8:VCRUNTIME140D.dll" + "TargetName" = "8:VCRUNTIME140D.dll" + "Tag" = "8:" + "Folder" = "8:_8E9D847124D34D9D9008762077D816DE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } } "FileType" { } "Folder" { - "{1525181F-901A-416C-8A58-119130FE478E}:_4D19640D10EA43E68046262546954A5E" + "{1525181F-901A-416C-8A58-119130FE478E}:_1FD5AD1232C84F478EFC94AAEE035210" { "Name" = "8:#1916" "AlwaysCreate" = "11:FALSE" @@ -123,9 +159,9 @@ { } } - "{3C67513D-01DD-4637-8A68-80971EB9504F}:_5393EB12357E4BF29E8149058ABE909F" + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_8E9D847124D34D9D9008762077D816DE" { - "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -135,7 +171,7 @@ { } } - "{1525181F-901A-416C-8A58-119130FE478E}:_B2294C987D6245B881C99CC1494F9A53" + "{1525181F-901A-416C-8A58-119130FE478E}:_ADBF9BEF249647A7B9E33B56D9B4F497" { "Name" = "8:#1919" "AlwaysCreate" = "11:FALSE" @@ -162,19 +198,19 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Witness Randomizer" - "ProductCode" = "8:{17E1D8DB-4EB6-4165-AFBD-CBEDE030B290}" - "PackageCode" = "8:{BFEA7087-93FF-40C4-B533-F9A4DDD63532}" + "ProductCode" = "8:{FC619212-7FAE-44BB-B057-149C773DD44D}" + "PackageCode" = "8:{24312282-901A-4661-9B87-E04AC1FC4609}" "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:TRUE" + "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:4.0.0" + "ProductVersion" = "8:4.0.3" "Manufacturer" = "8:jbzdarkid" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues" - "Title" = "8:Witness Randomizer" + "Title" = "8:Installer" "Subject" = "8:" "ARPCONTACT" = "8:jbzdarkid" "Keywords" = "8:" @@ -184,7 +220,7 @@ "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:1" + "TargetPlatform" = "3:0" "PreBuildEvent" = "8:" "PostBuildEvent" = "8:" "RunPostBuildEvent" = "3:0" @@ -195,7 +231,7 @@ { "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_3AE5560C1C264507AB6064EFD59C1D29" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_30C31E4026394D739C781A8F615DBD1B" { "Name" = "8:Software" "Condition" = "8:" @@ -204,7 +240,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_63A12348E59E4B23AF4A320B583CE259" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_CC3FFD5EF5A24864B8921B3D11FF87C9" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -229,7 +265,7 @@ { "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_8B27FF000D99412E935E3A18279A2050" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_86EAB0D9996C4DD4A7730F79B46BA7E9" { "Name" = "8:Software" "Condition" = "8:" @@ -238,7 +274,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_4BF3DC672AFD411A93142B3B6422DB19" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_065C31ABC29D44A8AACC5C1DF0B00FFA" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -283,7 +319,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_B30BF820F5E14F0DA12BBD906ADF0C86" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_704973B0673F47C2A7EDC37615A5C901" { "Name" = "8:WitnessRandomizer" "Arguments" = "8:" @@ -291,79 +327,29 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_E86F0F0DE4B646B6956C8E30890951D2" - "Folder" = "8:_B2294C987D6245B881C99CC1494F9A53" - "WorkingFolder" = "8:_5393EB12357E4BF29E8149058ABE909F" + "Target" = "8:_F4835D5BBF3E437390127C4C49888F07" + "Folder" = "8:_ADBF9BEF249647A7B9E33B56D9B4F497" + "WorkingFolder" = "8:_8E9D847124D34D9D9008762077D816DE" "Icon" = "8:" "Feature" = "8:" } } "UserInterface" { - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_38760CCB3C7C473E8E648E0E721B588D" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_38A567649FEB44008A1D1E584BC151FE" { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdBasicDialogs.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3A89F4E5009C49478B393C505B87F9E1" - { - "Name" = "8:#1900" - "Sequence" = "3:2" - "Attributes" = "3:1" + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_53574943921E4B3DB4C03DD3D6CA432C" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E1C9373AA1F84906A77B0A402FC41089" - { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E9B774D828F444DBB21D89182BC27A21" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4091B2BBD40E4FB984D12FE05CC179C8" { "Sequence" = "3:100" - "DisplayName" = "8:Welcome" + "DisplayName" = "8:Finished" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" + "SourcePath" = "8:\\VsdFinishedDlg.wid" "Properties" { "BannerBitmap" @@ -377,50 +363,31 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1202" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" + "UpdateText" { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" "UsePlugInResources" = "11:TRUE" } } } } } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_525FC4F1C72C4EE3984593146DD26634" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdUserInterface.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_8808DD7C245240A9954C040BF06F2B9D" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3BB80DCD2F404C34BC76213696E81E08" { "Name" = "8:#1902" "Sequence" = "3:2" "Attributes" = "3:3" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_F7031E39D9854967A8FBADF12A890B0B" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_89142FD957DE4CFB80E4BE8A71967884" { "Sequence" = "3:100" "DisplayName" = "8:Finished" @@ -444,20 +411,20 @@ } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9359F122FC5E433F9E5A9EFF22C28425" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_4F2068C04B0E466AA38331A55C59C41C" { "Name" = "8:#1901" - "Sequence" = "3:1" + "Sequence" = "3:2" "Attributes" = "3:2" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B03CE8F39FF4BA2B82BFADB5CE02784" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AE5C7BA6BD854603B2596FACA0B67D15" { "Sequence" = "3:100" "DisplayName" = "8:Progress" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdProgressDlg.wid" + "SourcePath" = "8:\\VsdAdminProgressDlg.wid" "Properties" { "BannerBitmap" @@ -488,20 +455,20 @@ } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_A1DF86A3EDDD44E594A0CDFC7F58D821" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_6C920D4CA33D4B6599231DE1EF0E32C4" { - "Name" = "8:#1900" + "Name" = "8:#1901" "Sequence" = "3:1" - "Attributes" = "3:1" + "Attributes" = "3:2" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_19BB8ECC0C3A4153BF658C0F22142794" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1D0F1B147BF440128F8062B38CC1C1F2" { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" + "Sequence" = "3:100" + "DisplayName" = "8:Progress" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFolderDlg.wid" + "SourcePath" = "8:\\VsdProgressDlg.wid" "Properties" { "BannerBitmap" @@ -515,11 +482,11 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "InstallAllUsersVisible" + "ShowProgress" { - "Name" = "8:InstallAllUsersVisible" - "DisplayName" = "8:#1059" - "Description" = "8:#1159" + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" "Type" = "3:5" "ContextData" = "8:1;True=1;False=0" "Attributes" = "3:0" @@ -530,13 +497,28 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3433DFF95F204C7B8A83783FA361BFCE" + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_76D36C4D9B234E4AA4BC14C3045F8B20" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdBasicDialogs.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B57EB774BE5C453B9EFE1692DDCAEE56" + { + "Name" = "8:#1900" + "Sequence" = "3:2" + "Attributes" = "3:1" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_15DF03155E9B4F54AE8E67807A4EFE1F" { "Sequence" = "3:100" "DisplayName" = "8:Welcome" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdWelcomeDlg.wid" + "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" "Properties" { "BannerBitmap" @@ -578,13 +560,35 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AF4B4DA9EB504C71B314DF4C68CE15EA" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_25F82B1977D443ED87D578E106EA29F3" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C338B6DBF24844F0B3605A0A75B1DCF3" { "Sequence" = "3:300" "DisplayName" = "8:Confirm Installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdConfirmDlg.wid" + "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" "Properties" { "BannerBitmap" @@ -602,20 +606,26 @@ } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_AAE51F7F58C64A4B996423B01E3D8921" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_C535242FE14D4956804B076BF1391396" { - "Name" = "8:#1902" + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdUserInterface.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E3238729ED69443C9AC277130A087C7D" + { + "Name" = "8:#1900" "Sequence" = "3:1" - "Attributes" = "3:3" + "Attributes" = "3:1" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4AF1C2264E804EE9BA6E2E014EFACBD1" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_048E6ACAB7D346DE98118F422CABA006" { - "Sequence" = "3:100" - "DisplayName" = "8:Finished" + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFinishedDlg.wid" + "SourcePath" = "8:\\VsdFolderDlg.wid" "Properties" { "BannerBitmap" @@ -629,37 +639,28 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "UpdateText" + "InstallAllUsersVisible" { - "Name" = "8:UpdateText" - "DisplayName" = "8:#1058" - "Description" = "8:#1158" - "Type" = "3:15" - "ContextData" = "8:" + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1258" - "DefaultValue" = "8:#1258" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" "UsePlugInResources" = "11:TRUE" } } } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_C45FE7F2B865461AB6313DD4AEB2833D" - { - "Name" = "8:#1901" - "Sequence" = "3:2" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_640F85EA14454CEEAD495CDCCD0BCB76" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_63EC6443964E453FAC02347F7F5B94C9" { "Sequence" = "3:100" - "DisplayName" = "8:Progress" + "DisplayName" = "8:Welcome" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "SourcePath" = "8:\\VsdWelcomeDlg.wid" "Properties" { "BannerBitmap" @@ -673,17 +674,52 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "ShowProgress" + "CopyrightWarning" { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" + "ContextData" = "8:" "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" + "Setting" = "3:1" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C5D7E2F30F564B78B6463ECCBF213F65" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } } @@ -696,12 +732,12 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E86F0F0DE4B646B6956C8E30890951D2" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F4835D5BBF3E437390127C4C49888F07" { - "SourcePath" = "8:..\\x64\\Release\\WitnessRandomizer.exe" + "SourcePath" = "8:..\\x64\\Debug\\App.exe" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_5393EB12357E4BF29E8149058ABE909F" + "Folder" = "8:_8E9D847124D34D9D9008762077D816DE" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -718,7 +754,7 @@ "ProjectOutputGroupRegister" = "3:1" "OutputConfiguration" = "8:" "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{CED79182-F36B-4D07-AD0E-249C15BFAD73}" + "OutputProjectGuid" = "8:{235D27F1-9907-489B-8D58-636A0C5CD079}" "ShowKeyOutput" = "11:TRUE" "ExcludeFilters" { 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) { s_seed = seed; } +// Returns a random integer in [min, max] int Random::RandInt(int min, int max) { s_seed = (214013 * s_seed + 2531011) % 2147483648; - if (min == max) return min; - return (s_seed % (max - (min - 1))) + min; + return (s_seed % (max - min + 1)) + min; } 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 @@ x64 - - - - - - - - - - - - - - - - 15.0 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27} + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F} Win32Proj Source 10.0.17134.0 @@ -86,9 +70,6 @@ - - false - true @@ -98,66 +79,70 @@ false - + + false + + NotUsing - Level2 - MaxSpeed - true - true + Level3 + Disabled true - NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true stdcpp17 - true Windows - true - true true - + - Use + NotUsing Level3 Disabled true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _DEBUG;_LIB;%(PreprocessorDefinitions) true + stdcpp17 + MultiThreadedDebug Windows true - + NotUsing - Level2 - Disabled + Level3 + MaxSpeed + true + true true - _DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true stdcpp17 - true Windows + true + true true - + - Use + NotUsing Level3 MaxSpeed true true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + NDEBUG;_LIB;%(PreprocessorDefinitions) true + stdcpp17 Windows @@ -166,6 +151,22 @@ true + + + + + + + + + + + + + + + + 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 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ 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 @@ -#include "gtest/gtest.h" -#include "Random.h" - -TEST(Foo, Bar) { - int random1 = Random::RandInt(0, 1 << 30); - int random2 = Random::RandInt(0, 1 << 30); - ASSERT_NE(random1, random2); - int random3 = Random::RandInt(random1, random2); - ASSERT_GE(random3, random1); - ASSERT_LT(random3, random2); -} 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 @@ +#include "gtest/gtest.h" +#include "Random.h" + +TEST(RandomTests, RandomInRange) { + int random1 = Random::RandInt(0, 1 << 30); + int random2 = Random::RandInt(0, 1 << 30); + ASSERT_NE(random1, random2); + if (random1 > random2) std::swap(random1, random2); + int random3 = Random::RandInt(random1, random2); + std::cout << random1 << " " << random2 << " " << random3 << std::endl; + ASSERT_GE(random3, random1); + ASSERT_LE(random3, random2); +} + +TEST(RandomTests, SeedWorks) { + Random::SetSeed(0); + ASSERT_EQ(2531011, Random::RandInt(0, 1 << 30)); + ASSERT_EQ(505908858, Random::RandInt(0, 1 << 30)); + ASSERT_EQ(318135124, Random::RandInt(0, 1 << 30)); + ASSERT_EQ(159719620, Random::RandInt(0, 1 << 30)); + Random::SetSeed(0); + ASSERT_EQ(2531011, Random::RandInt(0, 1 << 30)); +} + +TEST(RandomTests, SeedChangesInitialValue) { + Random::SetSeed(0); + int random1 = Random::RandInt(0, 1 << 30); + Random::SetSeed(1); + int random2 = Random::RandInt(0, 1 << 30); + ASSERT_NE(random1, random2); + + Random::SetSeed(2); + int random3 = Random::RandInt(0, 1 << 30); + ASSERT_NE(random3, random1); + ASSERT_NE(random3, random2); +} \ 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 @@ - {2208ee21-5366-4042-89d6-1a3c4bd79ad4} + {128784c2-9157-4291-8fd6-44637be162fb} Win32Proj 10.0.17134.0 Application @@ -32,38 +32,33 @@ - - $(IncludePath) - - - $(IncludePath) - + + + - {5c019bea-e0b4-4215-825f-6a228cd3ae27} + {6b5df051-a51a-48cb-8acd-c6fad726019f} - - - - + - Use + NotUsing pch.h Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Level3 + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) true @@ -78,11 +73,9 @@ X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL - Level2 - 4996 - true - C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories) + MultiThreadedDebug + Level3 + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) true @@ -91,12 +84,13 @@ - Use + NotUsing pch.h WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded Level3 ProgramDatabase + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) true @@ -110,12 +104,10 @@ NotUsing pch.h X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Level2 + MultiThreaded + Level3 ProgramDatabase - 4996 - true - C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories) + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) true @@ -128,6 +120,6 @@ 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}. - + \ 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 @@  - + \ 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 # Visual Studio 15 VisualStudioVersion = 15.0.28010.2048 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{CED79182-F36B-4D07-AD0E-249C15BFAD73}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{235D27F1-9907-489B-8D58-636A0C5CD079}" ProjectSection(ProjectDependencies) = postProject - {5C019BEA-E0B4-4215-825F-6A228CD3AE27} = {5C019BEA-E0B4-4215-825F-6A228CD3AE27} + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F} = {6B5DF051-A51A-48CB-8ACD-C6FAD726019F} EndProjectSection EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}" - ProjectSection(ProjectDependencies) = postProject - {5C019BEA-E0B4-4215-825F-6A228CD3AE27} = {5C019BEA-E0B4-4215-825F-6A228CD3AE27} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{6B5DF051-A51A-48CB-8ACD-C6FAD726019F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{5C019BEA-E0B4-4215-825F-6A228CD3AE27}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{78DEDBBE-AC84-496D-8907-40089B464A5B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{2208EE21-5366-4042-89D6-1A3C4BD79AD4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{128784C2-9157-4291-8FD6-44637BE162FB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,41 +22,39 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.ActiveCfg = Debug|x64 - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x64.Build.0 = Debug|x64 - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.ActiveCfg = Release|x64 - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Debug|x86.Build.0 = Release|x64 - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.ActiveCfg = Debug|x64 - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x64.Build.0 = Debug|x64 - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.ActiveCfg = Release|Win32 - {CED79182-F36B-4D07-AD0E-249C15BFAD73}.Release|x86.Build.0 = Release|Win32 - {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.ActiveCfg = Debug - {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x64.Build.0 = Debug - {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Debug|x86.ActiveCfg = Release - {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.ActiveCfg = Debug - {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x64.Build.0 = Debug - {90113AEC-8765-4A8D-B7A1-6C9BE730E5D5}.Release|x86.ActiveCfg = Release - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x64.ActiveCfg = Debug|x64 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x64.Build.0 = Debug|x64 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x86.ActiveCfg = Debug|Win32 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Debug|x86.Build.0 = Debug|Win32 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x64.ActiveCfg = Debug|x64 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x64.Build.0 = Debug|x64 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x86.ActiveCfg = Release|Win32 - {5C019BEA-E0B4-4215-825F-6A228CD3AE27}.Release|x86.Build.0 = Release|Win32 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x64.ActiveCfg = Debug|x64 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x64.Build.0 = Debug|x64 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x86.ActiveCfg = Debug|Win32 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Debug|x86.Build.0 = Debug|Win32 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x64.ActiveCfg = Debug|x64 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x64.Build.0 = Debug|x64 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x86.ActiveCfg = Release|Win32 - {2208EE21-5366-4042-89D6-1A3C4BD79AD4}.Release|x86.Build.0 = Release|Win32 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x64.ActiveCfg = Debug|x64 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x64.Build.0 = Debug|x64 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x86.ActiveCfg = Debug|Win32 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Debug|x86.Build.0 = Debug|Win32 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x64.ActiveCfg = Release|x64 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x64.Build.0 = Release|x64 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x86.ActiveCfg = Release|Win32 + {235D27F1-9907-489B-8D58-636A0C5CD079}.Release|x86.Build.0 = Release|Win32 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x64.ActiveCfg = Debug|x64 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x64.Build.0 = Debug|x64 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x86.ActiveCfg = Debug|Win32 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Debug|x86.Build.0 = Debug|Win32 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x64.ActiveCfg = Release|x64 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x64.Build.0 = Release|x64 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.ActiveCfg = Release|Win32 + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.Build.0 = Release|Win32 + {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x64.ActiveCfg = Debug + {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x86.ActiveCfg = Debug + {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x64.ActiveCfg = Release + {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x86.ActiveCfg = Release + {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.ActiveCfg = Debug|x64 + {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.Build.0 = Debug|x64 + {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x86.ActiveCfg = Debug|Win32 + {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x86.Build.0 = Debug|Win32 + {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x64.ActiveCfg = Release|x64 + {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x64.Build.0 = Release|x64 + {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.ActiveCfg = Release|Win32 + {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {FA6FC0F4-9C3E-4A88-91BD-BB64F7455207} + SolutionGuid = {CAE16173-9C75-4436-899B-6A2AC4264283} EndGlobalSection EndGlobal diff --git a/WitnessRandomizer.vcxproj b/WitnessRandomizer.vcxproj deleted file mode 100644 index e70c453..0000000 --- a/WitnessRandomizer.vcxproj +++ /dev/null @@ -1,122 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {B1AF0C99-EDE5-464E-9092-7817365235F1} - WitnessRandomizer - 10.0.17134.0 - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - true - true - - - - - Level3 - Disabled - true - true - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - Level3 - MaxSpeed - true - true - true - true - - - true - true - - - - - - - - \ 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 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - \ No newline at end of file -- cgit 1.4.1