aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Application/EfiDSEFix/src/EfiDSEFix.cpp4
-rw-r--r--Application/EfiDSEFix/src/main.cpp2
-rw-r--r--Application/Loader/Loader.c4
-rw-r--r--EfiGuardDxe/PatchNtoskrnl.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/Application/EfiDSEFix/src/EfiDSEFix.cpp b/Application/EfiDSEFix/src/EfiDSEFix.cpp
index 9e68bfb..dd315ed 100644
--- a/Application/EfiDSEFix/src/EfiDSEFix.cpp
+++ b/Application/EfiDSEFix/src/EfiDSEFix.cpp
@@ -192,8 +192,8 @@ AnalyzeCi(
// Map file as SEC_IMAGE
WCHAR Path[MAX_PATH];
- const CHAR NtoskrnlExe[] = "ntoskrnl.exe";
- const CHAR CiDll[] = "CI.dll";
+ constexpr CHAR NtoskrnlExe[] = "ntoskrnl.exe";
+ constexpr CHAR CiDll[] = "CI.dll";
_snwprintf(Path, MAX_PATH / sizeof(WCHAR), L"%ls\\System32\\%hs",
SharedUserData->NtSystemRoot,
diff --git a/Application/EfiDSEFix/src/main.cpp b/Application/EfiDSEFix/src/main.cpp
index fe1e6aa..3ac8ed5 100644
--- a/Application/EfiDSEFix/src/main.cpp
+++ b/Application/EfiDSEFix/src/main.cpp
@@ -227,7 +227,7 @@ NtProcessStartupW(
Peb = Peb != nullptr ? NtCurrentPeb() : NtCurrentTeb()->ProcessEnvironmentBlock; // And this turd is to get Resharper to shut up about assigning to Peb before reading from it. Note LHS == RHS
// Get the command line from the startup parameters. If there isn't one, use the executable name
- PRTL_USER_PROCESS_PARAMETERS Params = RtlNormalizeProcessParams(Peb->ProcessParameters);
+ const PRTL_USER_PROCESS_PARAMETERS Params = RtlNormalizeProcessParams(Peb->ProcessParameters);
const PWCHAR CommandLineBuffer = Params->CommandLine.Buffer == nullptr || Params->CommandLine.Buffer[0] == L'\0'
? Params->ImagePathName.Buffer
: Params->CommandLine.Buffer;
diff --git a/Application/Loader/Loader.c b/Application/Loader/Loader.c
index fce88b8..801fdf9 100644
--- a/Application/Loader/Loader.c
+++ b/Application/Loader/Loader.c
@@ -36,7 +36,6 @@ STATIC CHAR16* mDriverPaths[] = {
};
-extern
VOID
EFIAPI
BmSetMemoryTypeInformationVariable(
@@ -48,6 +47,7 @@ STATIC
BOOLEAN
EFIAPI
WaitForKey(
+ VOID
)
{
EFI_INPUT_KEY Key = { 0, 0 };
@@ -55,7 +55,7 @@ WaitForKey(
gBS->WaitForEvent(1, &gST->ConIn->WaitForKey, &Index);
gST->ConIn->ReadKeyStroke(gST->ConIn, &Key);
- return (BOOLEAN)(Key.ScanCode != SCAN_ESC);
+ return Key.ScanCode != SCAN_ESC;
}
#if CONFIGURE_DRIVER
diff --git a/EfiGuardDxe/PatchNtoskrnl.c b/EfiGuardDxe/PatchNtoskrnl.c
index 3c3161b..9dd3537 100644
--- a/EfiGuardDxe/PatchNtoskrnl.c
+++ b/EfiGuardDxe/PatchNtoskrnl.c
@@ -400,7 +400,7 @@ DisablePatchGuard(
// Print info
PRINT_KERNEL_PATCH_MSG(L"\r\n Patched KeInitAmd64SpecificState [RVA: 0x%X].\r\n",
(UINT32)(KeInitAmd64SpecificState - ImageBase));
- PRINT_KERNEL_PATCH_MSG(L" Patched %S [RVA: 0x%X].\r\n",
+ PRINT_KERNEL_PATCH_MSG(L" Patched %ls [RVA: 0x%X].\r\n",
FuncName, (UINT32)(CcInitializeBcbProfiler - ImageBase));
if (ExpLicenseWatchInitWorker != NULL)
{