X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/a5c706511b84eb0f9e5f042f18f2f3c9602977c4..88dcceeabc61862ee3965d4ea266fccceb1e5838:/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c diff --git a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c index c05e772..968049a 100644 --- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c +++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c @@ -52,6 +52,10 @@ static grub_env_get_pf grub_env_get = NULL; ventoy_grub_param_file_replace *g_file_replace_list = NULL; ventoy_efi_file_replace g_efi_file_replace; +BOOLEAN g_fix_windows_1st_cdrom_issue = FALSE; + +STATIC BOOLEAN g_hook_keyboard = FALSE; + CHAR16 gFirstTryBootFile[256] = {0}; /* Boot filename */ @@ -191,11 +195,12 @@ static void EFIAPI ventoy_dump_chain(ventoy_chain_head *chain) debug("os_param->vtoy_img_size=<%llu>", chain->os_param.vtoy_img_size); debug("os_param->vtoy_img_location_addr=<0x%llx>", chain->os_param.vtoy_img_location_addr); debug("os_param->vtoy_img_location_len=<%u>", chain->os_param.vtoy_img_location_len); - debug("os_param->vtoy_reserved=<%u %u %u %u>", + debug("os_param->vtoy_reserved=<%u %u %u %u %u>", g_os_param_reserved[0], g_os_param_reserved[1], g_os_param_reserved[2], - g_os_param_reserved[3] + g_os_param_reserved[3], + g_os_param_reserved[4] ); ventoy_debug_pause(); @@ -490,6 +495,7 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle) EFI_STATUS Status = EFI_SUCCESS; ventoy_grub_param *pGrubParam = NULL; EFI_LOADED_IMAGE_PROTOCOL *pImageInfo = NULL; + ventoy_chain_head *chain = NULL; Status = gBS->HandleProtocol(ImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **)&pImageInfo); if (EFI_ERROR(Status)) @@ -556,12 +562,15 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle) ); pPos = StrStr(pCmdLine, L"mem:"); - g_chain = (ventoy_chain_head *)StrHexToUintn(pPos + 4); + chain = (ventoy_chain_head *)StrHexToUintn(pPos + 4); pPos = StrStr(pPos, L"size:"); size = StrDecimalToUintn(pPos + 5); - debug("memory addr:%p size:%lu", g_chain, size); + debug("memory addr:%p size:%lu", chain, size); + + g_chain = AllocatePool(size); + CopyMem(g_chain, chain, size); if (StrStr(pCmdLine, L"memdisk")) { @@ -580,11 +589,18 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle) g_os_param_reserved = (UINT8 *)(g_chain->os_param.vtoy_reserved); /* Workaround for Windows & ISO9660 */ - if (g_os_param_reserved[2] == 1 && g_os_param_reserved[3] == 0) + if (g_os_param_reserved[2] == ventoy_chain_windows && g_os_param_reserved[3] == 0) { g_fixup_iso9660_secover_enable = TRUE; } + if (g_os_param_reserved[2] == ventoy_chain_windows && g_os_param_reserved[4] != 1) + { + g_hook_keyboard = TRUE; + } + + debug("internal param: secover:%u keyboard:%u", g_fixup_iso9660_secover_enable, g_hook_keyboard); + for (i = 0; i < sizeof(ventoy_os_param); i++) { chksum += *((UINT8 *)(&(g_chain->os_param)) + i); @@ -603,6 +619,17 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle) } } + g_fix_windows_1st_cdrom_issue = FALSE; + if (ventoy_chain_windows == g_os_param_reserved[2] || + ventoy_chain_wim == g_os_param_reserved[2]) + { + if (ventoy_is_cdrom_dp_exist()) + { + debug("fixup the 1st cdrom influences when boot windows ..."); + g_fix_windows_1st_cdrom_issue = TRUE; + } + } + FreePool(pCmdLine); return EFI_SUCCESS; } @@ -626,6 +653,44 @@ EFI_STATUS EFIAPI ventoy_clean_env(VOID) FreePool((VOID *)(UINTN)g_chain->os_param.vtoy_img_location_addr); } + FreePool(g_chain); + + return EFI_SUCCESS; +} + +STATIC EFI_STATUS ventoy_hook_start(VOID) +{ + /* don't add debug print in this function */ + + if (g_fix_windows_1st_cdrom_issue) + { + ventoy_hook_1st_cdrom_start(); + } + + /* let this the last */ + if (g_hook_keyboard) + { + ventoy_hook_keyboard_start(); + } + + return EFI_SUCCESS; +} + +STATIC EFI_STATUS ventoy_hook_stop(VOID) +{ + /* don't add debug print in this function */ + + if (g_fix_windows_1st_cdrom_issue) + { + ventoy_hook_1st_cdrom_stop(); + } + + /* let this the last */ + if (g_hook_keyboard) + { + ventoy_hook_keyboard_stop(); + } + return EFI_SUCCESS; } @@ -707,16 +772,20 @@ EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle) if (gDebugPrint) { gST->ConIn->Reset(gST->ConIn, FALSE); - //ventoy_wrapper_system(); } - + if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC) { ventoy_wrapper_push_openvolume(pFile->OpenVolume); pFile->OpenVolume = ventoy_wrapper_open_volume; } - + + ventoy_hook_start(); + /* can't add debug print here */ + //ventoy_wrapper_system(); Status = gBS->StartImage(Image, NULL, NULL); + ventoy_hook_stop(); + if (EFI_ERROR(Status)) { debug("Failed to start image %r", Status); @@ -743,7 +812,6 @@ EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle) return EFI_SUCCESS; } - EFI_STATUS EFIAPI VentoyEfiMain ( IN EFI_HANDLE ImageHandle, @@ -751,6 +819,7 @@ EFI_STATUS EFIAPI VentoyEfiMain ) { EFI_STATUS Status = EFI_SUCCESS; + EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *Protocol; g_sector_flag_num = 512; /* initial value */ @@ -760,6 +829,12 @@ EFI_STATUS EFIAPI VentoyEfiMain return EFI_OUT_OF_RESOURCES; } + Status = gBS->HandleProtocol(gST->ConsoleInHandle, &gEfiSimpleTextInputExProtocolGuid, (VOID **)&Protocol); + if (EFI_SUCCESS == Status) + { + g_con_simple_input_ex = Protocol; + } + gST->ConOut->ClearScreen(gST->ConOut); ventoy_clear_input();