update to Extender 1.5.5

FlashpointProject · Aug 2, 2023 · 6e1094e · 6e1094e
1 parent 547dfcf
commit 6e1094e
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 23 deletions.
diff --git a/Debug/BrowserPluginExtender.dll b/Debug/BrowserPluginExtender.dll
diff --git a/Debug/BrowserPluginExtender.ilk b/Debug/BrowserPluginExtender.ilk
diff --git a/Debug/BrowserPluginExtender.pdb b/Debug/BrowserPluginExtender.pdb
diff --git a/Extender/BrowserPluginExtender.aps b/Extender/BrowserPluginExtender.aps
diff --git a/Extender/BrowserPluginExtender.rc b/Extender/BrowserPluginExtender.rc
diff --git a/Extender/Debug/BrowserP.320D85F1.tlog/link.read.1.tlog b/Extender/Debug/BrowserP.320D85F1.tlog/link.read.1.tlog
diff --git a/Extender/Debug/BrowserPluginExtender.res b/Extender/Debug/BrowserPluginExtender.res
diff --git a/Extender/Debug/Extender.log b/Extender/Debug/Extender.log
@@ -1,10 +1,7 @@
 C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCTargets\Platforms\Win32\PlatformToolsets\v141_xp\Toolset.targets(39,5): warning MSB8051: Support for targeting Windows XP is deprecated and will not be present in future releases of Visual Studio. Please see https://go.microsoft.com/fwlink/?linkid=2023588 for more information.
   Extender.cpp
-c:\users\anthony\documents\visual studio 2017\projects\browserpluginextender\extender\shared.h(31): warning C4133: '-': incompatible types - from 'void *' to 'char *'
   main.cpp
-c:\users\anthony\documents\visual studio 2017\projects\browserpluginextender\extender\shared.h(31): warning C4133: '-': incompatible types - from 'void *' to 'char *'
   shared.cpp
-c:\users\anthony\documents\visual studio 2017\projects\browserpluginextender\extender\shared.h(31): warning C4133: '-': incompatible types - from 'void *' to 'char *'
 c:\program files (x86)\microsoft sdks\windows\v7.1a\include\dbghelp.h(1540): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-hdBase>' when no variable is declared
 c:\program files (x86)\microsoft sdks\windows\v7.1a\include\dbghelp.h(3056): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-sfImage>' when no variable is declared
   Generating Code...

