diff --git a/Voyager-1/Voyager-1 (1703-1511)/HvLoader.c b/Voyager-1/Voyager-1 (1703-1511)/HvLoader.c index 946421c..0265aec 100644 --- a/Voyager-1/Voyager-1 (1703-1511)/HvLoader.c +++ b/Voyager-1/Voyager-1 (1703-1511)/HvLoader.c @@ -54,9 +54,6 @@ EFI_STATUS EFIAPI HvBlImgLoadPEImageFromSourceBuffer(VOID* a1, VOID* a2, VOID* a VmExitHook ); - gBS->SetMem(PayLoad, sizeof PayLoad, NULL); - gBS->FreePool(PayLoad); - pSection->Characteristics = SECTION_RWX; pSection->Misc.VirtualSize += PayLoadSize(); DBG_PRINT("VmExitHook (PayLoad Entry Point) -> 0x%p\n", VmExitHook); @@ -119,9 +116,6 @@ EFI_STATUS EFIAPI HvBlImgLoadPEImageEx(VOID* DeviceId, VOID* MemoryType, CHAR16* VmExitHook ); - gBS->SetMem(PayLoad, sizeof PayLoad, NULL); - gBS->FreePool(PayLoad); - pSection->Characteristics = SECTION_RWX; pSection->Misc.VirtualSize += PayLoadSize(); DBG_PRINT("VmExitHook (PayLoad Entry Point) -> 0x%p\n", VmExitHook); diff --git a/Voyager-1/Voyager-1 (1703-1511)/Utils.h b/Voyager-1/Voyager-1 (1703-1511)/Utils.h index 28851f6..bb5b36c 100644 --- a/Voyager-1/Voyager-1 (1703-1511)/Utils.h +++ b/Voyager-1/Voyager-1 (1703-1511)/Utils.h @@ -1,6 +1,6 @@ #pragma once #include "ShitHook.h" -#define WINVER 1511 +#define WINVER 1703 #define PORT_NUM 0x2F8 #define BL_MEMORY_ATTRIBUTE_RWX 0x424000 #define SECTION_RWX (EFI_IMAGE_SCN_MEM_READ | EFI_IMAGE_SCN_MEM_WRITE | EFI_IMAGE_SCN_MEM_EXECUTE) diff --git a/Voyager-2/Voyager-2 (1703-1511)/WinLoad.c b/Voyager-2/Voyager-2 (1703-1511)/WinLoad.c index d9be67d..304eed1 100644 --- a/Voyager-2/Voyager-2 (1703-1511)/WinLoad.c +++ b/Voyager-2/Voyager-2 (1703-1511)/WinLoad.c @@ -1,16 +1,11 @@ #include "WinLoad.h" SHITHOOK WinLoadImageShitHook; -CHAR8 ModulePathCStr[0x100]; BOOLEAN InstalledHvLoaderHook = FALSE; EFI_STATUS EFIAPI BlImgLoadPEImageEx(VOID* a1, VOID* a2, CHAR16* ImagePath, UINT64* ImageBasePtr, UINT32* ImageSize, VOID* a6, VOID* a7, VOID* a8, VOID* a9, VOID* a10, VOID* a11, VOID* a12, VOID* a13, VOID* a14) { - UnicodeStrToAsciiStr(ImagePath, ModulePathCStr); - DBG_PRINT("LOADING FROM WINLOAD: "); - DBG_PRINT(ModulePathCStr); - DisableShitHook(&WinLoadImageShitHook); EFI_STATUS Result = ((LDR_LOAD_IMAGE)WinLoadImageShitHook.Address)(a1, a2, ImagePath, ImageBasePtr, ImageSize, a6, a7, a8, a9, a10, a11, a12, a13, a14); @@ -35,12 +30,6 @@ EFI_STATUS EFIAPI BlImgLoadPEImageEx(VOID* a1, VOID* a2, CHAR16* ImagePath, UINT ALLOCATE_IMAGE_BUFFER_MASK ); - if (!LoadImage || !AllocImage) - { - DBG_PRINT("Signatures FAILED!\n"); - return Result; - } - #if WINVER == 1703 MakeShitHook(&HvLoadImageBufferHook, RESOLVE_RVA(LoadImage, 5, 1), &HvBlImgLoadPEImageFromSourceBuffer, TRUE); #elif WINVER <= 1607 @@ -48,11 +37,7 @@ EFI_STATUS EFIAPI BlImgLoadPEImageEx(VOID* a1, VOID* a2, CHAR16* ImagePath, UINT #endif MakeShitHook(&HvLoadAllocImageHook, RESOLVE_RVA(AllocImage, 5, 1), &HvLoaderBlImgAllocateImageBuffer, TRUE); - DBG_PRINT("LoadImageHook -> 0x%p\n", RESOLVE_RVA(LoadImage, 5, 1)); - DBG_PRINT("AllocImage -> 0x%p\n", RESOLVE_RVA(AllocImage, 5, 1)); InstalledHvLoaderHook = TRUE; } - - DBG_PRINT("[%s] Image Base -> 0x%p, Image Size -> 0x%p\n", __FUNCTION__, *ImageBasePtr, *ImageSize); return Result; } \ No newline at end of file