Fixed to work in release mode

c-m-w · Aug 25, 2019 · 8fbefbb · 8fbefbb
1 parent bd6fff0
commit 8fbefbb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,15 @@ Solution/Crosshair/Debug/*
 Solution/Crosshair/Release/*
 
 # imgui configuration
-imgui.ini
+imgui.ini
+*.vcxproj
+Solution/Crosshair/x64/Debug/Crosshair.log
+Solution/Crosshair/x64/Debug/Crosshair.tlog/CL.command.1.tlog
+Solution/Crosshair/x64/Debug/Crosshair.tlog/CL.read.1.tlog
+Solution/Crosshair/x64/Debug/Crosshair.tlog/CL.write.1.tlog
+Solution/Crosshair/x64/Debug/Crosshair.tlog/Crosshair.lastbuildstate
+Solution/Crosshair/x64/Debug/Crosshair.tlog/unsuccessfulbuild
+Solution/Crosshair/x64/Debug/vc142.idb
+Solution/Crosshair/x64/Debug/vc142.pdb
+Solution/Crosshair/Crosshair.vcxproj
+Solution/Crosshair/Crosshair.vcxproj
diff --git a/Solution/Crosshair/Source/Crosshair.cpp b/Solution/Crosshair/Source/Crosshair.cpp
@@ -47,26 +47,34 @@ namespace Main
 	/** \return Whether or not initialization was successful. */
 	__declspec( naked ) bool __stdcall InitializeObject( IBaseInterface* pObject, const char* szSuccessMessage, const char* szErrorMessage )
 	{
-		DWORD dwReturnAddress; 
+		DWORD dwReturnAddress;
 		__asm
 		{
 			pop		dwReturnAddress
 			pop		pObject
-			pop		szSuccessMessage
-			pop		szErrorMessage
 
 			mov		ecx, pObject
+			push	pObject
+			push	dwReturnAddress
+
 			push	ecx
 			mov		ecx, [ ecx ]
 			add		ecx, 4
 			mov		ecx, [ ecx ]
 			call	ecx
 
+			pop		dwReturnAddress
+			pop		pObject
+			pop		szSuccessMessage
+			pop		szErrorMessage
+
 			cmp		eax, 0
 			jnz		LogSuccessful
 			jmp		Shutdown
 
 			LogSuccessful:
+
+				push	dwReturnAddress
 				push	szSuccessMessage
 				push	LOCATION_MAIN
 				push	PREFIX_SUCCESS
@@ -76,7 +84,6 @@ namespace Main
 				pop		ecx
 				pop		ecx
 				pop		ecx
-				push	dwReturnAddress
 				ret
 
 			Shutdown: