Fixed some external GUI bugs. Added extra functionalility to h2 invulnerability to fix fall-timer-disappearing glitch. Fixed h2 checkpoint injection crash. Fixed multilevelpointer issue where GetLastError could give you the second-last-error instead.

Author: Burnt-o

HCMExternal/Converters/DifficultyConverter.cs

@@ -25,10 +25,11 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                     { 2, "Heroic" },
                     { 3, "Legendary" },
                 };
-            
 
 
-            return (string) DifficultyMap[(int)value];
+
+            return DifficultyMap.ElementAtOrDefault((int)value).Value ?? "Invalid";
+
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

HCMExternal/Converters/LevelImageConverter.cs

@@ -21,7 +21,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (valueString == null)
                 return "???";
 
-
+            
             // So I'd like this to check what the current tab index is directly, but haven't figured out how.
             // ConverterParameter won't seem to work since this is from a control under the tab control.
             // For now we'll used the saved setting which should always be accurate.

HCMExternal/Services/Interproc/InterprocService.cs

@@ -162,16 +162,20 @@ public InterprocService(CheckpointViewModel checkpointViewModel)
         private (string, string) getGameSFData(HaloTabEnum game)
         {
             // Not sure which of these methods is the most reliable
-            Log.Verbose("AppContext.BaseDirectory: " + AppContext.BaseDirectory
-                + "\nSystem.AppDomain.CurrentDomain.BaseDirectory: " + System.AppDomain.CurrentDomain.BaseDirectory
-                + "\nSystem.Reflection.Assembly.GetExecutingAssembly().Location: " + System.Reflection.Assembly.GetExecutingAssembly().Location
-                + "\nDirectory.GetCurrentDirectory(): " + Directory.GetCurrentDirectory()
-                );
+            //Log.Verbose("AppContext.BaseDirectory: " + AppContext.BaseDirectory
+            //    + "\nSystem.AppDomain.CurrentDomain.BaseDirectory: " + System.AppDomain.CurrentDomain.BaseDirectory
+            //    + "\nSystem.Reflection.Assembly.GetExecutingAssembly().Location: " + System.Reflection.Assembly.GetExecutingAssembly().Location
+            //    + "\nDirectory.GetCurrentDirectory(): " + Directory.GetCurrentDirectory()
+            //    );
+
+            Log.Verbose("Current directory: " + Directory.GetCurrentDirectory());
             var currentBaseDirectory = Directory.GetCurrentDirectory();
 
-            var rootFolder = currentBaseDirectory + @"Saves\" + Dictionaries.GameToRootFolderPath[game];
+            var rootFolder = currentBaseDirectory + @"\Saves\" + Dictionaries.GameToRootFolderPath[game];
             var dir = Settings.Default.LastSelectedFolder[(int)game]; // need to try catch this and return root folder on failure. 
-            
+
+            Log.Verbose("The last selected folder for game: " + game + " was " + Settings.Default.LastSelectedFolder[(int)game]);
+
             if (dir == null) // check if dir is real and exists
             {
                 Log.Error("getGameSFData: dir was null at Settings.Default.LastSelectedFolder[game] with game == " + game + ", as int: " + (int)game);
@@ -183,7 +187,7 @@ public InterprocService(CheckpointViewModel checkpointViewModel)
                 Log.Verbose("so returning " + Dictionaries.GameToRootFolderPath[game] + ", " + rootFolder);
                 return (Dictionaries.GameToRootFolderPath[game], rootFolder);        // return Root folder if there's a problem.
             }
-            Log.Verbose("getGameSFData: returning " + Path.GetDirectoryName(dir) + ", " + dir + " for game " + game);
+            Log.Verbose("getGameSFData: returning " + Path.GetFileName(dir) + ", " + dir + " for game " + game);
             return (Path.GetFileName(dir), dir);
         }
 
