Mirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2026-04-19 20:26:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve for UEFI boot Windows/WinPE resolution issue fix.
Some checks failed
Ventoy CI / build (push) Has been cancelled
Details
Mirror GitHub to Gitee / Sync-GitHub-to-Gitee (push) Has been cancelled
Details

Browse Source
This commit is contained in:
longpanda
2026-04-14 15:38:06 +08:00
parent c1c27cd30c
commit 3c0df07b92
38 changed files with 348 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c
View File

@@ -1263,9 +1263,9 @@ EFI_STATUS EFIAPI VentoyEfiMain
return Status;
}
if (g_os_param_reserved[11] == 1)
if (g_os_param_reserved[11])
{
ventoy_lock_max_res();
ventoy_lock_res(g_os_param_reserved[11]);
}
ventoy_disable_ex_filesystem();
@@ -1346,9 +1346,9 @@ EFI_STATUS EFIAPI VentoyEfiMain
ventoy_enable_ex_filesystem();
if (g_os_param_reserved[11] == 1)
if (g_os_param_reserved[11])
{
ventoy_unlock_max_res();
ventoy_unlock_res();
}
return EFI_SUCCESS;

4
EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h
View File

@@ -428,8 +428,8 @@ EFI_STATUS ventoy_hook_1st_cdrom_start(VOID);
EFI_STATUS ventoy_hook_1st_cdrom_stop(VOID);
EFI_STATUS ventoy_disable_ex_filesystem(VOID);
EFI_STATUS ventoy_enable_ex_filesystem(VOID);
EFI_STATUS ventoy_lock_max_res(VOID);
EFI_STATUS ventoy_unlock_max_res(VOID);
EFI_STATUS ventoy_lock_res(UINT8 LockType);
EFI_STATUS ventoy_unlock_res(VOID);
#endif

42
EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
View File

@@ -1820,13 +1820,15 @@ STATIC EFI_STATUS EFIAPI ventoy_set_mode
return EFI_SUCCESS;
}
EFI_STATUS ventoy_lock_max_res(VOID)
EFI_STATUS ventoy_lock_res(UINT8 LockType)
{
UINT32 i = 0;
UINT32 x = 0;
UINT32 y = 0;
UINT32 SelMode = 0;
UINT32 CurMode = 0;
UINT32 Highest = 0;
UINT32 M1024_768 = MAX_UINT32;
UINTN Size;
EFI_STATUS rc;
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
@@ -1838,6 +1840,12 @@ EFI_STATUS ventoy_lock_max_res(VOID)
return EFI_SUCCESS;
}
/* 1: Highest 2: 1024x768 */
if (LockType == 0 || LockType > 2)
{
return EFI_SUCCESS;
}
rc = gBS->LocateProtocol(&gEfiGraphicsOutputProtocolGuid, NULL, (void **)&gop);
if (rc != EFI_SUCCESS)
{
@@ -1852,6 +1860,11 @@ EFI_STATUS ventoy_lock_max_res(VOID)
/* Get mode information */
if (gop->QueryMode(gop, i, &Size, &info) == EFI_SUCCESS)
{
if (info->HorizontalResolution == 1024 && info->VerticalResolution == 768)
{
M1024_768 = i;
}
if (x < info->HorizontalResolution ||
(x == info->HorizontalResolution && y < info->VerticalResolution))
{
@@ -1862,12 +1875,31 @@ EFI_STATUS ventoy_lock_max_res(VOID)
}
}
if (Highest != CurMode)
if (LockType == 1)
{
gop->SetMode(gop, Highest);
SelMode = Highest;
}
else
{
if (M1024_768 == MAX_UINT32)
{
SelMode = Highest;
}
else
{
SelMode = M1024_768;
x = 1024;
y = 768;
}
}
debug("Lock resolution to Mode:%d %d x %d", Highest, x, y);
if (SelMode != CurMode)
{
gop->SetMode(gop, SelMode);
}
debug("Lock resolution to Mode:%d %d x %d", SelMode, x, y);
g_org_mode_num = CurMode;
g_org_set_mode = gop->SetMode;
@@ -1876,7 +1908,7 @@ EFI_STATUS ventoy_lock_max_res(VOID)
return EFI_SUCCESS;
}
EFI_STATUS ventoy_unlock_max_res(VOID)
EFI_STATUS ventoy_unlock_res(VOID)
{
EFI_STATUS rc;
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;