diff --git a/Extender/Debug/main.obj b/Extender/Debug/main.obj
diff --git a/Extender/Debug/vc141.idb b/Extender/Debug/vc141.idb
diff --git a/Extender/Debug/vc141.pdb b/Extender/Debug/vc141.pdb
diff --git a/Extender/Extender.cpp b/Extender/Extender.cpp
@@ -85,8 +85,6 @@ bool testCode(HMODULE moduleHandle, RELATIVE_VIRTUAL_ADDRESS codeRelativeVirtual
 
 	bool result = memoryEqual(codePointer, testedCode, codeVirtualSize);
 
-	codePointer = NULL;
-
 	if (!protectCode(moduleHandle, codeVirtualAddress, codeVirtualSize, oldProtect)) {
 		showLastError("Failed to Protect Code");
 		return false;
@@ -127,7 +125,6 @@ bool extendCode(HMODULE moduleHandle, RELATIVE_VIRTUAL_ADDRESS codeRelativeVirtu
 
 	*(VIRTUAL_ADDRESS*)(codePointer + 1) = (VIRTUAL_ADDRESS)extendedCode - codeVirtualAddress - CODE_VIRTUAL_SIZE;
 	*codePointer = call ? INSTRUCTIONS_CALL : INSTRUCTIONS_JMP;
-	codePointer = NULL;
 
 	if (!protectCode(moduleHandle, codeVirtualAddress, CODE_VIRTUAL_SIZE, oldProtect)) {
 		showLastError("Failed to Protect Code");
@@ -167,7 +164,6 @@ bool extendCode(HMODULE moduleHandle, RELATIVE_VIRTUAL_ADDRESS codeRelativeVirtu
 	const CODE1 INSTRUCTIONS_NOP = 0x90;
 
 	*codePointer = INSTRUCTIONS_NOP;
-	codePointer = NULL;
 
 	if (!protectCode(moduleHandle, codeVirtualAddress, CODE_VIRTUAL_SIZE, oldProtect)) {
 		showLastError("Failed to Protect Code");

diff --git a/Extender/Release/BrowserPluginExtender.res b/Extender/Release/BrowserPluginExtender.res
diff --git a/Extender/Release/Extender.log b/Extender/Release/Extender.log
@@ -1,10 +1,7 @@
 C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCTargets\Platforms\Win32\PlatformToolsets\v141_xp\Toolset.targets(39,5): warning MSB8051: Support for targeting Windows XP is deprecated and will not be present in future releases of Visual Studio. Please see https://go.microsoft.com/fwlink/?linkid=2023588 for more information.
   Extender.cpp
-c:\users\anthony\documents\visual studio 2017\projects\browserpluginextender\extender\shared.h(31): warning C4133: '-': incompatible types - from 'void *' to 'char *'
   main.cpp
-c:\users\anthony\documents\visual studio 2017\projects\browserpluginextender\extender\shared.h(31): warning C4133: '-': incompatible types - from 'void *' to 'char *'
   shared.cpp
-c:\users\anthony\documents\visual studio 2017\projects\browserpluginextender\extender\shared.h(31): warning C4133: '-': incompatible types - from 'void *' to 'char *'
 c:\program files (x86)\microsoft sdks\windows\v7.1a\include\dbghelp.h(1540): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-hdBase>' when no variable is declared
 c:\program files (x86)\microsoft sdks\windows\v7.1a\include\dbghelp.h(3056): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-sfImage>' when no variable is declared
      Creating library C:\Users\Anthony\Documents\Visual Studio 2017\Projects\BrowserPluginExtender\Release\BrowserPluginExtender.lib and object C:\Users\Anthony\Documents\Visual Studio 2017\Projects\BrowserPluginExtender\Release\BrowserPluginExtender.exp

diff --git a/Extender/Release/main.obj b/Extender/Release/main.obj
diff --git a/Extender/Release/vc141.pdb b/Extender/Release/vc141.pdb
diff --git a/Extender/shared.cpp b/Extender/shared.cpp
@@ -39,19 +39,19 @@ bool testSectionAddress(HMODULE moduleHandle, VIRTUAL_ADDRESS virtualAddress, VI
 
 	if (imageDOSHeaderPointer->e_magic != IMAGE_DOS_SIGNATURE) {
 		showLastError("e_magic must be IMAGE_DOS_SIGNATURE");
-		goto error;
+		return false;
 	}
 
 	PIMAGE_NT_HEADERS imageNTHeadersPointer = ImageNtHeader(imageDOSHeaderPointer);
 
 	if (!imageNTHeadersPointer) {
 		showLastError("imageNTHeadersPointer must not be NULL");
-		goto error;
+		return false;
 	}
 
 	if (imageNTHeadersPointer->Signature != IMAGE_NT_SIGNATURE) {
 		showLastError("Signature must be IMAGE_NT_SIGNATURE");
-		goto error2;
+		return false;
 	}
 
 	PIMAGE_SECTION_HEADER imageSectionHeaderPointer = (PIMAGE_SECTION_HEADER)(imageNTHeadersPointer + 1);
@@ -64,20 +64,12 @@ bool testSectionAddress(HMODULE moduleHandle, VIRTUAL_ADDRESS virtualAddress, VI
 	VIRTUAL_ADDRESS moduleVirtualAddress = (VIRTUAL_ADDRESS)moduleHandle;
 
 	for (WORD i = 0; i < imageNTHeadersPointer->FileHeader.NumberOfSections; i++) {
-		if (virtualAddress >= moduleVirtualAddress + imageSectionHeaderPointer->VirtualAddress && virtualAddress + virtualSize <= moduleVirtualAddress + imageSectionHeaderPointer->VirtualAddress + imageSectionHeaderPointer->Misc.VirtualSize) {
-			imageSectionHeaderPointer = NULL;
-			imageNTHeadersPointer = NULL;
-			imageDOSHeaderPointer = NULL;
+		if (virtualAddress >= moduleVirtualAddress + imageSectionHeaderPointer->VirtualAddress
+			&& virtualAddress + virtualSize <= moduleVirtualAddress + imageSectionHeaderPointer->VirtualAddress + imageSectionHeaderPointer->Misc.VirtualSize) {
 			return true;
 		}
 
 		imageSectionHeaderPointer++;
 	}
-
-	imageSectionHeaderPointer = NULL;
-	error2:
-	imageNTHeadersPointer = NULL;
-	error:
-	imageDOSHeaderPointer = NULL;
 	return false;
 }
diff --git a/Extender/shared.h b/Extender/shared.h
@@ -24,6 +24,8 @@ inline bool memoryEqual(const void* buffer, const void* buffer2, size_t bufferSi
 }
 
 inline bool memoryShift(size_t bufferSize, void* buffer, size_t sourceSize, void* source, size_t shift, bool direction) {
+	#pragma warning(push)
+	#pragma warning(disable : 4133)
 	if (source < buffer || (char*)source + sourceSize > (char*)buffer + bufferSize) {
 		return false;
 	}
@@ -41,6 +43,7 @@ inline bool memoryShift(size_t bufferSize, void* buffer, size_t sourceSize, void
 		return false;
 	}
 	return !memmove_s(destination, destinationSize, source, sourceSize);
+	#pragma warning(pop)
 }
 
 bool showLastError(LPCSTR errorMessage);

diff --git a/Release/BrowserPluginExtender.dll b/Release/BrowserPluginExtender.dll
diff --git a/Release/BrowserPluginExtender.iobj b/Release/BrowserPluginExtender.iobj
diff --git a/Release/BrowserPluginExtender.ipdb b/Release/BrowserPluginExtender.ipdb
diff --git a/Release/BrowserPluginExtender.pdb b/Release/BrowserPluginExtender.pdb