@@ -214,6 +218,15 @@ private void CheckpointViewModel_PropertyChanged(object? sender, System.Componen
                     var HRsf = getGameSFData(HaloTabEnum.HaloReach);
                     var H4sf = getGameSFData(HaloTabEnum.Halo4);
 
+                    Log.Information("Updating save folder shared memory with: \n" +
+                    H1sf.Item2 + "\n" +
+                    H2sf.Item2 + "\n" +
+                    H3sf.Item2 + "\n" +
+                    ODsf.Item2 + "\n" +
+                    HRsf.Item2 + "\n" +
+                    H4sf.Item2 + "\n"
+                );
+
                     Log.Verbose("sending new sf info");
                     var sf = CheckpointViewModel.SelectedSaveFolder;
                     Log.Verbose(string.Format("Sending new saveFolder info to internal: {0}", sf == null ? "null!" : sf.SaveFolderPath));

HCMExternal/ViewModels/CheckpointViewModel.cs

@@ -236,8 +236,10 @@ void CheckpointViewModel_PropertyChanged(object? sender, System.ComponentModel.P
             switch (e.PropertyName)
             {
                 case nameof(SelectedGame):
+                    HCMExternal.Properties.Settings.Default.LastSelectedGameTab = (int)this.SelectedGame;
                     RefreshSaveFolderTree();
                     RefreshCheckpointList();
+
                     break;
 
                 case nameof(SelectedCheckpoint):
@@ -395,7 +397,13 @@ public void FolderChanged(object sender, RoutedPropertyChangedEventArgs<object>
             if (Directory.Exists(saveFolder.SaveFolderPath))
             {
                 Trace.WriteLine("valid new saveFolder, so changing internal selection and inserting into lastSelectedFolder list.");
-                Properties.Settings.Default.LastSelectedFolder.Insert((int)SelectedGame, saveFolder.SaveFolderPath);
+                Log.Verbose("New lastSelectedFolder for game " + this.SelectedGame + " is " + saveFolder.SaveFolderPath);
+
+                Properties.Settings.Default.LastSelectedFolder[(int)SelectedGame] = saveFolder.SaveFolderPath;
+               // Properties.Settings.Default.LastSelectedFolder.Insert(, saveFolder.SaveFolderPath);
+
+                Log.Verbose("This should be the same value as:" + Properties.Settings.Default.LastSelectedFolder[(int)SelectedGame]);
+
                 this.SelectedSaveFolder = saveFolder;
                 this.RefreshCheckpointList();
 

HCMExternal/Views/Controls/CheckpointListControl.xaml

@@ -35,12 +35,11 @@
                     <MenuItem Header="Inject" 
                         Command="{Binding Path=Parent.DataContext.Inject, 
                     RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}}"  />
-
+                    
                     <MenuItem Header="Rename" 
                         Command="{Binding Path=Parent.DataContext.RenameCheckpoint, 
                     RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}}"  />
 
-
                     <MenuItem Header="Change version data" 
                         Command="{Binding Path=Parent.DataContext.ReVersionCheckpoint, 
                     RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}}"  />

HCMInternal/InjectCheckpoint.h

