5 files changed, 13 insertions, 8 deletions
diff --git a/App/Main.cpp b/App/Main.cpp
index 8df3e6e..edf0898 100644
--- a/App/Main.cpp
+++ b/App/Main.cpp

@@ -267,12 +267,13 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
    // g_rngDebug = CreateWindow(L"STATIC", L"",
        //     WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,
        //     200, 80, 200, 200, g_hwnd, NULL, g_hInstance, NULL);
+#ifndef NDEBUG
    g_panelId = CreateText(200, 100, 100, L"59");
    CreateButton(200, 130, 100, L"Read", TMP1);
    CreateButton(200, 160, 100, L"Write", TMP2);
    CreateButton(200, 190, 100, L"Solve", TMP3);
    CreateButton(200, 220, 100, L"Randomize2", TMP4);
+#endif
    g_witnessProc->StartHeartbeat(g_hwnd);
diff --git a/App/Version.h b/App/Version.h
index 8068f03..1541697 100644
--- a/App/Version.h
+++ b/App/Version.h

@@ -3,8 +3,8 @@
 #define TO_STRING2(s) L#s
 #define TO_STRING(s) TO_STRING2(s)
-#define MAJOR 5
+#define MAJOR 6
-#define MINOR 2
+#define MINOR 0
 #define PATCH 0
 #define VERSION_STR     TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH)
diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj
index e791590..61df575 100644
--- a/Installer/Installer.vdproj
+++ b/Installer/Installer.vdproj

