Minor fixes

6 files changed, 22 insertions, 22 deletions

diff --git a/Application/EfiDSEFix/src/EfiDSEFix.h b/Application/EfiDSEFix/src/EfiDSEFix.h
index 68dc238..0a99540 100644
--- a/Application/EfiDSEFix/src/EfiDSEFix.h
+++ b/Application/EfiDSEFix/src/EfiDSEFix.h
@@ -11,7 +11,7 @@
 
 #if defined(__RESHARPER__)
 #define WPRINTF_ATTR(FormatIndex, FirstToCheck) \
-    [[rscpp::format(wprintf, FormatIndex, FirstToCheck)]]
+	[[rscpp::format(wprintf, FormatIndex, FirstToCheck)]]
 #else
 #define WPRINTF_ATTR(FormatIndex, FirstToCheck)
 #endif
@@ -47,7 +47,7 @@ MapFileSectionView(
 PVOID
 GetProcedureAddress(
 	_In_ ULONG_PTR DllBase,
-	_In_ PCSTR RoutineName
+	_In_ PCCH RoutineName
 	);
 
 FORCEINLINE
@@ -131,7 +131,7 @@ Printf(
 	WCHAR Buffer[512];
 	va_list VaList;
 	va_start(VaList, Format);
-	ULONG N = _vsnwprintf(Buffer, sizeof(Buffer), Format, VaList);
+	ULONG N = _vsnwprintf(Buffer, sizeof(Buffer) / sizeof(WCHAR) - 1, Format, VaList);
 	WriteConsoleW(NtCurrentPeb()->ProcessParameters->StandardOutput, Buffer, N, &N, NULL);
 	va_end(VaList);
 }
diff --git a/Application/EfiDSEFix/src/pe.cpp b/Application/EfiDSEFix/src/pe.cpp
index 223de04..2187537 100644
--- a/Application/EfiDSEFix/src/pe.cpp
+++ b/Application/EfiDSEFix/src/pe.cpp
@@ -113,7 +113,7 @@ MapFileSectionView(
 PVOID
 GetProcedureAddress(
 	_In_ ULONG_PTR DllBase,
-	_In_ PCSTR RoutineName
+	_In_ PCCH RoutineName
 	)
 {
 	// Find and verify PE headers
diff --git a/EfiGuardDxe/pe.c b/EfiGuardDxe/pe.c
index ef1edad..9ecaf57 100644
--- a/EfiGuardDxe/pe.c
+++ b/EfiGuardDxe/pe.c
@@ -29,7 +29,7 @@ RtlIsCanonicalAddress(
 PEFI_IMAGE_NT_HEADERS
 EFIAPI
 RtlpImageNtHeaderEx(
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN UINTN Size OPTIONAL
 	)
 {
@@ -64,7 +64,7 @@ RtlpImageNtHeaderEx(
 INPUT_FILETYPE
 EFIAPI
 GetInputFileType(
-	IN UINT8* ImageBase,
+	IN CONST UINT8* ImageBase,
 	IN UINTN ImageSize
 	)
 {
@@ -85,7 +85,7 @@ GetInputFileType(
 		// Of the Windows loaders, only bootmgfw.efi has this subsystem type.
 		// Check for the BCD Bootmgr GUID, { 9DEA862C-5CDD-4E70-ACC1-F32B344D4795 }, which is present in bootmgfw/bootmgr (and on Win >= 8 also winload.[exe|efi])
 		CONST EFI_GUID BcdWindowsBootmgrGuid = { 0x9dea862c, 0x5cdd, 0x4e70, { 0xac, 0xc1, 0xf3, 0x2b, 0x34, 0x4d, 0x47, 0x95 } };
-		for (UINT8* Address = ImageBase; Address < ImageBase + ImageSize - sizeof(BcdWindowsBootmgrGuid); Address += sizeof(VOID*))
+		for (UINT8* Address = (UINT8*)ImageBase; Address < ImageBase + ImageSize - sizeof(BcdWindowsBootmgrGuid); Address += sizeof(VOID*))
 		{
 			if (CompareGuid((CONST GUID*)Address, &BcdWindowsBootmgrGuid))
 			{
@@ -162,7 +162,7 @@ EFIAPI
 GetProcedureAddress(
 	IN UINTN DllBase,
 	IN PEFI_IMAGE_NT_HEADERS NtHeaders,
-	IN CHAR8* RoutineName
+	IN CONST CHAR8* RoutineName
 	)
 {
 	if (DllBase == 0 || NtHeaders == NULL)
@@ -336,7 +336,7 @@ RvaToOffset(
 VOID*
 EFIAPI
 RtlpImageDirectoryEntryToDataEx(
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN BOOLEAN MappedAsImage,
 	IN UINT16 DirectoryEntry,
 	OUT UINT32 *Size
@@ -383,7 +383,7 @@ RtlpImageDirectoryEntryToDataEx(
 EFI_STATUS
 EFIAPI
 FindResourceDataById(
-	IN VOID* ImageBase,
+	IN CONST VOID* ImageBase,
 	IN UINT16 TypeId,
 	IN UINT16 NameId,
 	IN UINT16 LanguageId OPTIONAL,
@@ -456,7 +456,7 @@ FindResourceDataById(
 EFI_STATUS
 EFIAPI
 GetPeFileVersionInfo(
-	IN VOID* ImageBase,
+	IN CONST VOID* ImageBase,
 	OUT UINT16* MajorVersion OPTIONAL,
 	OUT UINT16* MinorVersion OPTIONAL,
 	OUT UINT16* BuildNumber OPTIONAL,
diff --git a/EfiGuardDxe/pe.h b/EfiGuardDxe/pe.h
index 8c5f41c..cf47119 100644
--- a/EfiGuardDxe/pe.h
+++ b/EfiGuardDxe/pe.h
@@ -178,14 +178,14 @@ typedef struct _VS_VERSIONINFO
 PEFI_IMAGE_NT_HEADERS
 EFIAPI
 RtlpImageNtHeaderEx(
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN UINTN Size OPTIONAL
 	);
 
 INPUT_FILETYPE
 EFIAPI
 GetInputFileType(
-	IN UINT8 *ImageBase,
+	IN CONST UINT8 *ImageBase,
 	IN UINTN ImageSize
 	);
 
@@ -200,7 +200,7 @@ EFIAPI
 GetProcedureAddress(
 	IN UINTN DllBase,
 	IN PEFI_IMAGE_NT_HEADERS NtHeaders,
-	IN CHAR8* RoutineName
+	IN CONST CHAR8* RoutineName
 	);
 
 EFI_STATUS
@@ -223,7 +223,7 @@ RvaToOffset(
 VOID*
 EFIAPI
 RtlpImageDirectoryEntryToDataEx(
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN BOOLEAN MappedAsImage,
 	IN UINT16 DirectoryEntry,
 	OUT UINT32 *Size
@@ -232,7 +232,7 @@ RtlpImageDirectoryEntryToDataEx(
 EFI_STATUS
 EFIAPI
 FindResourceDataById(
-	IN VOID* ImageBase,
+	IN CONST VOID* ImageBase,
 	IN UINT16 TypeId,
 	IN UINT16 NameId,
 	IN UINT16 LanguageId OPTIONAL,
@@ -243,7 +243,7 @@ FindResourceDataById(
 EFI_STATUS
 EFIAPI
 GetPeFileVersionInfo(
-	IN VOID* ImageBase,
+	IN CONST VOID* ImageBase,
 	OUT UINT16* MajorVersion OPTIONAL,
 	OUT UINT16* MinorVersion OPTIONAL,
 	OUT UINT16* BuildNumber OPTIONAL,
diff --git a/EfiGuardDxe/util.c b/EfiGuardDxe/util.c
index 861c81d..6420a56 100644
--- a/EfiGuardDxe/util.c
+++ b/EfiGuardDxe/util.c
@@ -151,7 +151,7 @@ FindPattern(
 	IN CONST UINT8* Pattern,
 	IN UINT8 Wildcard,
 	IN UINT32 PatternLength,
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN UINT32 Size,
 	OUT VOID **Found
 	)
@@ -188,7 +188,7 @@ FindPatternVerbose(
 	IN CONST UINT8* Pattern,
 	IN UINT8 Wildcard,
 	IN UINT32 PatternLength,
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN UINT32 Size,
 	OUT VOID **Found
 	)
diff --git a/EfiGuardDxe/util.h b/EfiGuardDxe/util.h
index b42766d..f25c3d6 100644
--- a/EfiGuardDxe/util.h
+++ b/EfiGuardDxe/util.h
@@ -73,7 +73,7 @@ FindPattern(
 	IN CONST UINT8* Pattern,
 	IN UINT8 Wildcard,
 	IN UINT32 PatternLength,
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN UINT32 Size,
 	OUT VOID **Found
 	);
@@ -87,7 +87,7 @@ FindPatternVerbose(
 	IN CONST UINT8* Pattern,
 	IN UINT8 Wildcard,
 	IN UINT32 PatternLength,
-	IN VOID* Base,
+	IN CONST VOID* Base,
 	IN UINT32 Size,
 	OUT VOID **Found
 	);
@@ -110,7 +110,7 @@ ZydisInit(
 //
 // Finds the start of a function given an address within it, scanning downwards.
 // Returns NULL if StartAddress is NULL (this simplifies error checking logic in calling functions).
-// Returns NULL is LowerBound is reached and no function boundary was found.
+// Returns NULL if LowerBound is reached and no function boundary was found.
 //
 UINT8*
 EFIAPI