@@ -75,7 +75,7 @@ class InjectCheckpoint : public IOptionalCheat {
 			auto currentCheckpoint = sharedMem->getInjectInfo();
 
 			if (currentCheckpoint.selectedCheckpointNull) throw HCMRuntimeException("Can't inject - no checkpoint selected!");
-			if ((GameState)currentCheckpoint.selectedCheckpointGame != this->mImplGame) throw HCMRuntimeException(std::format("Can't inject - checkpoint from wrong game! Expected: {}, Actual: {}", mImplGame.toString(), ((GameState)currentCheckpoint.selectedCheckpointGame).toString()));
+			if ((GameState)currentCheckpoint.selectedCheckpointGame != this->mImplGame) throw HCMRuntimeException(std::format("Can't inject - checkpoint from wrong game! Expected: {}, Actual: {}\n(Make sure you switch HCMExternal to the correct game tab)", mImplGame.toString(), ((GameState)currentCheckpoint.selectedCheckpointGame).toString()));
 
 
 			//TODO: load correct level if level not aligned
@@ -181,6 +181,7 @@ class InjectCheckpoint : public IOptionalCheat {
 			{
 				bool firstCheckpoint;
 				mDoubleRevertFlag->readData(&firstCheckpoint);
+				PLOG_DEBUG << "Double revert flag value: " << firstCheckpoint;
 				firstCheckpoint ? mCheckpointLocation1->resolve(&checkpointLoc) : mCheckpointLocation2->resolve(&checkpointLoc);
 				PLOG_DEBUG << "using checkpoint location " << (firstCheckpoint ? "A" : "B") << " @0x" << std::hex << (uint64_t)checkpointLoc;
 			}
@@ -263,9 +264,14 @@ class InjectCheckpoint : public IOptionalCheat {
 			if (mInjectRequirements->BSP)
 			{
 				PLOG_VERBOSE << "setting BSP data";
-				std::vector<byte> currentBSPData;
-				auto err = memcpy_s(currentBSPData.data(), mBSPdata->length, (void*)(checkpointLoc + mBSPdata->offset), mBSPdata->length);
-				if (err) throw HCMRuntimeException(std::format("error copying bsp data! code: {}", err));
+
+				PLOG_VERBOSE << "mBSPdata->length " << mBSPdata->length;
+				PLOG_VERBOSE << "mBSPdata->offset " << mBSPdata->offset;
+				PLOG_VERBOSE << "checkpointLoc + mBSPdata->offset " << std::hex << (uintptr_t)(checkpointLoc + mBSPdata->offset);
+				
+				byte* rawCurrentBSPData = (byte*)(checkpointLoc + mBSPdata->offset);
+				std::vector<byte> currentBSPData (rawCurrentBSPData, rawCurrentBSPData + mBSPdata->length);
+
 				if (mInjectRequirements->singleCheckpoint)
 				{
 					mLoadedBSP1->writeArrayData(currentBSPData.data(), currentBSPData.size());
@@ -274,7 +280,21 @@ class InjectCheckpoint : public IOptionalCheat {
 				{
 					bool firstCheckpoint;
 					mDoubleRevertFlag->readData(&firstCheckpoint);
-					firstCheckpoint ? mLoadedBSP1->writeArrayData(currentBSPData.data(), currentBSPData.size()) : mLoadedBSP2->writeArrayData(currentBSPData.data(), currentBSPData.size());
+					PLOG_VERBOSE << "firstCheckpoint? " << firstCheckpoint;
+
+					auto loadedBSPToWrite = firstCheckpoint ? mLoadedBSP1 : mLoadedBSP2;
+
+#if HCM_DEBUG
+					// attempting to debug a H2 crash
+					uintptr_t loadedBSPLoc;
+					if (!loadedBSPToWrite->resolve(&loadedBSPLoc)) throw HCMRuntimeException(std::format("Failed to resolve BSP data: {}", MultilevelPointer::GetLastError()));
+					PLOG_VERBOSE << "loadedBSPLoc: " << std::hex << loadedBSPLoc;
+					byte currentLoadedBSP;
+					if (!loadedBSPToWrite->readData(&currentLoadedBSP)) throw HCMRuntimeException(std::format("Failed to read BSP data: {}", MultilevelPointer::GetLastError()));
+					PLOG_VERBOSE << "currentLoadedBSP " << currentLoadedBSP;
+#endif
+					if (!loadedBSPToWrite->writeArrayData(currentBSPData.data(), currentBSPData.size())) throw HCMRuntimeException(std::format("Failed to write BSP data: {}", MultilevelPointer::GetLastError()));
+					PLOG_VERBOSE << "successfully set BSP data";
 				}
 			}
 
@@ -295,6 +315,7 @@ class InjectCheckpoint : public IOptionalCheat {
 		}
 		catch (HCMRuntimeException ex)
 		{
+			PLOG_VERBOSE << "error!" << ex.what();
 			runtimeExceptions->handleMessage(ex);
 		}
 
@@ -338,7 +359,11 @@ class InjectCheckpoint : public IOptionalCheat {
 		{
 			mBSPdata = ptr->getData< std::shared_ptr<offsetLengthPair>>("BSPdata", game);
 			mLoadedBSP1 = ptr->getData< std::shared_ptr<MultilevelPointer>>("loadedBSP1", game);
-			if (!mInjectRequirements->singleCheckpoint) 	mLoadedBSP2 = ptr->getData< std::shared_ptr<MultilevelPointer>>("loadedBSP2", game);
+			if (!mInjectRequirements->singleCheckpoint)
+			{
+				mLoadedBSP2 = ptr->getData< std::shared_ptr<MultilevelPointer>>("loadedBSP2", game);
+			}
+
 		}
 
 		try

HCMInternal/InternalPointerData.xml

@@ -1446,7 +1446,7 @@
 		<Version Version="1.3272.0.0" Game="Halo2">
 			<Module>halo2.dll</Module>
 			<Offsets>
-				<Offset>0xE6EDA7</Offset>
+				<Offset>0xE6FE68</Offset>
 			</Offsets>
 		</Version>
 
@@ -1932,7 +1932,7 @@
 			<Module>halo2.dll</Module>
 			<Offsets>
 				<Offset>0x01651CF0</Offset>
-				<Offset>0x0</Offset>
+				<Offset>0x400000</Offset>
 			</Offsets>
 		</Version>
 	</VersionedEntry>
@@ -1963,7 +1963,7 @@
 			<Module>halo2.dll</Module>
 			<Offsets>
 				<Offset>0x01651CF0</Offset>
-				<Offset>0x400000</Offset>
+				<Offset>0x0</Offset>
 			</Offsets>
 		</Version>
 	</VersionedEntry>
@@ -3129,6 +3129,34 @@
 		</Version>
 	</VersionedEntry>
 
+<!-- fall timer invulnerability handled by seperate function for h2-->
+	<VersionedEntry Name="fallTimerInvulnerabilityFunction" Type="MultilevelPointer::ModuleOffset">
+		<Version Version="1.3272.0.0" Game="Halo2">
+			<Module>halo2.dll</Module>
+			<Offsets>
+				<Offset>0x925C38</Offset>
+			</Offsets>
+		</Version>
+	</VersionedEntry>
+
+	<VersionedEntry Name="fallTimerInvulnerabilityFunctionContext" Type="MidhookContextInterpreter">
+		<Version Version="All" Game="Halo2">
+			<Parameters>
+				<unitDatum>rsi</unitDatum>
+			</Parameters>
+		</Version>
+	</VersionedEntry>
+
+	<VersionedEntry Name="fallTimerInvulnerabilityFunctionFlagSetter" Type="MidhookFlagInterpreter">
+		<Version Version="All" Game="Halo2">
+			<rflag>carry</rflag>
+			<value>true</value>
+		</Version>
+	</VersionedEntry>
+
+	<!-- #region invulnerability-->
+
+
 	<!--very close to print message stuff-->
 	<VersionedEntry Name="boardingText" Type="MultilevelPointer::ModuleOffset">
 		<Version Version="1.2448.0.0" Game="Halo2">
@@ -5300,6 +5328,7 @@
 		</Version>
 
 
+		<!--this is wrong?-->
 		<Version Version="1.3272.0.0" Game="Halo2">
 			<Module>halo2.dll</Module>
 			<Offsets>