@@ -162,15 +162,15 @@
        {
        "Name" = "8:Microsoft Visual Studio"
        "ProductName" = "8:Witness Randomizer"
-        "ProductCode" = "8:{5A3C6188-EA4B-4FEE-94EE-BF7D91681792}"
+        "ProductCode" = "8:{45A4772A-100E-4B94-B73A-F2F0C355D0F0}"
-        "PackageCode" = "8:{E8C66354-4ED4-4958-9D6C-A0DC3BD6C3EA}"
+        "PackageCode" = "8:{9D15D892-3C9C-4007-86A4-AA6BA2138CE9}"
        "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"
        "AspNetVersion" = "8:2.0.50727.0"
        "RestartWWWService" = "11:FALSE"
        "RemovePreviousVersions" = "11:TRUE"
        "DetectNewerInstalledVersion" = "11:TRUE"
        "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:5.2.0"
+        "ProductVersion" = "8:6.0.0"
        "Manufacturer" = "8:jbzdarkid"
        "ARPHELPTELEPHONE" = "8:"
        "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues"
diff --git a/Source/Memory.h b/Source/Memory.h
index b7edb28..5332cc3 100644
--- a/Source/Memory.h
+++ b/Source/Memory.h

@@ -5,8 +5,8 @@
 #include <vector>
 #include <windows.h>
-#define GLOBALS 0x5B28C0
+// #define GLOBALS 0x5B28C0
-// #define GLOBALS 0x62D0A0
+#define GLOBALS 0x62D0A0
 #define HEARTBEAT 0x401
 enum class ProcStatus {
diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj
index d36f4af..9023285 100644
--- a/Test/Test.vcxproj
+++ b/Test/Test.vcxproj

@@ -67,6 +67,7 @@
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -87,6 +88,7 @@
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -107,6 +109,7 @@
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -127,6 +130,7 @@
      <SubSystem>Console</SubSystem>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
    </Link>
  </ItemDefinitionGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/App/Main.cpp b/App/Main.cpp index 8df3e6e..edf0898 100644 --- a/App/Main.cpp +++ b/App/Main.cpp
@@ -267,12 +267,13 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
267	// g_rngDebug = CreateWindow(L"STATIC", L"",	267	// g_rngDebug = CreateWindow(L"STATIC", L"",
268	// WS_TABSTOP \| WS_VISIBLE \| WS_CHILD \| SS_LEFT,	268	// WS_TABSTOP \| WS_VISIBLE \| WS_CHILD \| SS_LEFT,
269	// 200, 80, 200, 200, g_hwnd, NULL, g_hInstance, NULL);	269	// 200, 80, 200, 200, g_hwnd, NULL, g_hInstance, NULL);
270		270	#ifndef NDEBUG
271	g_panelId = CreateText(200, 100, 100, L"59");	271	g_panelId = CreateText(200, 100, 100, L"59");
272	CreateButton(200, 130, 100, L"Read", TMP1);	272	CreateButton(200, 130, 100, L"Read", TMP1);
273	CreateButton(200, 160, 100, L"Write", TMP2);	273	CreateButton(200, 160, 100, L"Write", TMP2);
274	CreateButton(200, 190, 100, L"Solve", TMP3);	274	CreateButton(200, 190, 100, L"Solve", TMP3);
275	CreateButton(200, 220, 100, L"Randomize2", TMP4);	275	CreateButton(200, 220, 100, L"Randomize2", TMP4);
		276	#endif
276		277
277	g_witnessProc->StartHeartbeat(g_hwnd);	278	g_witnessProc->StartHeartbeat(g_hwnd);
278		279


diff --git a/App/Version.h b/App/Version.h index 8068f03..1541697 100644 --- a/App/Version.h +++ b/App/Version.h
@@ -3,8 +3,8 @@
3	#define TO_STRING2(s) L#s	3	#define TO_STRING2(s) L#s
4	#define TO_STRING(s) TO_STRING2(s)	4	#define TO_STRING(s) TO_STRING2(s)
5		5
6	#define MAJOR 5	6	#define MAJOR 6
7	#define MINOR 2	7	#define MINOR 0
8	#define PATCH 0	8	#define PATCH 0
9		9
10	#define VERSION_STR TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH)	10	#define VERSION_STR TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH)


diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj index e791590..61df575 100644 --- a/Installer/Installer.vdproj +++ b/Installer/Installer.vdproj
@@ -162,15 +162,15 @@
162	{	162	{
163	"Name" = "8:Microsoft Visual Studio"	163	"Name" = "8:Microsoft Visual Studio"
164	"ProductName" = "8:Witness Randomizer"	164	"ProductName" = "8:Witness Randomizer"
165	"ProductCode" = "8:{5A3C6188-EA4B-4FEE-94EE-BF7D91681792}"	165	"ProductCode" = "8:{45A4772A-100E-4B94-B73A-F2F0C355D0F0}"
166	"PackageCode" = "8:{E8C66354-4ED4-4958-9D6C-A0DC3BD6C3EA}"	166	"PackageCode" = "8:{9D15D892-3C9C-4007-86A4-AA6BA2138CE9}"
167	"UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"	167	"UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"
168	"AspNetVersion" = "8:2.0.50727.0"	168	"AspNetVersion" = "8:2.0.50727.0"
169	"RestartWWWService" = "11:FALSE"	169	"RestartWWWService" = "11:FALSE"
170	"RemovePreviousVersions" = "11:TRUE"	170	"RemovePreviousVersions" = "11:TRUE"
171	"DetectNewerInstalledVersion" = "11:TRUE"	171	"DetectNewerInstalledVersion" = "11:TRUE"
172	"InstallAllUsers" = "11:FALSE"	172	"InstallAllUsers" = "11:FALSE"
173	"ProductVersion" = "8:5.2.0"	173	"ProductVersion" = "8:6.0.0"
174	"Manufacturer" = "8:jbzdarkid"	174	"Manufacturer" = "8:jbzdarkid"
175	"ARPHELPTELEPHONE" = "8:"	175	"ARPHELPTELEPHONE" = "8:"
176	"ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues"	176	"ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues"


diff --git a/Source/Memory.h b/Source/Memory.h index b7edb28..5332cc3 100644 --- a/Source/Memory.h +++ b/Source/Memory.h
@@ -5,8 +5,8 @@
5	#include <vector>	5	#include <vector>
6	#include <windows.h>	6	#include <windows.h>
7		7
8	#define GLOBALS 0x5B28C0	8	// #define GLOBALS 0x5B28C0
9	// #define GLOBALS 0x62D0A0	9	#define GLOBALS 0x62D0A0
10		10
11	#define HEARTBEAT 0x401	11	#define HEARTBEAT 0x401
12	enum class ProcStatus {	12	enum class ProcStatus {


diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj index d36f4af..9023285 100644 --- a/Test/Test.vcxproj +++ b/Test/Test.vcxproj
@@ -67,6 +67,7 @@
67	<Link>	67	<Link>
68	<GenerateDebugInformation>true</GenerateDebugInformation>	68	<GenerateDebugInformation>true</GenerateDebugInformation>
69	<SubSystem>Console</SubSystem>	69	<SubSystem>Console</SubSystem>
		70	<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
70	</Link>	71	</Link>
71	</ItemDefinitionGroup>	72	</ItemDefinitionGroup>
72	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'">	73	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|x64'">
@@ -87,6 +88,7 @@
87	<Link>	88	<Link>
88	<GenerateDebugInformation>true</GenerateDebugInformation>	89	<GenerateDebugInformation>true</GenerateDebugInformation>
89	<SubSystem>Console</SubSystem>	90	<SubSystem>Console</SubSystem>
		91	<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
90	</Link>	92	</Link>
91	</ItemDefinitionGroup>	93	</ItemDefinitionGroup>
92	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">	94	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
@@ -107,6 +109,7 @@
107	<SubSystem>Console</SubSystem>	109	<SubSystem>Console</SubSystem>
108	<OptimizeReferences>true</OptimizeReferences>	110	<OptimizeReferences>true</OptimizeReferences>
109	<EnableCOMDATFolding>true</EnableCOMDATFolding>	111	<EnableCOMDATFolding>true</EnableCOMDATFolding>
		112	<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
110	</Link>	113	</Link>
111	</ItemDefinitionGroup>	114	</ItemDefinitionGroup>
112	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">	115	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">
@@ -127,6 +130,7 @@
127	<SubSystem>Console</SubSystem>	130	<SubSystem>Console</SubSystem>
128	<OptimizeReferences>true</OptimizeReferences>	131	<OptimizeReferences>true</OptimizeReferences>
129	<EnableCOMDATFolding>true</EnableCOMDATFolding>	132	<EnableCOMDATFolding>true</EnableCOMDATFolding>
		133	<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
130	</Link>	134	</Link>
131	</ItemDefinitionGroup>	135	</ItemDefinitionGroup>
132	<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">	136	<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">