Undo the section ordering change for Win32 and disable ASLR

livecodefraser · livecodefraser · commit 85b30ab6a338 · 2015-05-07T17:18:10.000+01:00
ASLR means that there is an extra .reloc section in the executable.
Just disable it for now as adjusting the deploy process is complex.
diff --git a/config/win32.gypi b/config/win32.gypi
@@ -144,6 +144,7 @@
 			'VCLinkerTool':
 			{
 				'SubSystem': '2',
+				'RandomizedBaseAddress': '1',	# /DYNAMICBASE:NO - disable ASLR
 			},
 		},
 	},
diff --git a/engine/src/deploy_windows.cpp b/engine/src/deploy_windows.cpp
@@ -1645,11 +1645,11 @@ Exec_stat MCDeployToWindows(const MCDeployParameters& p_params)
 	{
 		t_section_count = t_nt_header . FileHeader . NumberOfSections;
 		if (p_params . payload != nil)
-			t_payload_section = &t_section_headers[t_section_count - 4];
+			t_payload_section = &t_section_headers[t_section_count - 3];
 		else
 			t_payload_section = nil;
-		t_project_section = &t_section_headers[t_section_count - 3];
-		t_resource_section = &t_section_headers[t_section_count - 2];
+		t_project_section = &t_section_headers[t_section_count - 2];
+		t_resource_section = &t_section_headers[t_section_count - 1];
 	}
 
 	// Next we check that there are at least two sections, and they are the

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@`
`144`	`144`	`'VCLinkerTool':`
`145`	`145`	`{`
`146`	`146`	`'SubSystem': '2',`
	`147`	`+ 'RandomizedBaseAddress': '1', # /DYNAMICBASE:NO - disable ASLR`
`147`	`148`	`},`
`148`	`149`	`},`
`149`	`150`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1645,11 +1645,11 @@ Exec_stat MCDeployToWindows(const MCDeployParameters& p_params)`
`1645`	`1645`	`{`
`1646`	`1646`	`t_section_count = t_nt_header . FileHeader . NumberOfSections;`
`1647`	`1647`	`if (p_params . payload != nil)`
`1648`		`- t_payload_section = &t_section_headers[t_section_count - 4];`
	`1648`	`+ t_payload_section = &t_section_headers[t_section_count - 3];`
`1649`	`1649`	`else`
`1650`	`1650`	`t_payload_section = nil;`
`1651`		`- t_project_section = &t_section_headers[t_section_count - 3];`
`1652`		`- t_resource_section = &t_section_headers[t_section_count - 2];`
	`1651`	`+ t_project_section = &t_section_headers[t_section_count - 2];`
	`1652`	`+ t_resource_section = &t_section_headers[t_section_count - 1];`
`1653`	`1653`	`}`
`1654`	`1654`
`1655`	`1655`	`// Next we check that there are at least two sections, and they are the`