1.0.58 release

Update README.md
2025-09-18 01:41:15 +00:00 · 2021-11-06 17:54:11 +08:00 · 2021-11-04 18:27:50 +08:00 · 2021-11-04 18:26:37 +08:00 · 2021-11-04 18:25:43 +08:00 · 2021-11-04 17:56:08 +08:00
50 changed files with 1621 additions and 318 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://www.ventoy.net/en/donation.html'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.paypal.me/ventoy', 'https://www.ventoy.net/en/donation.html'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -21,7 +21,7 @@ body:
    attributes:
      label: Ventoy Version
      description: What version of ventoy are you running?
-      placeholder: 1.0.56
+      placeholder: 1.0.58
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/success_image_report.yml
+++ b/.github/ISSUE_TEMPLATE/success_image_report.yml
@@ -0,0 +1,101 @@
+name: Success Image Report
+description: To report an image file that boot successfully in Ventoy and is not yet listed in https://www.ventoy.net/en/isolist.html
+title: "[Success Image Report]: "
+assignees:
+  - octocat
+body:
+  - type: markdown
+    attributes:
+      value: |
+        I list all the successfully tested image files in the official website: https://www.ventoy.net/en/isolist.html   
+        If you successfully test an image file which is not listed in the above page, you can tell me and I will be very glad to add it to the tested list.
+  - type: checkboxes
+    id: faq
+    attributes:
+      label: Official Website List
+      description: Have you checked the list at [https://www.ventoy.net/en/isolist.html](https://www.ventoy.net/en/isolist.html) and the image file is not listed?
+      options:
+        - label: I have checked the list in official website and the image file is not listed there. 
+          required: true
+  - type: input
+    id: version
+    attributes:
+      label: Ventoy Version
+      description: What version of ventoy did you test with the image file.
+      placeholder: 1.0.57
+    validations:
+      required: true
+  - type: dropdown
+    id: bios
+    attributes:
+      label: BIOS Mode
+      description: In which BIOS mode did you successfully test the image file? (It's recommended to test in both mode)
+      options:
+        - Legacy BIOS Mode
+        - UEFI Mode
+        - Both
+    validations:
+      required: true
+  - type: dropdown
+    id: partstyle
+    attributes:
+      label: Partition Style
+      description: Which partition style did you use with Ventoy?
+      options:
+        - MBR
+        - GPT
+    validations:
+      required: true
+  - type: input
+    id: filename
+    attributes:
+      label: Image file name
+      description: The successfully tested image file name.
+      placeholder: xxxx.iso
+    validations:
+      required: true
+  - type: dropdown
+    id: checksum
+    attributes:
+      label: Image file checksum type
+      description: 
+      options:
+        - MD5
+        - SHA1        
+        - SHA256        
+        - SHA512        
+    validations:
+      required: true
+  - type: input
+    id: checkvalue
+    attributes:
+      label: Image file checksum value
+      description: What is the image file checksum value corresponding to the above checksum type?
+      placeholder: xxxx
+    validations:
+      required: true
+  - type: input
+    id: link
+    attributes:
+      label: Image file download link (if applicable)
+      description: What is the image file download link?
+      placeholder: https://xxx
+    validations:
+      required: false
+  - type: input
+    id: testenv
+    attributes:
+      label: Test envrionment
+      description: The manufacturer/model and other details about your computer (or VM).
+      placeholder: Lenovo Thinkpad T420 laptop
+    validations:
+      required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: More Details?
+      description: You can give more details here.
+      value: "This image file booted successfully in Ventoy."
+    validations:
+      required: false
+
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.c
@@ -59,6 +59,9 @@ static grub_env_set_pf grub_env_set = NULL;
 ventoy_grub_param_file_replace *g_file_replace_list = NULL;
 ventoy_efi_file_replace g_efi_file_replace;

+ventoy_grub_param_file_replace *g_img_replace_list = NULL;
+ventoy_efi_file_replace g_img_file_replace;
+
 CONST CHAR16 gIso9660EfiDriverPath[] = ISO9660_EFI_DRIVER_PATH;
 CONST CHAR16 gUdfEfiDriverPath[] = UDF_EFI_DRIVER_PATH;

@@ -707,6 +710,35 @@ STATIC EFI_STATUS EFIAPI ventoy_load_isoefi_driver(IN EFI_HANDLE ImageHandle)
    return EFI_SUCCESS;
 }

+STATIC EFI_STATUS ventoy_proc_img_replace_name(ventoy_grub_param_file_replace *replace)
+{
+    UINT32 i;
+    char tmp[256];
+
+    if (replace->magic != GRUB_IMG_REPLACE_MAGIC)
+    {
+        return EFI_SUCCESS;
+    }
+
+    if (replace->old_file_name[0][0] == 0)
+    {
+        return EFI_SUCCESS;
+    }
+
+    AsciiStrCpyS(tmp, sizeof(tmp), replace->old_file_name[0]);
+    
+    for (i = 0; i < 256 && tmp[i]; i++)
+    {
+        if (tmp[i] == '/')
+        {
+            tmp[i] = '\\';
+        }
+    }
+
+    AsciiStrCpyS(replace->old_file_name[0], 256, tmp);
+    return EFI_SUCCESS;
+}
+
 STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
 {   
    UINT32 i = 0;
@@ -817,6 +849,19 @@ STATIC EFI_STATUS EFIAPI ventoy_parse_cmdline(IN EFI_HANDLE ImageHandle)
        old_cnt > 3 ? g_file_replace_list->old_file_name[3] : ""
        );

+    g_img_replace_list = &pGrubParam->img_replace;
+    ventoy_proc_img_replace_name(g_img_replace_list);
+    old_cnt = g_img_replace_list->old_file_cnt;
+    debug("img replace: magic:0x%x virtid:%u name count:%u <%a> <%a> <%a> <%a>",
+        g_img_replace_list->magic,
+        g_img_replace_list->new_file_virtual_id,
+        old_cnt,
+        old_cnt > 0 ? g_img_replace_list->old_file_name[0] : "",
+        old_cnt > 1 ? g_img_replace_list->old_file_name[1] : "",
+        old_cnt > 2 ? g_img_replace_list->old_file_name[2] : "",
+        old_cnt > 3 ? g_img_replace_list->old_file_name[3] : ""
+        );
+    
    pPos = StrStr(pCmdLine, L"mem:");
    chain = (ventoy_chain_head *)StrHexToUintn(pPos + 4);

@@ -1050,7 +1095,8 @@ EFI_STATUS EFIAPI ventoy_boot(IN EFI_HANDLE ImageHandle)
                gST->ConIn->Reset(gST->ConIn, FALSE);
            }
            
-            if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC)
+            if ((g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC) ||
+                (g_img_replace_list && g_img_replace_list->magic == GRUB_IMG_REPLACE_MAGIC))
            {
                ventoy_wrapper_push_openvolume(pFile->OpenVolume);
                pFile->OpenVolume = ventoy_wrapper_open_volume;
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/Ventoy.h
@@ -243,6 +243,7 @@ typedef int (*grub_env_printf_pf)(const char *fmt, ...);
 #pragma pack(1)

 #define GRUB_FILE_REPLACE_MAGIC  0x1258BEEF
+#define GRUB_IMG_REPLACE_MAGIC   0x1259BEEF

 typedef struct ventoy_efi_file_replace
 {
@@ -267,6 +268,7 @@ typedef struct ventoy_grub_param
    grub_env_get_pf grub_env_get;
    grub_env_set_pf grub_env_set;
    ventoy_grub_param_file_replace file_replace;
+    ventoy_grub_param_file_replace img_replace;
    grub_env_printf_pf grub_env_printf;    
 }ventoy_grub_param;

@@ -396,6 +398,7 @@ extern ventoy_virt_chunk *g_virt_chunk;
 extern UINT32 g_virt_chunk_num;
 extern vtoy_block_data gBlockData;
 extern ventoy_efi_file_replace g_efi_file_replace;
+extern ventoy_efi_file_replace g_img_file_replace;
 extern ventoy_sector_flag *g_sector_flag;
 extern UINT32 g_sector_flag_num;
 extern BOOLEAN gMemdiskMode;
@@ -403,6 +406,7 @@ extern BOOLEAN gSector512Mode;
 extern UINTN g_iso_buf_size;
 extern UINT8 *g_iso_data_buf;
 extern ventoy_grub_param_file_replace *g_file_replace_list;
+extern ventoy_grub_param_file_replace *g_img_replace_list;
 extern BOOLEAN g_fixup_iso9660_secover_enable;
 extern EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *g_con_simple_input_ex;
 extern BOOLEAN g_fix_windows_1st_cdrom_issue;
--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/Ventoy/VentoyProtocol.c
@@ -37,6 +37,9 @@
 #include <Protocol/DriverBinding.h>
 #include <Ventoy.h>

+#define ASSIGN_REPLACE(This, replace) \
+    replace = (This->FlushEx == ventoy_wrapper_file_flush_ex) ? &g_efi_file_replace : &g_img_file_replace
+
 UINT8 *g_iso_data_buf = NULL;
 UINTN g_iso_buf_size = 0;
 BOOLEAN gMemdiskMode = FALSE;
@@ -1245,6 +1248,15 @@ ventoy_wrapper_file_flush_ex(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
 	return EFI_SUCCESS;
 }

+/* Ex version */
+STATIC EFI_STATUS EFIAPI
+ventoy_wrapper_file_flush_ex_img(EFI_FILE_HANDLE This, EFI_FILE_IO_TOKEN *Token)
+{
+    (VOID)This;
+    (VOID)Token;
+	return EFI_SUCCESS;
+}
+

 STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_write(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
@@ -1270,19 +1282,20 @@ ventoy_wrapper_file_close(EFI_FILE_HANDLE This)
    return EFI_SUCCESS;
 }

-
 STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_set_pos(EFI_FILE_HANDLE This, UINT64 Position)
 {
-    (VOID)This;
-        
-    if (Position <= g_efi_file_replace.FileSizeBytes)
+    ventoy_efi_file_replace *replace = NULL;
+
+    ASSIGN_REPLACE(This, replace);
+    
+    if (Position <= replace->FileSizeBytes)
    {
-        g_efi_file_replace.CurPos = Position;
+        replace->CurPos = Position;
    }
    else
    {
-        g_efi_file_replace.CurPos = g_efi_file_replace.FileSizeBytes;
+        replace->CurPos = replace->FileSizeBytes;
    }
    
    return EFI_SUCCESS;
@@ -1291,9 +1304,11 @@ ventoy_wrapper_file_set_pos(EFI_FILE_HANDLE This, UINT64 Position)
 STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_get_pos(EFI_FILE_HANDLE This, UINT64 *Position)
 {
-    (VOID)This;
+    ventoy_efi_file_replace *replace = NULL;

-    *Position = g_efi_file_replace.CurPos;
+    ASSIGN_REPLACE(This, replace);
+
+    *Position = replace->CurPos;

    return EFI_SUCCESS;
 }
@@ -1303,6 +1318,9 @@ STATIC EFI_STATUS EFIAPI
 ventoy_wrapper_file_get_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN *Len, VOID *Data)
 {
    EFI_FILE_INFO *Info = (EFI_FILE_INFO *) Data;
+    ventoy_efi_file_replace *replace = NULL;
+
+    ASSIGN_REPLACE(This, replace);

    debug("ventoy_wrapper_file_get_info ... %u", *Len);

@@ -1320,8 +1338,8 @@ ventoy_wrapper_file_get_info(EFI_FILE_HANDLE This, EFI_GUID *Type, UINTN *Len, V
    ZeroMem(Data, sizeof(EFI_FILE_INFO));

    Info->Size = sizeof(EFI_FILE_INFO);
-    Info->FileSize = g_efi_file_replace.FileSizeBytes;
-    Info->PhysicalSize = g_efi_file_replace.FileSizeBytes;
+    Info->FileSize = replace->FileSizeBytes;
+    Info->PhysicalSize = replace->FileSizeBytes;
    Info->Attribute = EFI_FILE_READ_ONLY;
    //Info->FileName = EFI_FILE_READ_ONLY;

@@ -1335,23 +1353,24 @@ ventoy_wrapper_file_read(EFI_FILE_HANDLE This, UINTN *Len, VOID *Data)
 {
    EFI_LBA Lba;
    UINTN ReadLen = *Len;
-    
-    (VOID)This;
+    ventoy_efi_file_replace *replace = NULL;

+    ASSIGN_REPLACE(This, replace);
+    
    debug("ventoy_wrapper_file_read ... %u", *Len);

-    if (g_efi_file_replace.CurPos + ReadLen > g_efi_file_replace.FileSizeBytes)
+    if (replace->CurPos + ReadLen > replace->FileSizeBytes)
    {
-        ReadLen = g_efi_file_replace.FileSizeBytes - g_efi_file_replace.CurPos;
+        ReadLen = replace->FileSizeBytes - replace->CurPos;
    }

-    Lba = g_efi_file_replace.CurPos / 2048 + g_efi_file_replace.BlockIoSectorStart;
+    Lba = replace->CurPos / 2048 + replace->BlockIoSectorStart;

    ventoy_block_io_read(NULL, 0, Lba, ReadLen, Data);

    *Len = ReadLen;

-    g_efi_file_replace.CurPos += ReadLen;
+    replace->CurPos += ReadLen;

    return EFI_SUCCESS;
 }
@@ -1362,7 +1381,7 @@ ventoy_wrapper_file_read_ex(IN EFI_FILE_PROTOCOL *This, IN OUT EFI_FILE_IO_TOKEN
 	return ventoy_wrapper_file_read(This, &(Token->BufferSize), Token->Buffer);
 }

-STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File)
+STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File, BOOLEAN Img)
 {
    File->Revision    = EFI_FILE_PROTOCOL_REVISION2;
    File->Open        = ventoy_wrapper_fs_open;
@@ -1378,7 +1397,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_procotol(EFI_FILE_PROTOCOL *File)
    File->OpenEx      = ventoy_wrapper_file_open_ex;
    File->ReadEx      = ventoy_wrapper_file_read_ex;
    File->WriteEx     = ventoy_wrapper_file_write_ex;
-    File->FlushEx     = ventoy_wrapper_file_flush_ex;
+    File->FlushEx     = Img ? ventoy_wrapper_file_flush_ex_img : ventoy_wrapper_file_flush_ex;

    return EFI_SUCCESS;
 }
@@ -1397,6 +1416,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
    UINT64 Sectors = 0;
    EFI_STATUS Status = EFI_SUCCESS;
    CHAR8 TmpName[256];
+    CHAR8 OldName[256];
    ventoy_virt_chunk *virt = NULL;

    debug("## ventoy_wrapper_file_open <%s> ", Name);
@@ -1417,6 +1437,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
        return Status;
    }

+
    if (g_file_replace_list && g_file_replace_list->magic == GRUB_FILE_REPLACE_MAGIC &&
        g_file_replace_list->new_file_virtual_id < g_virt_chunk_num)
    {
@@ -1427,7 +1448,7 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
            {
                g_original_fclose(*New);
                *New = &g_efi_file_replace.WrapperHandle;
-                ventoy_wrapper_file_procotol(*New);
+                ventoy_wrapper_file_procotol(*New, FALSE);

                virt = g_virt_chunk + g_file_replace_list->new_file_virtual_id;

@@ -1453,6 +1474,49 @@ STATIC EFI_STATUS EFIAPI ventoy_wrapper_file_open
        }
    }

+
+
+    if (g_img_replace_list && g_img_replace_list->magic == GRUB_IMG_REPLACE_MAGIC &&
+        g_img_replace_list->new_file_virtual_id < g_virt_chunk_num)
+    {
+        AsciiSPrint(TmpName, sizeof(TmpName), "%s", Name);
+        for (j = 0; j < g_img_replace_list->old_file_cnt; j++)
+        {
+            AsciiStrCpyS(OldName, sizeof(OldName), g_img_replace_list[i].old_file_name[j]);
+            if ((0 == AsciiStrCmp(OldName, TmpName)) ||
+                 (AsciiStrnCmp(OldName, "\\loader\\entries\\", 16) == 0 && 
+                  AsciiStrCmp(OldName + 16, TmpName) == 0
+                  )  
+                )
+            {
+                g_original_fclose(*New);
+                *New = &g_img_file_replace.WrapperHandle;
+                ventoy_wrapper_file_procotol(*New, TRUE);
+
+                virt = g_virt_chunk + g_img_replace_list->new_file_virtual_id;
+
+                Sectors = (virt->mem_sector_end - virt->mem_sector_start) + (virt->remap_sector_end - virt->remap_sector_start);
+                
+                g_img_file_replace.BlockIoSectorStart = virt->mem_sector_start;
+                g_img_file_replace.FileSizeBytes = Sectors * 2048;
+
+                if (gDebugPrint)
+                {
+                    debug("## ventoy_wrapper_file_open2 <%s> BlockStart:%lu Sectors:%lu Bytes:%lu", Name,
+                        g_img_file_replace.BlockIoSectorStart, Sectors, Sectors * 2048);
+                    sleep(3);
+                }
+                
+                return Status;
+            }
+        }
+
+        if (StrCmp(Name, L"\\loader\\entries") == 0)
+        {
+            (*New)->Open = ventoy_wrapper_file_open;
+        }
+    }
+
    return Status;
 }

--- a/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.h
+++ b/EDK2/edk2_mod/edk2-edk2-stable201911/MdeModulePkg/Application/VtoyUtil/VtoyUtil.h
@@ -41,6 +41,7 @@ typedef struct ventoy_grub_param
    grub_env_get_pf grub_env_get;
    grub_env_set_pf grub_env_set;
    ventoy_grub_param_file_replace file_replace;
+    ventoy_grub_param_file_replace img_replace;
    grub_env_printf_pf grub_env_printf;    
 }ventoy_grub_param;
 #pragma pack()
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/hashsum.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/commands/hashsum.c
@@ -94,7 +94,7 @@ hash_file (grub_file_t file, const gcry_md_spec_t *hash, void *result)
      {
          total += r;
          div = grub_divmod64(total * 100, (grub_uint64_t)file->size, &ro);
-          grub_printf("\rCalculating   %d%%    ", (int)div);
+          grub_printf("\rCalculating    %s   %d%%    ", hash->name, (int)div);
          grub_refresh();
      }
    }
@@ -105,7 +105,7 @@ hash_file (grub_file_t file, const gcry_md_spec_t *hash, void *result)
  grub_free (context);
  if (progress)
  {
-    grub_printf("\rCalculating   100%%    \n\r\n");
+    grub_printf("\rCalculating    %s   100%%    \n\r\n", hash->name);
    grub_refresh();      
  }
  return GRUB_ERR_NONE;
@@ -224,6 +224,8 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
  int keep = state[3].set;
  int uncompress = state[4].set;
  unsigned unread = 0;
+  int len = 0;
+  char hashsum[256];

  for (i = 0; i < ARRAY_SIZE (aliases); i++)
    if (grub_strcmp (ctxt->extcmd->cmd->name, aliases[i].name) == 0)
@@ -282,8 +284,12 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
 	  continue;
 	}
      for (j = 0; j < hash->mdlen; j++)
-	grub_printf ("%02x", ((grub_uint8_t *) result)[j]);
+	  {
+	    grub_printf ("%02x", ((grub_uint8_t *) result)[j]);
+        len += grub_snprintf(hashsum + len, sizeof(hashsum) - len, "%02x", ((grub_uint8_t *) result)[j]);
+      }
      grub_printf ("  %s\n", args[i]);
+      grub_env_set("VT_LAST_CHECK_SUM", hashsum);
    }

  if (unread)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
@@ -913,6 +913,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
            goto refresh;

        case (GRUB_TERM_CTRL | 'h'):
+        case 'h':
        {
            cmdstr = grub_env_get("VTOY_HELP_CMD");
            if (cmdstr)
@@ -926,6 +927,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
            break;
        }
        case (GRUB_TERM_CTRL | 'm'):
+        case 'm':
        {
            if (g_ventoy_cur_img_path)
            {
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/script/function.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/script/function.c
@@ -0,0 +1,113 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2007,2009,2010  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/misc.h>
+#include <grub/script_sh.h>
+#include <grub/parser.h>
+#include <grub/mm.h>
+#include <grub/charset.h>
+
+grub_script_function_t grub_script_function_list;
+
+grub_script_function_t
+grub_script_function_create (struct grub_script_arg *functionname_arg,
+			     struct grub_script *cmd)
+{
+  grub_script_function_t func;
+  grub_script_function_t *p;
+
+  func = (grub_script_function_t) grub_malloc (sizeof (*func));
+  if (! func)
+    return 0;
+
+  func->name = grub_strdup (functionname_arg->str);
+  if (! func->name)
+    {
+      grub_free (func);
+      return 0;
+    }
+
+  func->func = cmd;
+
+  /* Keep the list sorted for simplicity.  */
+  p = &grub_script_function_list;
+  while (*p)
+    {
+      if (grub_strcmp ((*p)->name, func->name) >= 0)
+	break;
+
+      p = &((*p)->next);
+    }
+
+  /* If the function already exists, overwrite the old function.  */
+  if (*p && grub_strcmp ((*p)->name, func->name) == 0)
+    {
+      grub_script_function_t q;
+
+      q = *p;
+      grub_script_free (q->func);
+      q->func = cmd;
+      grub_free (func);
+      func = q;
+    }
+  else
+    {
+      func->next = *p;
+      *p = func;
+    }
+
+  return func;
+}
+
+void
+grub_script_function_remove (const char *name)
+{
+  grub_script_function_t *p, q;
+
+  for (p = &grub_script_function_list, q = *p; q; p = &(q->next), q = q->next)
+    if (grub_strcmp (name, q->name) == 0)
+      {
+        *p = q->next;
+	grub_free (q->name);
+	grub_script_free (q->func);
+        grub_free (q);
+        break;
+      }
+}
+
+grub_script_function_t
+grub_script_function_find (char *functionname)
+{
+  grub_script_function_t func;
+
+  for (func = grub_script_function_list; func; func = func->next)
+    if (grub_strcmp (functionname, func->name) == 0)
+      break;
+
+  if (! func)
+    {
+      char tmp[64];
+      grub_strncpy (tmp, functionname, 63);
+      tmp[63] = 0;
+      /* Avoid truncating inside UTF-8 character.  */
+      tmp[grub_getend (tmp, tmp + grub_strlen (tmp))] = 0;
+      grub_error (GRUB_ERR_UNKNOWN_COMMAND, N_("can't find command `%s'"), tmp);
+    }
+
+  return func;
+}
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
@@ -918,6 +918,38 @@ static grub_err_t ventoy_cmd_strbegin(grub_extcmd_context_t ctxt, int argc, char
    return 0;
 }

+static grub_err_t ventoy_cmd_strcasebegin(grub_extcmd_context_t ctxt, int argc, char **args)
+{
+    char *c0, *c1;
+    
+    (void)ctxt;
+
+    if (argc != 2)
+    {
+        return 1;
+    }
+
+    c0 = args[0];
+    c1 = args[1];
+
+    while (*c0 && *c1)
+    {
+        if ((*c0 != *c1) && (*c0 != grub_toupper(*c1)))
+        {
+            return 1;
+        }
+        c0++;
+        c1++;
+    }
+
+    if (*c1)
+    {
+        return 1;
+    }
+
+    return 0;
+}
+
 static grub_err_t ventoy_cmd_incr(grub_extcmd_context_t ctxt, int argc, char **args)
 {
    long value_long = 0;
@@ -2669,6 +2701,22 @@ grub_uint32_t ventoy_get_iso_boot_catlog(grub_file_t file)
    return desc.sector;    
 }

+static grub_uint32_t ventoy_get_bios_eltorito_rba(grub_file_t file, grub_uint32_t sector)
+{
+    grub_uint8_t buf[512];
+
+    grub_file_seek(file, sector * 2048);
+    grub_file_read(file, buf, sizeof(buf));
+
+    if (buf[0] == 0x01 && buf[1] == 0x00 && 
+        buf[30] == 0x55 && buf[31] == 0xaa && buf[32] == 0x88)
+    {
+        return *((grub_uint32_t *)(buf + 40));
+    }
+
+    return 0;
+}
+
 int ventoy_has_efi_eltorito(grub_file_t file, grub_uint32_t sector)
 {
    int i;
@@ -2946,6 +2994,7 @@ static grub_err_t ventoy_cmd_img_sector(grub_extcmd_context_t ctxt, int argc, ch
    }

    grub_memset(&g_grub_param->file_replace, 0, sizeof(g_grub_param->file_replace));
+    grub_memset(&g_grub_param->img_replace, 0, sizeof(g_grub_param->img_replace));
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }

@@ -2977,15 +3026,21 @@ static grub_err_t ventoy_select_conf_replace(grub_extcmd_context_t ctxt, int arg
    debug("Find conf replace for %s\n", args[1]);

    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "(loop)%s", node->orgconf);
-    if (!file)
+    if (file)
+    {
+        offset = grub_iso9660_get_last_file_dirent_pos(file);
+        grub_file_close(file);  
+    }
+    else if (node->img > 0)
+    {
+        offset = 0;
+    }
+    else
    {
        debug("<(loop)%s> NOT exist\n", node->orgconf);
        goto end;
    }

-    offset = grub_iso9660_get_last_file_dirent_pos(file);
-    grub_file_close(file);    
-
    file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s%s", args[0], node->newconf);
    if (!file)
    {
@@ -3008,6 +3063,13 @@ static grub_err_t ventoy_select_conf_replace(grub_extcmd_context_t ctxt, int arg
    g_conf_replace_node = node;
    g_conf_replace_offset = offset + 2;

+    if (node->img > 0)
+    {
+        g_grub_param->img_replace.magic = GRUB_IMG_REPLACE_MAGIC;
+        g_grub_param->img_replace.old_name_cnt = 1;
+        grub_snprintf(g_grub_param->img_replace.old_file_name[0], 256, "%s", node->orgconf);
+    }
+
    debug("conf_replace OK: newlen: %d\n", g_conf_replace_new_len);

 end:
@@ -4820,7 +4882,7 @@ static int ventoy_chk_case_file(const char *filename, const struct grub_dirhook_
        return 1;
    }

-    if (0 == info->dir && grub_strncasecmp(filename, "ventoy.json", 11) == 0)
+    if (0 == info->dir && grub_strcasecmp(filename, "ventoy.json") == 0)
    {
        grub_snprintf(g_json_case_mis_path, 32, "%s/%s", (char *)data, filename);
        return 1;
@@ -4840,7 +4902,7 @@ static int ventoy_chk_case_dir(const char *filename, const struct grub_dirhook_i

    if (info->dir && (filename[0] == 'v' || filename[0] == 'V'))
    {
-        if (grub_strncasecmp(filename, "ventoy", 6) == 0)
+        if (grub_strcasecmp(filename, "ventoy") == 0)
        {
            grub_snprintf(path, sizeof(path), "/%s", filename);
            fs_dir->fs->fs_dir(fs_dir->dev, path, ventoy_chk_case_file, path);
@@ -4961,26 +5023,71 @@ static grub_err_t grub_cmd_gptpriority(grub_extcmd_context_t ctxt, int argc, cha
 }


-
-/* <BEGIN>: Deleted by longpanda, 20210916 PN:XX LABEL:XX */
-#if 0
-void ventoy_tip_set_menu_label(const char *vid)
+static grub_err_t grub_cmd_syslinux_nojoliet(grub_extcmd_context_t ctxt, int argc, char **args)
 {
-    img_info *node;
+    int ret = 1;
+    int joliet = 0;
+    grub_file_t file = NULL;
+    grub_uint32_t loadrba = 0;
+    grub_uint32_t boot_catlog = 0;
+    grub_uint8_t sector[512];
+    boot_info_table *info = NULL;
+    
+    (void)ctxt;
+    (void)argc;

-    g_ventoy_tip_msg1 = g_ventoy_tip_msg2 = NULL;
-    if (vid)
+    /* This also trigger a iso9660 fs parse */
+    if (ventoy_check_file_exist("(loop)/isolinux/isolinux.cfg"))
    {
-        node = (img_info *)(void *)grub_strtoul(vid + 4, NULL, 16);
-        if (node)
-        {
-           g_ventoy_tip_msg1 = node->tip1;
-           g_ventoy_tip_msg2 = node->tip2;
-        }
+        return 0;
    }
+
+    joliet = grub_iso9660_is_joliet();
+    if (joliet == 0)
+    {
+        return 1;
+    }
+
+    file = grub_file_open(args[0], VENTOY_FILE_TYPE);
+    if (!file)
+    {
+        debug("failed to open %s\n", args[0]);
+        return 1;
+    }
+
+    boot_catlog = ventoy_get_iso_boot_catlog(file);
+    if (boot_catlog == 0)
+    {
+        debug("no bootcatlog found %u\n", boot_catlog);
+        goto out;
+    }
+    
+    loadrba = ventoy_get_bios_eltorito_rba(file, boot_catlog);
+    if (loadrba == 0)
+    {
+        debug("no bios eltorito rba found %u\n", loadrba);
+        goto out;
+    }
+
+    grub_file_seek(file, loadrba * 2048);
+    grub_file_read(file, sector, 512);
+
+    info = (boot_info_table *)sector;
+    if (info->bi_data0 == 0x7c6ceafa && 
+        info->bi_data1 == 0x90900000 && 
+        info->bi_PrimaryVolumeDescriptor == 16 && 
+        info->bi_BootFileLocation == loadrba)
+    {
+        debug("bootloader is syslinux, %u.\n", loadrba);
+        ret = 0;
+    }
+
+out:
+
+    grub_file_close(file);
+    grub_errno = GRUB_ERR_NONE;
+    return ret;
 }
-#endif /* #if 0 */
-/* <END>  : Deleted by longpanda, 20210916 PN:XX LABEL:XX */

 int ventoy_env_init(void)
 {
@@ -5037,6 +5144,7 @@ static cmd_para ventoy_cmds[] =
    { "vt_mod",  ventoy_cmd_mod,  0, NULL, "{Int} {Int} {Var}",   "mod integer variable",    NULL },
    { "vt_strstr",  ventoy_cmd_strstr,  0, NULL, "",   "",    NULL },
    { "vt_str_begin",  ventoy_cmd_strbegin,  0, NULL, "",   "",    NULL },
+    { "vt_str_casebegin",  ventoy_cmd_strcasebegin,  0, NULL, "",   "",    NULL },
    { "vt_debug", ventoy_cmd_debug, 0, NULL, "{on|off}",   "turn debug on/off",    NULL },
    { "vtdebug", ventoy_cmd_debug, 0, NULL, "{on|off}",   "turn debug on/off",    NULL },
    { "vtbreak", ventoy_cmd_break, 0, NULL, "{level}",   "set debug break",    NULL },
@@ -5164,6 +5272,7 @@ static cmd_para ventoy_cmds[] =
    { "vt_check_json_path_case", ventoy_cmd_chk_json_pathcase, 0, NULL, "", "", NULL },
    { "vt_append_extra_sector", ventoy_cmd_append_ext_sector, 0, NULL, "", "", NULL },
    { "gptpriority", grub_cmd_gptpriority, 0, NULL, "", "", NULL },
+    { "vt_syslinux_need_nojoliet", grub_cmd_syslinux_nojoliet, 0, NULL, "", "", NULL },
 };

 int ventoy_register_all_cmd(void)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h
@@ -199,6 +199,18 @@ typedef struct ventoy_iso9660_vd
    grub_uint32_t space;
 }ventoy_iso9660_vd;

+/* https://wiki.osdev.org/El-Torito */
+typedef struct boot_info_table
+{
+    grub_uint32_t bi_data0;
+    grub_uint32_t bi_data1;
+    grub_uint32_t bi_PrimaryVolumeDescriptor;
+    grub_uint32_t bi_BootFileLocation;
+    grub_uint32_t bi_BootFileLength;
+    grub_uint32_t bi_Checksum;
+    grub_uint8_t bi_Reserved[40];
+}boot_info_table;
+
 #pragma pack()

 #define img_type_start 0
@@ -550,6 +562,7 @@ typedef struct plugin_entry
    const char *key;
    ventoy_plugin_entry_pf entryfunc;
    ventoy_plugin_check_pf checkfunc;
+    int flag;
 }plugin_entry;

 typedef struct replace_fs_dir
@@ -925,6 +938,7 @@ typedef struct custom_boot
 typedef struct conf_replace
 {
    int pathlen;
+    int img;
    char isopath[256];
    char orgconf[256];
    char newconf[256];
@@ -1109,5 +1123,7 @@ int ventoy_chain_file_read(const char *path, int offset, int len, void *buf);

 #define ret_goto_end(a) ret = a; goto end;

+extern ventoy_grub_param *g_grub_param;
+
 #endif /* __VENTOY_DEF_H__ */

--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_linux.c
@@ -691,6 +691,7 @@ static grub_uint32_t ventoy_linux_get_virt_chunk_size(void)
 static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_head *chain)
 {
    int id = 0;
+    int virtid = 0;
    initrd_info *node;
    grub_uint64_t sector;
    grub_uint32_t offset;
@@ -738,6 +739,7 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
        offset += g_ventoy_cpio_size;
        sector += cpio_secs + initrd_secs;
        cur++;
+        virtid++;
    }

    /* Lenovo EasyStartup need an addional sector for boundary check */
@@ -759,6 +761,7 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_
        offset += VTOY_APPEND_EXT_SIZE;
        sector += cpio_secs;
        cur++;
+        virtid++;
    }

    if (g_conf_replace_offset > 0)
@@ -776,9 +779,15 @@ static void ventoy_linux_fill_virt_data(    grub_uint64_t isosize, ventoy_chain_

        chain->virt_img_size_in_bytes += g_conf_replace_new_len_align;

+        if (g_grub_param->img_replace.magic == GRUB_IMG_REPLACE_MAGIC)
+        {
+            g_grub_param->img_replace.new_file_virtual_id = virtid;
+        }
+
        offset += g_conf_replace_new_len_align;
        sector += cpio_secs;
        cur++;
+        virtid++;
    }

    return;
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
@@ -2005,6 +2005,7 @@ static int ventoy_plugin_custom_boot_check(VTOY_JSON *json, const char *isodisk)

 static int ventoy_plugin_conf_replace_entry(VTOY_JSON *json, const char *isodisk)
 {
+    int img = 0;
    const char *isof = NULL;
    const char *orgf = NULL;
    const char *newf = NULL;
@@ -2042,6 +2043,11 @@ static int ventoy_plugin_conf_replace_entry(VTOY_JSON *json, const char *isodisk
            node = grub_zalloc(sizeof(conf_replace));
            if (node)
            {
+                if (JSON_SUCCESS == vtoy_json_get_int(pNode->pstChild, "img", &img))
+                {
+                    node->img = img;
+                }
+
                node->pathlen = grub_snprintf(node->isopath, sizeof(node->isopath), "%s", isof);
                grub_snprintf(node->orgconf, sizeof(node->orgconf), "%s", orgf);
                grub_snprintf(node->newconf, sizeof(node->newconf), "%s", newf);
@@ -2064,6 +2070,7 @@ static int ventoy_plugin_conf_replace_entry(VTOY_JSON *json, const char *isodisk

 static int ventoy_plugin_conf_replace_check(VTOY_JSON *json, const char *isodisk)
 {
+    int img = 0;
    const char *isof = NULL;
    const char *orgf = NULL;
    const char *newf = NULL;
@@ -2133,7 +2140,7 @@ static int ventoy_plugin_conf_replace_check(VTOY_JSON *json, const char *isodisk
                }
                else
                {
-                    grub_printf("new:<%s> [OK]\n", newf);                    
+                    grub_printf("new1:<%s> [OK]\n", newf);                    
                }
                grub_file_close(file);
            }
@@ -2141,6 +2148,12 @@ static int ventoy_plugin_conf_replace_check(VTOY_JSON *json, const char *isodisk
            {
                grub_printf("new:<%s> [NOT Exist]\n", newf);   
            }
+
+            if (JSON_SUCCESS == vtoy_json_get_int(pNode->pstChild, "img", &img))
+            {
+                grub_printf("img:<%d>\n", img);           
+            }
+            
            grub_printf("\n");
        }
    }
@@ -2325,45 +2338,59 @@ static int ventoy_plugin_image_list_check(VTOY_JSON *json, const char *isodisk)

 static plugin_entry g_plugin_entries[] = 
 {
-    { "control", ventoy_plugin_control_entry, ventoy_plugin_control_check },
-    { "theme", ventoy_plugin_theme_entry, ventoy_plugin_theme_check },
-    { "auto_install", ventoy_plugin_auto_install_entry, ventoy_plugin_auto_install_check },
-    { "persistence", ventoy_plugin_persistence_entry, ventoy_plugin_persistence_check },
-    { "menu_alias", ventoy_plugin_menualias_entry, ventoy_plugin_menualias_check },
-    { "menu_tip", ventoy_plugin_menutip_entry, ventoy_plugin_menutip_check },
-    { "menu_class", ventoy_plugin_menuclass_entry, ventoy_plugin_menuclass_check },
-    { "injection", ventoy_plugin_injection_entry, ventoy_plugin_injection_check },
-    { "auto_memdisk", ventoy_plugin_auto_memdisk_entry, ventoy_plugin_auto_memdisk_check },
-    { "image_list", ventoy_plugin_image_list_entry, ventoy_plugin_image_list_check },
-    { "image_blacklist", ventoy_plugin_image_list_entry, ventoy_plugin_image_list_check },
-    { "conf_replace", ventoy_plugin_conf_replace_entry, ventoy_plugin_conf_replace_check },
-    { "dud", ventoy_plugin_dud_entry, ventoy_plugin_dud_check },
-    { "password", ventoy_plugin_pwd_entry, ventoy_plugin_pwd_check },
-    { "custom_boot", ventoy_plugin_custom_boot_entry, ventoy_plugin_custom_boot_check },
+    { "control", ventoy_plugin_control_entry, ventoy_plugin_control_check, 0 },
+    { "theme", ventoy_plugin_theme_entry, ventoy_plugin_theme_check, 0 },
+    { "auto_install", ventoy_plugin_auto_install_entry, ventoy_plugin_auto_install_check, 0 },
+    { "persistence", ventoy_plugin_persistence_entry, ventoy_plugin_persistence_check, 0 },
+    { "menu_alias", ventoy_plugin_menualias_entry, ventoy_plugin_menualias_check, 0 },
+    { "menu_tip", ventoy_plugin_menutip_entry, ventoy_plugin_menutip_check, 0 },
+    { "menu_class", ventoy_plugin_menuclass_entry, ventoy_plugin_menuclass_check, 0 },
+    { "injection", ventoy_plugin_injection_entry, ventoy_plugin_injection_check, 0 },
+    { "auto_memdisk", ventoy_plugin_auto_memdisk_entry, ventoy_plugin_auto_memdisk_check, 0 },
+    { "image_list", ventoy_plugin_image_list_entry, ventoy_plugin_image_list_check, 0 },
+    { "image_blacklist", ventoy_plugin_image_list_entry, ventoy_plugin_image_list_check, 0 },
+    { "conf_replace", ventoy_plugin_conf_replace_entry, ventoy_plugin_conf_replace_check, 0 },
+    { "dud", ventoy_plugin_dud_entry, ventoy_plugin_dud_check, 0 },
+    { "password", ventoy_plugin_pwd_entry, ventoy_plugin_pwd_check, 0 },
+    { "custom_boot", ventoy_plugin_custom_boot_entry, ventoy_plugin_custom_boot_check, 0 },
 };

 static int ventoy_parse_plugin_config(VTOY_JSON *json, const char *isodisk)
 {
    int i;
    char key[128];
-    VTOY_JSON *cur = json;
+    VTOY_JSON *cur = NULL;

    grub_snprintf(g_iso_disk_name, sizeof(g_iso_disk_name), "%s", isodisk);

-    while (cur)
+    for (cur = json; cur; cur = cur->pstNext)
    {
        for (i = 0; i < (int)ARRAY_SIZE(g_plugin_entries); i++)
        {
            grub_snprintf(key, sizeof(key), "%s_%s", g_plugin_entries[i].key, g_arch_mode_suffix);
-            if (grub_strcmp(g_plugin_entries[i].key, cur->pcName) == 0 || grub_strcmp(key, cur->pcName) == 0)
+            if (g_plugin_entries[i].flag == 0 && grub_strcmp(key, cur->pcName) == 0)
            {
                debug("Plugin entry for %s\n", g_plugin_entries[i].key);
                g_plugin_entries[i].entryfunc(cur, isodisk);
+                g_plugin_entries[i].flag = 1;
                break;
            }
        }
+    }
+
    
-        cur = cur->pstNext;
+    for (cur = json; cur; cur = cur->pstNext)
+    {
+        for (i = 0; i < (int)ARRAY_SIZE(g_plugin_entries); i++)
+        {
+            if (g_plugin_entries[i].flag == 0 && grub_strcmp(g_plugin_entries[i].key, cur->pcName) == 0)
+            {
+                debug("Plugin entry for %s\n", g_plugin_entries[i].key);
+                g_plugin_entries[i].entryfunc(cur, isodisk);
+                g_plugin_entries[i].flag = 1;
+                break;
+            }
+        }
    }

    return 0;
@@ -3157,7 +3184,7 @@ grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, ch
    grub_snprintf(key, sizeof(key), "%s_%s", args[1], g_arch_mode_suffix);
    for (node = json->pstChild; node; node = node->pstNext)
    {
-        if (grub_strcmp(node->pcName, args[1]) == 0 || grub_strcmp(node->pcName, key) == 0)
+        if (grub_strcmp(node->pcName, key) == 0)
        {
            break;
        }
@@ -3165,8 +3192,19 @@ grub_err_t ventoy_cmd_plugin_check_json(grub_extcmd_context_t ctxt, int argc, ch

    if (!node)
    {
-        grub_printf("%s is NOT found in ventoy.json\n", args[1]);
-        goto end;
+        for (node = json->pstChild; node; node = node->pstNext)
+        {
+            if (grub_strcmp(node->pcName, args[1]) == 0)
+            {
+                break;
+            }
+        }
+
+        if (!node)
+        {
+            grub_printf("%s is NOT found in ventoy.json\n", args[1]);
+            goto end;            
+        }
    }

    for (i = 0; i < (int)ARRAY_SIZE(g_plugin_entries); i++)
--- a/GRUB2/MOD_SRC/grub-2.04/include/grub/ventoy.h
+++ b/GRUB2/MOD_SRC/grub-2.04/include/grub/ventoy.h
@@ -242,6 +242,7 @@ typedef struct ventoy_img_chunk_list
 #pragma pack(1)

 #define GRUB_FILE_REPLACE_MAGIC  0x1258BEEF
+#define GRUB_IMG_REPLACE_MAGIC   0x1259BEEF

 typedef const char * (*grub_env_get_pf)(const char *name);
 typedef int (*grub_env_set_pf)(const char *name, const char *val);
@@ -260,6 +261,7 @@ typedef struct ventoy_grub_param
    grub_env_get_pf grub_env_get;
    grub_env_set_pf grub_env_set;
    ventoy_grub_param_file_replace file_replace;
+    ventoy_grub_param_file_replace img_replace;
    grub_env_printf_pf grub_env_printf;
 }ventoy_grub_param;

--- a/IMG/cpio/ventoy/hook/debian/pyabr-disk.sh
+++ b/IMG/cpio/ventoy/hook/debian/pyabr-disk.sh
@@ -47,8 +47,29 @@ ventoy_os_install_dmsetup_by_fuse() {
    umount $VTOY_PATH/mnt/fuse
 }

-
-wait_for_usb_disk_ready
+while [ -n "Y" ]; do
+    vtdiskname=$(get_ventoy_disk_name)
+    if [ "$vtdiskname" = "unknown" ]; then
+        vtlog "ventoy disk not found"
+        if [ -r /proc/sys/kernel/hotplug ]; then
+            echo /sbin/mdev > /proc/sys/kernel/hotplug
+        fi
+        mdev -s
+        sleep 1
+    else
+        if check_usb_disk_ready "$vtdiskname"; then
+            vtlog "check_usb_disk_ready $vtdiskname ok"
+            break
+        else
+            vtlog "check_usb_disk_ready $vtdiskname error"
+            if [ -r /proc/sys/kernel/hotplug ]; then
+                echo /sbin/mdev > /proc/sys/kernel/hotplug
+            fi
+            mdev -s
+            sleep 1
+        fi
+    fi
+done

 vtdiskname=$(get_ventoy_disk_name)
 if [ "$vtdiskname" = "unknown" ]; then
--- a/INSTALL/FOR_X64_ARM.txt
+++ b/INSTALL/FOR_X64_ARM.txt
@@ -0,0 +1,12 @@
+============ Ventoy2Disk.exe for x86_64/ARM/ARM64 =================
+Ventoy2Disk.exe is a x86_32 application and supports both 32-bit and 64-bit Windows PC with intel/amd processor.
+Since 1.0.58, Ventoy also provides Ventoy2Disk_X64.exe/Ventoy2Disk_ARM.exe/Ventoy2Disk_ARM64.exe you can use them if needed.
+These exe files are in altexe directory of the installation package.
+You must copy them to the upper directory to use them. (The same location with Ventoy2Disk.exe)
+
+
+============ x86_64/ARM/ARM64 版本 Ventoy2Disk.exe =================
+默认的 Ventoy2Disk.exe 是32位x86程序，同时支持最常见的32位和64位Windows系统，绝大部分情况下使用它就可以。
+从1.0.58版本开始，Ventoy还同时提供了 Ventoy2Disk_X64.exe/Ventoy2Disk_ARM.exe/Ventoy2Disk_ARM64.exe 可以根据需要使用。
+这些文件位于安装包内的altexe目录下，使用时需要将其拷贝到上一层目录（即和 Ventoy2Disk.exe 同一位置）。
+
--- a/INSTALL/Ventoy2Disk.exe
+++ b/INSTALL/Ventoy2Disk.exe
--- a/INSTALL/Ventoy2Disk_ARM.exe
+++ b/INSTALL/Ventoy2Disk_ARM.exe
--- a/INSTALL/Ventoy2Disk_ARM64.exe
+++ b/INSTALL/Ventoy2Disk_ARM64.exe
--- a/INSTALL/Ventoy2Disk_X64.exe
+++ b/INSTALL/Ventoy2Disk_X64.exe
--- a/INSTALL/grub/checksum.cfg
+++ b/INSTALL/grub/checksum.cfg
@@ -1,30 +1,116 @@
-menuentry "Calculate md5sum" --class=checksum_md5 {
-    md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-    
-    echo -e "\n\npress ENTER to exit ..."
-    read vtInputKey
-}

-menuentry "Calculate sha1sum" --class=checksum_sha1 {
-    sha1sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-    
-    echo -e "\n\npress ENTER to exit ..."
-    read vtInputKey
-}
+if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.md5" ]; then
+    set default=0
+    menuentry "Calculate and check md5sum" --class=checksum_md5 {
+        md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.md5" vtReadChecksum
+                
+        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
+            echo -e "\n\nCheck MD5 value with .md5 file.  [ OK ]"
+        else
+            echo -e "\n\nCheck MD5 value with .md5 file.  [ FAIL ]"
+            echo "The MD5 value in .md5 file is:"
+            echo "$vtReadChecksum"
+        fi
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+else
+    menuentry "Calculate md5sum" --class=checksum_md5 {
+        md5sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+fi

-menuentry "Calculate sha256sum" --class=checksum_sha256 {
-    sha256sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-    
-    echo -e "\n\npress ENTER to exit ..."
-    read vtInputKey
-}
+if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha1" ]; then
+    set default=1
+    menuentry "Calculate and check sha1sum" --class=checksum_sha1 {
+        sha1sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha1" vtReadChecksum
+        
+        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
+            echo -e "\n\nCheck SHA1 value with .sha1 file.  [ OK ]"
+        else
+            echo -e "\n\nCheck SHA1 value with .sha1 file.  [ FAIL ]"
+            echo "The SHA1 value in .sha1 file is:"
+            echo "$vtReadChecksum"
+        fi
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+else
+    menuentry "Calculate sha1sum" --class=checksum_sha1 {
+        sha1sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+fi
+
+
+
+if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha256" ]; then
+    set default=2
+    menuentry "Calculate and check sha256sum" --class=checksum_sha256 {
+        sha256sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha256" vtReadChecksum
+        
+        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
+            echo -e "\n\nCheck SHA256 value with .sha256 file.  [ OK ]"
+        else
+            echo -e "\n\nCheck SHA256 value with .sha256 file.  [ FAIL ]"
+            echo "The SHA256 value in .sha256 file is:"
+            echo "$vtReadChecksum"
+        fi
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+else
+    menuentry "Calculate sha256sum" --class=checksum_sha256 {
+        sha256sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+fi
+
+
+
+if [ -e "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha512" ]; then
+    set default=3
+    menuentry "Calculate and check sha512sum" --class=checksum_sha512{
+        sha512sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        vt_1st_line "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}.sha512" vtReadChecksum
+        
+        if vt_str_casebegin "$vtReadChecksum" "$VT_LAST_CHECK_SUM"; then
+            echo -e "\n\nCheck SHA512 value with .sha512 file.  [ OK ]"
+        else
+            echo -e "\n\nCheck SHA512 value with .sha512 file.  [ FAIL ]"
+            echo "The SHA512 value in .sha512 file is:"
+            echo "$vtReadChecksum"
+        fi
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+else
+    menuentry "Calculate sha512sum" --class=checksum_sha512{
+        sha512sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
+        
+        echo -e "\n\npress ENTER to exit ..."
+        read vtInputKey
+    }
+fi

-menuentry "Calculate sha512sum" --class=checksum_sha512{
-    sha512sum "${vtoy_iso_part}${VTOY_CHKSUM_FILE_PATH}"
-    
-    echo -e "\n\npress ENTER to exit ..."
-    read vtInputKey
-}

 menuentry 'Return to previous menu [Esc]' --class=vtoyret VTOY_RET {
    echo 'Return ...'
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -355,6 +355,8 @@ function distro_specify_initrd_file_phase2 {
        vt_linux_specify_initrd_file /porteus/initrd.xz
    elif [ -f (loop)/pyabr/boot/initrfs.img ]; then
        vt_linux_specify_initrd_file /pyabr/boot/initrfs.img
+    elif [ -f (loop)/initrd0.img ]; then
+        vt_linux_specify_initrd_file /initrd0.img
    
    fi
 }
@@ -1015,14 +1017,13 @@ function legacy_linux_menu_func {
            loopback loop "$1$2"
        fi

-        if [ -f (loop)/isolinux/isolinux.cfg ]; then
-            if vt_iso9660_isjoliet; then
-                vt_iso9660_nojoliet 1
-                loopback -d loop
-                loopback loop "$1$2"
-            fi
+        
+        if vt_syslinux_need_nojoliet "$1$2"; then
+            vt_iso9660_nojoliet 1
+            loopback -d loop
+            loopback loop "$1$2"
        fi
-    
+
        vt_load_cpio  $vtoy_path  "$2" "$1" "busybox=$ventoy_busybox_ver"

        vt_linux_clear_initrd
@@ -2009,7 +2010,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################

-set VENTOY_VERSION="1.0.56"
+set VENTOY_VERSION="1.0.58"

 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -2123,10 +2124,10 @@ fi

 if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
    set VTOY_F3_CMD="vt_dynamic_menu 1 1"
-    set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:TreeView F4:Localboot F5:Tools F6:ExMenu Ctrl+h:Help"
+    set VTOY_HOTKEY_TIP="h:Help  F1:Memdisk  F2:Power  F3:TreeView  F4:Localboot  F5:Tools  F6:ExMenu"
 else
    set VTOY_F3_CMD="vt_dynamic_menu 1 0"
-    set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:ListView F4:Localboot F5:Tools F6:ExMenu Ctrl+h:Help"
+    set VTOY_HOTKEY_TIP="h:Help  F1:Memdisk  F2:Power  F3:ListView  F4:Localboot  F5:Tools  F6:ExMenu"
 fi


--- a/INSTALL/grub/help/en_US.txt
+++ b/INSTALL/grub/help/en_US.txt
@@ -1,4 +1,4 @@
-Ctrl+h - Display this help information
+ h - Display this help information
 F1 - Memdisk Mode (Only for small WinPE/LiveCD ISO/IMG)
 F2 - Reboot/Power off
 F3 - Switch menu mode between Treeview <-> ListView
@@ -7,10 +7,12 @@ F5 - Utilities
 F6 - Load Custom Grub2 Menu
 F7 - Switch between GUI Mode <-> TEXT Mode

-Ctrl+m - Checksum image files (md5/sha1/sha256/sha512)
+m - Checksum image files (md5/sha1/sha256/sha512)
 Ctrl+w - WIMBOOT Mode (Only for standard Windows ISO)
 Ctrl+r - Grub2 Mode (Only for some Linux distros)
-Ctrl+i - Compatible Mode (Just only for test)
+Ctrl+i - Compatible Mode (Just only for debug)
+Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
+


 Press ESC to return ......
--- a/INSTALL/grub/help/fr_FR.txt
+++ b/INSTALL/grub/help/fr_FR.txt
@@ -0,0 +1,16 @@
+ h - Afficher cette aide
+F1 - Mode Memdisk (Seulement pour WinPE/LiveCD ISO/IMG)
+F2 - Redémarrer/arrêter
+F3 - Basculer l'affichage 'Vue en arbre' <-> 'Vue en liste'
+F4 - Démarrer le système Windows/Linux local
+F5 - Utilitaires
+F6 - Charger le menu Grub2 personnalisé
+F7 - Basculer entre le mode graphique <-> mode texte
+
+m - Somme de contrôle des images (md5/sha1/sha256/sha512)
+Ctrl+w - Mode WIMBOOT (seulement pour les images standards Windows)
+Ctrl+r - Mode Grub2 (seulement pour quelques Linux)
+Ctrl+i - Mode Compatible (seulement à fins de tests)
+Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
+
+Appuyer sur Echap pour sortir ......
--- a/INSTALL/grub/help/hr_HR.txt
+++ b/INSTALL/grub/help/hr_HR.txt
@@ -0,0 +1,17 @@
+ h - Prikazuje ove informacije
+F1 - Memdisk način rada (samo za male WinPE/LiveCD imidž fajlove)
+F2 - Ponovno pokretanje/isključivanje
+F3 - Mijenja meni između TreeView <-> ListView
+F4 - Pokreće Windows/Linux na lokalnom disku
+F5 - Postavke
+F6 - Učitava prilagođen GRUB2 meni
+F7 - Mijenja između GUI načina rada <-> TEXT načina rada
+
+m - Generira kontrolnu sumu odabranog imidž fajla (md5/sha1/sha256/sha512)
+Ctrl + w - WIMBOOT način rada (samo za standardne Windows imidž fajlove)
+Ctrl + r - GRUB2 način rada (samo za neke Linux distribucije)
+Ctrl + i - Kompatibilni način rada (samo za testiranje)
+Ctrl + u - Load ISO efi driver (Just only for debug, can not be used officially)
+
+
+Pritisnite ESC za povratak...
--- a/INSTALL/grub/help/id_ID.txt
+++ b/INSTALL/grub/help/id_ID.txt
@@ -0,0 +1,18 @@
+ h - Tampilkan bantuan informasi ini
+F1 - Mode Memdisk (Hanya untuk ukuran WinPE/LiveCD ISO/IMG yang kecil)
+F2 - Mulai ulang/Matikan
+F3 - Beralih mode menu antara Treeview <-> ListView
+F4 - Jalankan (boot) Windows/Linux pada disk lokal
+F5 - Alat Utilitas
+F6 - Memuat ubah suai Grub2 Menu
+F7 - Beralih antara mode GUI <-> Mode TEXT
+
+m - Periksa berkas files (md5/sha1/sha256/sha512)
+Ctrl+w - Mode WIMBOOT (Hanya untuk berkas ISO Windows standar)
+Ctrl+r - Mode Grub2 (Hanya untuk distro Linux tertentu)
+Ctrl+i - Mode Kompatibel/Compatible (Hanya untuk debug saja)
+Ctrl+u - Memuat ISO efi driver (Hanya untuk debug saja, tidak dapat dipakai secara umum)
+
+
+
+Tekan ESC untuk kembali ......
--- a/INSTALL/grub/help/pt_PT.txt
+++ b/INSTALL/grub/help/pt_PT.txt
@@ -0,0 +1,17 @@
+ h - Mostra esta informação de ajuda
+F1 - Modo Memdisk (Apenas para pequenos WinPE/LiveCD ISO/IMG)
+F2 - Reiniciar/Desligar
+F3 - Alternar o modo menu entre Vista de árvore <-> Vista de lista
+F4 - Arrancar o Windows/Linux em disco local
+F5 - Utilitários
+F6 - Carregar menu Grub2 personalizado
+F7 - Alternar entre Modo GUI <-> Modo TEXTO
+
+m - Checksum ficheiros de imagem (md5/sha1/sha256/sha512)
+Ctrl+w - Modo WIMBOOT (Apenas para Windows ISO padrão)
+Ctrl+r - Modo Grub2 (Apenas para algumas distros Linux)
+Ctrl+i - Modo Compatível (Apenas para depuração)
+Ctrl+u - Carregar o controlador ISO efi (Apenas para depuração, não pode ser utilizado oficialmente)
+
+
+Prima ESC para voltar ......
--- a/INSTALL/grub/help/sr_CY.txt
+++ b/INSTALL/grub/help/sr_CY.txt
@@ -0,0 +1,17 @@
+ h - Приказује ове информације
+F1 - Memdisk начин рада (само за мале WinPE/LiveCD имиџ фајлове)
+F2 - Поновно покретање/искључивање
+F3 - Мијења мени између TreeView <-> ListView
+F4 - Покреће Windows/Linux на локалном диску
+F5 - Поставке
+F6 - Учитава прилагођен GRUB2 мени
+F7 - Мијења између GUI начина рада <-> TEXT начина рада
+
+m - Генерира контролну суму одабраног имиџ фајла (md5/sha1/sha256/sha512)
+Ctrl + w - WIMBOOT начин рада (само за стандардне Windows имиџ фајлове)
+Ctrl + r - GRUB2 начин рада (само за неке Linux дистрибуције)
+Ctrl + i - Компатибилни начин рада (само за тестиранје)
+Ctrl + u - Load ISO efi driver (Just only for debug, can not be used officially)
+
+
+Притисните ESC за повратак...
--- a/INSTALL/grub/help/sr_SR.txt
+++ b/INSTALL/grub/help/sr_SR.txt
@@ -0,0 +1,17 @@
+ h - Prikazuje ove informacije
+F1 - Memdisk način rada (samo za male WinPE/LiveCD imidž fajlove)
+F2 - Ponovno pokretanje/isključivanje
+F3 - Mijenja meni između TreeView <-> ListView
+F4 - Pokreće Windows/Linux na lokalnom disku
+F5 - Postavke
+F6 - Učitava prilagođen GRUB2 meni
+F7 - Mijenja između GUI načina rada <-> TEXT načina rada
+
+m - Generira kontrolnu sumu odabranog imidž fajla (md5/sha1/sha256/sha512)
+Ctrl + w - WIMBOOT način rada (samo za standardne Windows imidž fajlove)
+Ctrl + r - GRUB2 način rada (samo za neke Linux distribucije)
+Ctrl + i - Kompatibilni način rada (samo za testiranje)
+Ctrl+u - Load ISO efi driver (Just only for debug, can not be used officially)
+
+
+Pritisnite ESC za povratak...
--- a/INSTALL/grub/help/tr_TR.txt
+++ b/INSTALL/grub/help/tr_TR.txt
@@ -1,4 +1,4 @@
-Ctrl+h - Yardım bilgilerini göster
+ h - Yardım bilgilerini göster
 F1 - Memdisk Modu başlatır(Yalnızca küçük WinPE/LiveCD ISO/IMG ler için bu modu kullanabilirsiniz)
 F2 - Bilgisayarı Yeniden Başlat/Kapat
 F3 - Ventoy Menü modu olarak,Klasör görünümü(Treeview) ile Liste görünümü(ListView) arasında geçiş yapmayı sağlar.
@@ -7,10 +7,11 @@ F5 - Ventoy Araçlar menüsü
 F6 - Özelleştirilmiş Grub2 menüsünü yükler
 F7 - Grafik Modu(GUI Mode) ile Metin Modu(Text Mode) arasında geçiş yapmayı sağlar

-Ctrl+m - İndirilen imaj dosyalarının hatasız indirildiğini teyit etmek için "md5/sha1/sha256/sha512" değerlerini kontrol etmeyi sağlar
+m - İndirilen imaj dosyalarının hatasız indirildiğini teyit etmek için "md5/sha1/sha256/sha512" değerlerini kontrol etmeyi sağlar
 Ctrl+w - WIMBOOT Modu çalıştırmayı sağlar(Sadece normal Windows ISO ları için)
 Ctrl+r - Grub2 Modu çalıştırmayı sağlar (Sadece bazı Linux dağıtımları için)
-Ctrl+i - Uyumluluk Modu'nu (Compatible Mode) çalıştırmayı sağlar (Sadece bazı çalışmayan ISO ları test etmek için bu modu kullanabilirsiniz)
+Ctrl+i - Uyumluluk Modu'nu (Compatible Mode) çalıştırmayı sağlar (Sadece hata ayıklama için bu modu kullanabilirsiniz)
+Ctrl+u - ISO efi sürücüsünü yükler(Sadece hata ayıklama için bu mod kullanılabilir, resmi olarak kullanılamaz)


 Geriye dönmek için ESC tuşuna basınız......
--- a/INSTALL/grub/help/zh_CN.txt
+++ b/INSTALL/grub/help/zh_CN.txt
@@ -1,4 +1,4 @@
-Ctrl+h - 显示本帮助信息
+ h - 显示本帮助信息
 F1 - 把文件加载到内存启动（只适用于文件很小的 WinPE/LiveCD等）
 F2 - 电源操作 （重启、关机）
 F3 - 菜单显示模式切换。可在列表模式和目录模式之间自由切换。
@@ -7,9 +7,11 @@ F5 - 各类工具
 F6 - 加载自定义 GRUB2 菜单。
 F7 - 界面在文本模式和图形模式之间切换。

-Ctrl+m - 计算文件校验值（md5/sha1/sha256/sha512）
+m - 计算文件校验值（md5/sha1/sha256/sha512）
 Ctrl+w - WIMBOOT 模式 （只适用于标准的 Windows ISO文件）
 Ctrl+r - Grub2 模式 （只适用于常见的一些 Linux 系统ISO文件）
 Ctrl+i - 兼容模式 （只用作调试目的，不能正式使用）
+Ctrl+u - 加载 ISO efi 驱动（只用作调试目的，不能正式使用）
+

 按 ESC 键返回 ......
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -72,6 +72,13 @@ ls -1 ./grub/ | grep -v 'grub\.cfg' | while read line; do
    cp $OPT ./grub/$line $tmpmnt/grub/
 done

+#tar help txt
+cd $tmpmnt/grub/
+tar czf help.tar.gz ./help/
+rm -rf ./help
+cd ../../
+
+
 cp $OPT ./ventoy   $tmpmnt/
 cp $OPT ./EFI   $tmpmnt/
 cp $OPT ./tool/ENROLL_THIS_KEY_IN_MOKMANAGER.cer $tmpmnt/
@@ -165,7 +172,14 @@ tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir


 rm -f ventoy-${curver}-windows.zip
-cp $OPT Ventoy2Disk*.exe $tmpdir/
+
+cp $OPT Ventoy2Disk.exe $tmpdir/
+cp $OPT FOR_X64_ARM.txt $tmpdir/
+mkdir -p $tmpdir/altexe
+cp $OPT Ventoy2Disk_*.exe $tmpdir/altexe/
+
+
+
 cp $OPT $LANG_DIR/languages.json $tmpdir/ventoy/
 rm -rf $tmpdir/tool
 rm -f $tmpdir/*.sh
--- a/LANGUAGES/languages.json
+++ b/LANGUAGES/languages.json
@@ -1584,13 +1584,13 @@
        "name":"Portuguese (Português de Portugal)",
        "FontFamily":"Courier New",
        "FontSize":16,
-        "Author":"Eskiso",
+        "Author":"Eskiso, Hugo Carvalho",
        
        "STR_ERROR":"Erro",
        "STR_WARNING":"Aviso",
        "STR_INFO":"Info",
-        "STR_INCORRECT_DIR":"Por favor, execute na pasta correta!",
-        "STR_INCORRECT_TREE_DIR":"Não me execute aqui, por favor transfira o pacote de instalação, e execute lá.",
+        "STR_INCORRECT_DIR":"Execute na pasta correta!",
+        "STR_INCORRECT_TREE_DIR":"Não me execute aqui, transfira o pacote de instalação e execute lá.",
        "STR_DEVICE":"Dispositivo",
        "STR_LOCAL_VER":"Ventoy em pacote",
        "STR_DISK_VER":"Ventoy no dispositivo",
@@ -1601,34 +1601,34 @@
        "STR_INSTALL_TIP":"O disco será formatado e todos os dados serão perdidos.#@Continuar?",
        "STR_INSTALL_TIP2":"O disco será formatado e todos os dados serão perdidos.#@Continuar? (Confirmação)",
        "STR_INSTALL_SUCCESS":"Parabéns!#@Ventoy foi instalado com sucesso no dispositivo.",
-        "STR_INSTALL_FAILED":"Um erro ocorreu durante a instalação. Pode reconectar o dispositivo USB e tentar novamente. Verifique o ficheiro log.txt para mais detalhes.",
+        "STR_INSTALL_FAILED":"Ocorreu um erro durante a instalação. Pode voltar a ligar o dispositivo USB e tentar novamente. Verifique o ficheiro log.txt para mais detalhes.",
        "STR_UPDATE_SUCCESS":"Parabéns!#@Ventoy foi atualizado com sucesso no dispositivo.",
-        "STR_UPDATE_FAILED":"Um erro ocorreu durante a atualização. Pode reconectar o dispositivo USB e tentar novamente. Verifique o ficheiro log.txt para mais detalhes.",
-        "STR_WAIT_PROCESS":"Uma thread está em execução, por favor espere...",
+        "STR_UPDATE_FAILED":"Ocorreu um erro durante a atualização. Pode voltar a ligar o dispositivo USB e tentar novamente. Verifique o ficheiro log.txt para mais detalhes.",
+        "STR_WAIT_PROCESS":"Uma thread está em execução, aguarde...",
        "STR_MENU_OPTION":"Opção",
-        "STR_MENU_SECURE_BOOT":"Boot seguro",
-        "STR_MENU_PART_CFG":"Configuração da Partição",
-        "STR_BTN_OK":"OK",
+        "STR_MENU_SECURE_BOOT":"Arranque seguro",
+        "STR_MENU_PART_CFG":"Configuração da partição",
+        "STR_BTN_OK":"Aceitar",
        "STR_BTN_CANCEL":"Cancelar",
-        "STR_PRESERVE_SPACE":"Preservar algum espaço no final do disco",
-        "STR_SPACE_VAL_INVALID":"Valor invalido para o espaço reservado",
+        "STR_PRESERVE_SPACE":"Reservar algum espaço no final do disco",
+        "STR_SPACE_VAL_INVALID":"Valor inválido para o espaço reservado",
        "STR_MENU_CLEAR":"Remover o Ventoy",
        "STR_CLEAR_SUCCESS":"O Ventoy foi removido deste dispositivo com sucesso.",
-        "STR_CLEAR_FAILED":"Um erro ocorreu ao remover o Ventoy do disco. Pode reconectar o dispositivo USB e tentar novamente. Verifique o ficheiro log.txt para mais detalhes.",
-        "STR_MENU_PART_STYLE":"Estilo de Partição",
-        "STR_DISK_2TB_MBR_ERROR":"Por favor selecione GPT para discos maiores que 2TB",
-        "STR_SHOW_ALL_DEV":"Show All Devices",
-        "STR_PART_ALIGN_4KB":"Align partitions with 4KB",
-        "STR_WEB_COMMUNICATION_ERR":"Communication error:",
-        "STR_WEB_REMOTE_ABNORMAL":"Communication error: remote abnormal",
-        "STR_WEB_REQUEST_TIMEOUT":"Communication error: Request timed out",
-        "STR_WEB_SERVICE_UNAVAILABLE":"Communication error: Service Unavailable",
-        "STR_WEB_TOKEN_MISMATCH":"Daemon status updated, please retry later.",
-        "STR_WEB_SERVICE_BUSY":"Service is busy, please retry later.",
-        "STR_MENU_VTSI_CREATE":"Generate VTSI File",
-        "STR_VTSI_CREATE_TIP":"This time will not write to the device, but only generate a VTSI file#@Continue?",
-        "STR_VTSI_CREATE_SUCCESS":"VTSI file created successfully!#@You can use Rufus(3.15+) to write it to the device so as to complete the installation of Ventoy.",
-        "STR_VTSI_CREATE_FAILED":"VTSI file created failed.",
+        "STR_CLEAR_FAILED":"Um erro ocorreu ao remover o Ventoy do disco. Pode voltar a ligar o dispositivo USB e tentar novamente. Verifique o ficheiro log.txt para mais detalhes.",
+        "STR_MENU_PART_STYLE":"Estilo de partição",
+        "STR_DISK_2TB_MBR_ERROR":"Selecione GPT para discos maiores que 2TB",
+        "STR_SHOW_ALL_DEV":"Mostrar todos os dispositivos",
+        "STR_PART_ALIGN_4KB":"Alinhar as partições com 4KB",
+        "STR_WEB_COMMUNICATION_ERR":"Erro de comunicação:",
+        "STR_WEB_REMOTE_ABNORMAL":"Erro de comunicação: Anomalia remota",
+        "STR_WEB_REQUEST_TIMEOUT":"Erro de comunicação: Pedido de tempo limite",
+        "STR_WEB_SERVICE_UNAVAILABLE":"Erro de comunicação: Serviço indisponível",
+        "STR_WEB_TOKEN_MISMATCH":"Estado do daemon atualizado, tente novamente mais tarde.",
+        "STR_WEB_SERVICE_BUSY":"Serviço está ocupado, tente novamente mais tarde.",
+        "STR_MENU_VTSI_CREATE":"Gerar ficheiro VTSI",
+        "STR_VTSI_CREATE_TIP":"Desta vez não irá gravar no dispositivo, mas apenas gerar um ficheiro VTSI#@Continuar?",
+        "STR_VTSI_CREATE_SUCCESS":"Ficheiro VTSI criado com sucesso!#@Pode utilizar o Rufus(3.15+) para o gravar no dispositivo de modo a completar a instalação do Ventoy.",
+        "STR_VTSI_CREATE_FAILED":"Falha no ficheiro VTSI criado.",
        "STRXXX":""
    },
    {
@@ -1668,7 +1668,7 @@
        "STR_CLEAR_FAILED":"Terjadi kesalahan ketika penghapusan berlangsung. Anda perlu mencabut-pasang ulang USB dan coba lagi. Cek log.txt untuk detil.",
        "STR_MENU_PART_STYLE":"Gaya Partisi",
        "STR_DISK_2TB_MBR_ERROR":"Silakan pilih GPT untuk disk yang lebih dari 2TB",
-        "STR_SHOW_ALL_DEV":"Show All Devices",
+        "STR_SHOW_ALL_DEV":"Tampilkan semua perangkat",
        "STR_PART_ALIGN_4KB":"Meluruskan dengan partisi 4KB",
        "STR_WEB_COMMUNICATION_ERR":"Kesalahan komunikasi:",
        "STR_WEB_REMOTE_ABNORMAL":"Kesalahan komunikasi: tidak normalnya kendali",
@@ -1682,6 +1682,57 @@
        "STR_VTSI_CREATE_FAILED":"Berkas VTSI gagal dibuat.",
        "STRXXX":""
    },
+    {
+        "name":"Norwegian Bokmål (Norsk Bokmål)",
+        "FontFamily":"Courier New",
+        "FontSize":16,
+        "Author":"Allan Nordhøy",
+        
+        "STR_ERROR":"Feil",
+        "STR_WARNING":"Advarsel",
+        "STR_INFO":"Info",
+        "STR_INCORRECT_DIR":"Start programmet i rett mappe først.",
+        "STR_INCORRECT_TREE_DIR":"Ikke kjør meg her. Last ned utgitt installasjonspakke og kjør det der.",
+        "STR_DEVICE":"Enhet",
+        "STR_LOCAL_VER":"Ventoy i pakke",
+        "STR_DISK_VER":"Ventoy i enhet",
+        "STR_STATUS":"Status — Klar",
+        "STR_INSTALL":"Installer",
+        "STR_UPDATE":"Updater",
+        "STR_UPDATE_TIP":"Oppgradering er trygt. ISO-filer vil forbli uendret.#@Fortsett?",
+        "STR_INSTALL_TIP":"Enheten vil bli formatert og all data på den vil gå tapt.#@Fortsett?",
+        "STR_INSTALL_TIP2":"Enheten vil bli formatert og all data på den vil gå tapt.#@Fortsett? (Dobbeltsjekk)",
+        "STR_INSTALL_SUCCESS":"Gratulerer!#@Ventoy har blitt installert på enheten.",
+        "STR_INSTALL_FAILED":"Noe gikk galt under installasjonen. Du kan plugge ut og inn USB-enheten og prøve igjen. Sjekk log.txt for detaljer. Hvis feilen vedvarer kan du sjekke O-S-S på nettsiden.",
+        "STR_UPDATE_SUCCESS":"Gratulerer!#@Ventoy har blitt installert på enheten.",
+        "STR_UPDATE_FAILED":"Noe gikk galt under oppdateringen. Du kan plugge ut og inn USB-enheten og prøve igjen. Sjekk log.txt for detaljer. Hvis feilen vedvarer kan du sjekke O-S-S på nettsiden.",
+        "STR_WAIT_PROCESS":"Vent mens en tråd kjører …",
+        "STR_MENU_OPTION":"Alternativ",
+        "STR_MENU_SECURE_BOOT":"Secure Boot-støtte",
+        "STR_MENU_PART_CFG":"Partisjonsoppsett",
+        "STR_BTN_OK":"OK",
+        "STR_BTN_CANCEL":"Avbryt",
+        "STR_PRESERVE_SPACE":"Hold av litt plass på slutten av disken",
+        "STR_SPACE_VAL_INVALID":"Ugyldig verdi for avholdt plass",
+        "STR_MENU_CLEAR":"Tøm Ventoy",
+        "STR_CLEAR_SUCCESS":"Ventoy har blitt fjernet fra enheten.",
+        "STR_CLEAR_FAILED":"Noe gikk galt ved fjerning av Ventoy fra disken. Du kan plugge ut og inn USB-enheten og prøve igjen. Sjekk log.txt for detaljer.",
+        "STR_MENU_PART_STYLE":"Partisjonsstil",
+        "STR_DISK_2TB_MBR_ERROR":"Velg «GPT» for enheter over 2 TB",
+        "STR_SHOW_ALL_DEV":"Vis alle enheter",
+        "STR_PART_ALIGN_4KB":"Juster partisjoner til 4 KB",
+        "STR_WEB_COMMUNICATION_ERR":"Kommunikasjonsfeil:",
+        "STR_WEB_REMOTE_ABNORMAL":"Kommunikasjonsfeil: Noe er galt annensteds hen",
+        "STR_WEB_REQUEST_TIMEOUT":"Kommunikasjonsfeil: Tidsavbrudd for forespørsel",
+        "STR_WEB_SERVICE_UNAVAILABLE":"Kommunikasjonsfeil: Utilgjengelig tjeneste",
+        "STR_WEB_TOKEN_MISMATCH":"Nisse-status oppdatert. Prøv igjen senere.",
+        "STR_WEB_SERVICE_BUSY":"Tjensten er opptatt. Prøv igjen senere.",
+        "STR_MENU_VTSI_CREATE":"Generer VTSI-fil",
+        "STR_VTSI_CREATE_TIP":"Dette vil ikke skrive til enheten, men kun generere en VTSIfil#@Fortsett?",
+        "STR_VTSI_CREATE_SUCCESS":"VTSI-fil opprettet.#@Du kan bruke Rufus(3.15+) til å skrive den til enheten for å fullføre installasjonen av Ventoy.",
+        "STR_VTSI_CREATE_FAILED":"Noe gikk galt under opprettelse av VTSI-fil.",
+        "STRXXX":""
+    },
    {
        "name":"Ukrainian (Українська)",
        "FontFamily":"Courier New",
--- a/README.md
+++ b/README.md
@@ -16,19 +16,19 @@ You can copy many image files at a time and ventoy will give you a boot menu to
 x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI, ARM64 UEFI and MIPS64EL UEFI are supported in the same way.<br/>
 Both MBR and GPT partition style are supported in the same way.<br/>
 Most type of OS supported(Windows/WinPE/Linux/Unix/ChromeOS/Vmware/Xen...) <br/>
-  760+ ISO files are tested (<a href="https://www.ventoy.net/en/isolist.html">List</a>). 90%+ distros in <a href="https://distrowatch.com/">distrowatch.com</a> supported (<a href="https://www.ventoy.net/en/distrowatch.html">Details</a>). <br/>
+  770+ ISO files are tested (<a href="https://www.ventoy.net/en/isolist.html">List</a>). 90%+ distros in <a href="https://distrowatch.com/">distrowatch.com</a> supported (<a href="https://www.ventoy.net/en/distrowatch.html">Details</a>). <br/>
 <br/>Official Website: <a href=https://www.ventoy.net>https://www.ventoy.net</a>
 </h4>

 # Tested OS
 **Windows**  
-Windows 7, Windows 8, Windows 8.1, Windows 10, Windows Server 2012, Windows Server 2012 R2, Windows Server 2016, Windows Server 2019, WinPE
+Windows 7, Windows 8, Windows 8.1, Windows 10, Windows 11, Windows Server 2012, Windows Server 2012 R2, Windows Server 2016, Windows Server 2019, Windows Server 2022, WinPE

 **Linux**  
-Debian, Ubuntu, CentOS, RHEL, Deepin, Fedora, Rocky Linux, SLES, openSUSE, MX Linux, Manjaro, Linux Mint, Endless OS, openEuler, Elementary OS, Solus, Linx, Zorin, antiX, PClinuxOS, Arch, ArcoLinux, ArchLabs, BackArch, Obarun, Artix Linux, Puppy Linux, Tails, Slax, Kali, Mageia, Slackware, Q4OS, Archman, Gentoo, Pentoo, NixOS, Ubuntu Kylin, Lubuntu, Xubuntu, Kubuntu, Ubuntu MATE, Ubuntu Budgie, Ubuntu Studio, Bluestar, OpenMandriva, ExTiX, Netrunner, ALT Linux, Nitrux, Peppermint, KDE neon, Linux Lite, Parrot OS, Qubes, Pop OS, ROSA, Void Linux, Star Linux, EndeavourOS, MakuluLinux, Voyager, Feren, ArchBang, LXLE, Knoppix, Robolinux, Calculate Linux, Clear Linux, Pure OS, Oracle Linux, Trident, Septor, Porteus, Devuan, GoboLinux, 4MLinux, Simplicity Linux, Zeroshell, Android-x86, netboot.xyz, Slitaz, SuperGrub2Disk, Proxmox VE, Kaspersky Rescue, SystemRescueCD, MemTest86, MiniTool Partition Wizard, Parted Magic, veket, Sabayon, Scientific, alpine, ClearOS, CloneZilla, Berry Linux, Trisquel, Ataraxia Linux, Minimal Linux Live, BackBox Linux, Emmabuntüs, ESET SysRescue Live,Nova Linux, AV Linux, RoboLinux, NuTyX, IPFire, SELKS, ZStack, Enso Linux, Security Onion, Network Security Toolkit, Absolute Linux, TinyCore, Springdale Linux, Frost Linux, Shark Linux, LinuxFX, Snail Linux, Astra Linux, Namib Linux, Resilient Linux, Virage Linux, Blackweb Security OS, R-DriveImage, O-O.DiskImage, Macrium, ToOpPy LINUX, GNU Guix, YunoHost, foxclone, siduction, Adelie Linux, Elive, Pardus, CDlinux, AcademiX, Austrumi, Zenwalk, Anarchy, DuZeru, BigLinux, OpenMediaVault, Ubuntu DP, Exe GNU/Linux, 3CX Phone System, KANOTIX, Grml, Karoshi, PrimTux, ArchStrike, CAELinux, Refracta, Cucumber, Fatdog, ForLEx, Hanthana, Kwort, MiniNo, Redcore, Runtu, Asianux, Clu Linux Live, Uruk, OB2D, BlueOnyx, Finnix, HamoniKR, Parabola, LinHES, LinuxConsole, BEE free, Untangle, Pearl, Thinstation, TurnKey, tuxtrans, Neptune, HefftorLinux, GeckoLinux, Mabox Linux, Zentyal, Maui, Reborn OS, SereneLinux , SkyWave Linux, Kaisen Linux, Regata OS, TROM-Jaro, DRBL Linux, Chalet OS, Chapeau, Desa OS, BlankOn, OpenMamba, Frugalware, Kibojoe Linux, Revenge OS, Tsurugi Linux, Drauger OS, Hash Linux, gNewSense, Ikki Boot, SteamOS, Hyperbola, VyOS, EasyNAS, SuperGamer, Live Raizo, Swift Linux, RebeccaBlackOS, Daphile, CRUX, Univention, Ufficio Zero, Rescuezilla, Phoenix OS, Garuda Linux, Mll, NethServer, OSGeoLive, Easy OS, Volumio, FreedomBox, paldo, UBOS, Recalbox, batocera, Lakka, LibreELEC, Pardus Topluluk, Pinguy, KolibriOS, Elastix, Arya, Omoikane, Omarine, Endian Firewall, Hamara, Rocks Cluster, MorpheusArch, Redo, Slackel, SME Server, APODIO, Smoothwall, Dragora, Linspire, Secure-K OS, Peach OSI, Photon, Plamo, SuperX, Bicom, Ploplinux, HP SPP, LliureX, Freespire, DietPi, BOSS, Webconverger, Lunar, TENS, Source Mage, RancherOS, T2, Vine, Pisi, blackPanther, mAid, Acronis, Active.Boot, AOMEI, Boot.Repair, CAINE, DaRT, EasyUEFI, R-Drive, PrimeOS, Avira Rescue System, bitdefender, Checkra1n Linux, Lenovo Diagnostics, Clover, Bliss-OS, Lenovo BIOS Update, Arcabit Rescue Disk, MiyoLinux, TeLOS, Kerio Control, RED OS, OpenWrt, MocaccinoOS, EasyStartup, ......
+Debian, Ubuntu, CentOS, RHEL, Deepin, Fedora, Rocky Linux, SLES, openSUSE, MX Linux, Manjaro, Linux Mint, Endless OS, openEuler, Elementary OS, Solus, Linx, Zorin, antiX, PClinuxOS, Arch, ArcoLinux, ArchLabs, BackArch, Obarun, Artix Linux, Puppy Linux, Tails, Slax, Kali, Mageia, Slackware, Q4OS, Archman, Gentoo, Pentoo, NixOS, Ubuntu Kylin, Lubuntu, Xubuntu, Kubuntu, Ubuntu MATE, Ubuntu Budgie, Ubuntu Studio, Bluestar, OpenMandriva, ExTiX, Netrunner, ALT Linux, Nitrux, Peppermint, KDE neon, Linux Lite, Parrot OS, Qubes, Pop OS, ROSA, Void Linux, Star Linux, EndeavourOS, MakuluLinux, Voyager, Feren, ArchBang, LXLE, Knoppix, Robolinux, Calculate Linux, Clear Linux, Pure OS, Oracle Linux, Trident, Septor, Porteus, Devuan, GoboLinux, 4MLinux, Simplicity Linux, Zeroshell, Android-x86, netboot.xyz, Slitaz, SuperGrub2Disk, Proxmox VE, Kaspersky Rescue, SystemRescueCD, MemTest86, MiniTool Partition Wizard, Parted Magic, veket, Sabayon, Scientific, alpine, ClearOS, CloneZilla, Berry Linux, Trisquel, Ataraxia Linux, Minimal Linux Live, BackBox Linux, Emmabuntüs, ESET SysRescue Live,Nova Linux, AV Linux, RoboLinux, NuTyX, IPFire, SELKS, ZStack, Enso Linux, Security Onion, Network Security Toolkit, Absolute Linux, TinyCore, Springdale Linux, Frost Linux, Shark Linux, LinuxFX, Snail Linux, Astra Linux, Namib Linux, Resilient Linux, Virage Linux, Blackweb Security OS, R-DriveImage, O-O.DiskImage, Macrium, ToOpPy LINUX, GNU Guix, YunoHost, foxclone, siduction, Adelie Linux, Elive, Pardus, CDlinux, AcademiX, Austrumi, Zenwalk, Anarchy, DuZeru, BigLinux, OpenMediaVault, Ubuntu DP, Exe GNU/Linux, 3CX Phone System, KANOTIX, Grml, Karoshi, PrimTux, ArchStrike, CAELinux, Refracta, Cucumber, Fatdog, ForLEx, Hanthana, Kwort, MiniNo, Redcore, Runtu, Asianux, Clu Linux Live, Uruk, OB2D, BlueOnyx, Finnix, HamoniKR, Parabola, LinHES, LinuxConsole, BEE free, Untangle, Pearl, Thinstation, TurnKey, tuxtrans, Neptune, HefftorLinux, GeckoLinux, Mabox Linux, Zentyal, Maui, Reborn OS, SereneLinux , SkyWave Linux, Kaisen Linux, Regata OS, TROM-Jaro, DRBL Linux, Chalet OS, Chapeau, Desa OS, BlankOn, OpenMamba, Frugalware, Kibojoe Linux, Revenge OS, Tsurugi Linux, Drauger OS, Hash Linux, gNewSense, Ikki Boot, SteamOS, Hyperbola, VyOS, EasyNAS, SuperGamer, Live Raizo, Swift Linux, RebeccaBlackOS, Daphile, CRUX, Univention, Ufficio Zero, Rescuezilla, Phoenix OS, Garuda Linux, Mll, NethServer, OSGeoLive, Easy OS, Volumio, FreedomBox, paldo, UBOS, Recalbox, batocera, Lakka, LibreELEC, Pardus Topluluk, Pinguy, KolibriOS, Elastix, Arya, Omoikane, Omarine, Endian Firewall, Hamara, Rocks Cluster, MorpheusArch, Redo, Slackel, SME Server, APODIO, Smoothwall, Dragora, Linspire, Secure-K OS, Peach OSI, Photon, Plamo, SuperX, Bicom, Ploplinux, HP SPP, LliureX, Freespire, DietPi, BOSS, Webconverger, Lunar, TENS, Source Mage, RancherOS, T2, Vine, Pisi, blackPanther, mAid, Acronis, Active.Boot, AOMEI, Boot.Repair, CAINE, DaRT, EasyUEFI, R-Drive, PrimeOS, Avira Rescue System, bitdefender, Checkra1n Linux, Lenovo Diagnostics, Clover, Bliss-OS, Lenovo BIOS Update, Arcabit Rescue Disk, MiyoLinux, TeLOS, Kerio Control, RED OS, OpenWrt, MocaccinoOS, EasyStartup, Pyabr, Refracta, Eset SysRescue, Linpack Xtreme, Archcraft, ......

 **Unix**  
-DragonFly FreeBSD pfSense GhostBSD FreeNAS TrueNAS XigmaNAS FuryBSD OPNsense HardenedBSD MidnightBSD ClonOS
+DragonFly FreeBSD pfSense GhostBSD FreeNAS TrueNAS XigmaNAS FuryBSD OPNsense HardenedBSD MidnightBSD ClonOS EmergencyBootKit

 **ChromeOS**  
 FydeOS, CloudReady
@@ -36,6 +36,10 @@ FydeOS, CloudReady
 **Other**  
 VMware ESXi, Citrix XenServer, Xen XCP-ng

+# Tested Image Report
+[【How to report a successfully tested image file】](https://github.com/ventoy/Ventoy/issues/1195)
+  
+  
 # Features
 * 100% open source
 * Simple to use
@@ -52,7 +56,7 @@ VMware ESXi, Citrix XenServer, Xen XCP-ng
 * FAT32/exFAT/NTFS/UDF/XFS/Ext2(3)(4) supported for main partition
 * ISO files larger than 4GB supported
 * Native boot menu style for Legacy & UEFI
-* Most type of OS supported, 760+ iso files tested
+* Most type of OS supported, 770+ iso files tested
 * Linux vDisk boot supported
 * Not only boot but also complete installation process
 * Menu dynamically switchable between List/TreeView mode
@@ -109,4 +113,26 @@ See [https://www.ventoy.net/en/faq.html](https://www.ventoy.net/en/faq.html) for
 # Forum
 [https://forums.ventoy.net](https://forums.ventoy.net)

+# Donation
+It would be much appreciated if you want to make a small donation to support my work!  
+Alipay, WeChat Pay, PayPal and Bitcoin are avaliable for donation. You can chose any of them.  
+
+**Alipay**  
+[https://www.ventoy.net/static/img/AliPay.png](https://www.ventoy.net/static/img/AliPay.png)
+
+**WeChat Pay**  
+[https://www.ventoy.net/static/img/WeChatPay.png](https://www.ventoy.net/static/img/WeChatPay.png)
+
+**PayPal**  
+You can transfer to my paypal account `admin@ventoy.net` or just click [https://www.paypal.me/ventoy](https://www.paypal.me/ventoy)  
+
+**Bitcoin**  
+Bitcoin Address `19mZDWzZgzkHCi9YX9H3fYCUuCHq3W6wfT`
+
+
+
+
+
+
+

--- a/Ventoy2Disk/Ventoy2Disk.sln
+++ b/Ventoy2Disk/Ventoy2Disk.sln
@@ -1,22 +1,43 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ventoy2Disk", "Ventoy2Disk\Ventoy2Disk.vcxproj", "{8D231B30-65B1-48A2-A720-F659E61DD390}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|Win32.Build.0 = Debug|Win32
-		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|Win32.ActiveCfg = Release|Win32
-		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31729.503
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ventoy2Disk", "Ventoy2Disk\Ventoy2Disk.vcxproj", "{8D231B30-65B1-48A2-A720-F659E61DD390}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|ARM.ActiveCfg = Debug|ARM
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|ARM.Build.0 = Debug|ARM
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|Win32.Build.0 = Debug|Win32
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|x64.ActiveCfg = Debug|x64
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Debug|x64.Build.0 = Debug|x64
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|ARM.ActiveCfg = Release|ARM
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|ARM.Build.0 = Release|ARM
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|ARM64.Build.0 = Release|ARM64
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|Win32.ActiveCfg = Release|Win32
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|Win32.Build.0 = Release|Win32
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|x64.ActiveCfg = Release|x64
+		{8D231B30-65B1-48A2-A720-F659E61DD390}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {46BA90D6-AD88-4760-A9BF-5B05B7941467}
+	EndGlobalSection
+EndGlobal
--- a/Ventoy2Disk/Ventoy2Disk/DiskService_diskpart.c
+++ b/Ventoy2Disk/Ventoy2Disk/DiskService_diskpart.c
@@ -49,7 +49,7 @@ STATIC BOOL DSPT_CommProc(const char *Cmd)
    GetCurrentDirectoryA(sizeof(CmdBuf), CmdBuf);
    sprintf_s(CmdFile, sizeof(CmdFile), "%s\\ventoy\\diskpart_%u.txt", CmdBuf, GetCurrentProcessId());
    
-    SaveBufToFile(CmdFile, Cmd, strlen(Cmd));
+    SaveBufToFile(CmdFile, Cmd, (int)strlen(Cmd));

    GetStartupInfoA(&Si);
    Si.dwFlags |= STARTF_USESHOWWINDOW;
--- a/Ventoy2Disk/Ventoy2Disk/DiskService_vds.c
+++ b/Ventoy2Disk/Ventoy2Disk/DiskService_vds.c
@@ -608,7 +608,7 @@ STATIC IVdsService * VDS_InitService(void)
    if (hr != S_OK) 
    {
        VDS_SET_ERROR(hr);
-        Log("Could not create VDS Loader Instance: %u", LASTERR);
+        Log("Could not create VDS Loader Instance: 0x%x", LASTERR);
        return NULL;
    }

@@ -618,7 +618,7 @@ STATIC IVdsService * VDS_InitService(void)
    if (hr != S_OK) 
    {
        VDS_SET_ERROR(hr);
-        Log("Could not load VDS Service: %u", LASTERR);
+        Log("Could not load VDS Service: 0x%x", LASTERR);
        return NULL;
    }

@@ -627,7 +627,7 @@ STATIC IVdsService * VDS_InitService(void)
    if (hr != S_OK) 
    {
        VDS_SET_ERROR(hr);
-        Log("VDS Service is not ready: %u", LASTERR);
+        Log("VDS Service is not ready: 0x%x", LASTERR);
        return NULL;
    }

@@ -887,7 +887,7 @@ STATIC BOOL VDS_CallBack_CleanDisk(void *pInterface, VDS_DISK_PROP *pDiskProp, U
 BOOL VDS_CleanDisk(int DriveIndex)
 {
 	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK, DriveIndex, VDS_CallBack_CleanDisk, 0);
-    Log("VDS_CleanDisk %d ret:%d", DriveIndex, ret);
+    Log("VDS_CleanDisk %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
    return ret;
 }

@@ -958,15 +958,15 @@ STATIC BOOL VDS_CallBack_DeletePartition(void *pInterface, VDS_DISK_PROP *pDiskP

 BOOL VDS_DeleteAllPartitions(int DriveIndex)
 {
-	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK, DriveIndex, VDS_CallBack_DeletePartition, 0);
-    Log("VDS_DeleteAllPartitions %d ret:%d", DriveIndex, ret);
+	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK, DriveIndex, VDS_CallBack_DeletePartition, 0);    
+	Log("VDS_DeleteAllPartitions %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
    return ret;
 }

 BOOL VDS_DeleteVtoyEFIPartition(int DriveIndex)
 {
 	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK, DriveIndex, VDS_CallBack_DeletePartition, 2);
-    Log("VDS_DeleteVtoyEFIPartition %d ret:%d", DriveIndex, ret);
+	Log("VDS_DeleteVtoyEFIPartition %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
    return ret;
 }

@@ -1029,8 +1029,8 @@ STATIC BOOL VDS_CallBack_ChangeEFIAttr(void *pInterface, VDS_DISK_PROP *pDiskPro

 BOOL VDS_ChangeVtoyEFIAttr(int DriveIndex, UINT64 Attr)
 {
-	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK, DriveIndex, VDS_CallBack_ChangeEFIAttr, Attr);
-    Log("VDS_ChangeVtoyEFIAttr %d ret:%d", DriveIndex, ret);
+	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK, DriveIndex, VDS_CallBack_ChangeEFIAttr, Attr);    
+	Log("VDS_ChangeVtoyEFIAttr %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
    return ret;
 }

@@ -1041,7 +1041,7 @@ STATIC BOOL VDS_CallBack_ChangeEFIType(void *pInterface, VDS_DISK_PROP *pDiskPro
 	BOOL r = FALSE;
 	HRESULT hr;
 	IVdsAdvancedDisk2 *pAdvancedDisk2 = (IVdsAdvancedDisk2 *)pInterface;
-	VDS_PARA *VdsPara = (VDS_PARA *)(ULONG)data;
+	VDS_PARA *VdsPara = (VDS_PARA *)data;
 	CHANGE_PARTITION_TYPE_PARAMETERS para;

 	para.style = VDS_PST_GPT;
@@ -1069,8 +1069,8 @@ BOOL VDS_ChangeVtoyEFI2ESP(int DriveIndex, UINT64 Offset)
 	memcpy(&(Para.Type), &EspPartType, sizeof(GUID));
 	Para.Offset = Offset;

-	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK2, DriveIndex, VDS_CallBack_ChangeEFIType, (ULONG)&Para);
-	Log("VDS_ChangeVtoyEFI2ESP %d ret:%d", DriveIndex, ret);
+	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK2, DriveIndex, VDS_CallBack_ChangeEFIType, (UINT64)&Para);
+	Log("VDS_ChangeVtoyEFI2ESP %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
 	return ret;
 }

@@ -1082,8 +1082,8 @@ BOOL VDS_ChangeVtoyEFI2Basic(int DriveIndex, UINT64 Offset)
 	memcpy(&(Para.Type), &WindowsDataPartType, sizeof(GUID));
 	Para.Offset = Offset;

-	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK2, DriveIndex, VDS_CallBack_ChangeEFIType, (ULONG)&Para);
-	Log("VDS_ChangeVtoyEFI2ESP %d ret:%d", DriveIndex, ret);
+	BOOL ret = VDS_DiskCommProc(INTF_ADVANCEDDISK2, DriveIndex, VDS_CallBack_ChangeEFIType, (UINT64)&Para);
+	Log("VDS_ChangeVtoyEFI2Basic %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
 	return ret;
 }

@@ -1095,7 +1095,7 @@ STATIC BOOL VDS_CallBack_CreateVtoyEFI(void *pInterface, VDS_DISK_PROP *pDiskPro
    IVdsAsync* pAsync;
 	CREATE_PARTITION_PARAMETERS para;
 	IVdsCreatePartitionEx *pCreatePartitionEx = (IVdsCreatePartitionEx *)pInterface;
-    VDS_PARA *VdsPara = (VDS_PARA *)(ULONG)data;
+    VDS_PARA *VdsPara = (VDS_PARA *)data;

    (void)pDiskProp;

@@ -1157,8 +1157,8 @@ BOOL VDS_CreateVtoyEFIPart(int DriveIndex, UINT64 Offset)
 	memcpy(&(Para.Type), &EspPartType, sizeof(GUID));
    CoCreateGuid(&(Para.Id));

-	BOOL ret = VDS_DiskCommProc(INTF_CREATEPARTITIONEX, DriveIndex, VDS_CallBack_CreateVtoyEFI, (ULONG)&Para);
-    Log("VDS_CreateVtoyEFIPart %d ret:%d", DriveIndex, ret);
+	BOOL ret = VDS_DiskCommProc(INTF_CREATEPARTITIONEX, DriveIndex, VDS_CallBack_CreateVtoyEFI, (UINT64)&Para);
+	Log("VDS_CreateVtoyEFIPart %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
    return ret; 
 }

@@ -1169,7 +1169,7 @@ STATIC BOOL VDS_CallBack_FormatVtoyEFI(void *pInterface, VDS_DISK_PROP *pDiskPro
 	ULONG completed;
 	IVdsAsync* pAsync;	
 	IVdsDiskPartitionMF *pPartitionMF = (IVdsDiskPartitionMF *)pInterface;
-	VDS_PARA *VdsPara = (VDS_PARA *)(ULONG)data;
+	VDS_PARA *VdsPara = (VDS_PARA *)data;

 	(void)pDiskProp;
 	
@@ -1217,7 +1217,8 @@ BOOL VDS_FormatVtoyEFIPart(int DriveIndex, UINT64 Offset)
 	Para.Offset = Offset;
 	memcpy(Para.Name, L"VTOYEFI", 7 * 2);

-	BOOL ret = VDS_DiskCommProc(INTF_PARTITIONMF, DriveIndex, VDS_CallBack_FormatVtoyEFI, (ULONG)&Para);
-	Log("VDS_FormatVtoyEFIPart %d ret:%d", DriveIndex, ret);
+	BOOL ret = VDS_DiskCommProc(INTF_PARTITIONMF, DriveIndex, VDS_CallBack_FormatVtoyEFI, (UINT64)&Para);
+	Log("VDS_FormatVtoyEFIPart %d ret:%d (%s)", DriveIndex, ret, ret ? "SUCCESS" : "FAIL");
 	return ret;
-}
+}
+
--- a/Ventoy2Disk/Ventoy2Disk/Language.h
+++ b/Ventoy2Disk/Ventoy2Disk/Language.h
@@ -123,8 +123,8 @@ typedef enum OPT_SUBMENU

 typedef struct VENTOY_LANGUAGE
 {
-	WCHAR Name[128];
-	WCHAR FontFamily[64];
+	WCHAR Name[256];
+	WCHAR FontFamily[128];
 	int FontSize;

 	WCHAR StrId[STR_ID_MAX][64];
--- a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
+++ b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
@@ -31,6 +31,8 @@
 #include "ff.h"
 #include "DiskService.h"

+static int g_backup_bin_index = 0;
+
 static DWORD GetVentoyVolumeName(int PhyDrive, UINT64 StartSectorId, CHAR *NameBuf, UINT32 BufLen, BOOL DelSlash)
 {
    size_t len;
@@ -1589,9 +1591,11 @@ int InstallVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int PartStyle, int TryId)
    UINT64 Part1SectorCount = 0;
    UINT64 Part2StartSector = 0;

+	Log("#####################################################");
    Log("InstallVentoy2PhyDrive try%d %s PhyDrive%d <<%s %s %dGB>>", TryId,
        PartStyle ? "GPT" : "MBR", pPhyDrive->PhyDrive, pPhyDrive->VendorId, pPhyDrive->ProductId,
        GetHumanReadableGBSize(pPhyDrive->SizeInBytes));
+	Log("#####################################################");

    if (PartStyle)
    {
@@ -1658,9 +1662,7 @@ int InstallVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int PartStyle, int TryId)

    if (!VDS_DeleteAllPartitions(pPhyDrive->PhyDrive))
    {
-        Log("Notice: Could not delete partitions: 0x%x", GetLastError());
-		rc = 1;
-		goto End;
+        Log("Notice: Could not delete partitions: 0x%x, but we continue.", GetLastError());
    }

    Log("Deleting all partitions ......................... OK");
@@ -1828,6 +1830,58 @@ End:
    return rc;
 }

+static BOOL DiskCheckWriteAccess(HANDLE hDrive)
+{
+	DWORD dwSize;
+	BOOL ret = FALSE;
+	BOOL bRet = FALSE;
+	BYTE Buffer[512];
+	LARGE_INTEGER liCurPosition;
+	LARGE_INTEGER liNewPosition;
+
+	liCurPosition.QuadPart = 2039 * 512;
+	liNewPosition.QuadPart = 0;
+	if (0 == SetFilePointerEx(hDrive, liCurPosition, &liNewPosition, FILE_BEGIN) ||
+		liNewPosition.QuadPart != liCurPosition.QuadPart)
+	{
+		Log("SetFilePointer1 Failed %u", LASTERR);
+		goto out;
+	}
+
+
+	dwSize = 0;
+	ret = ReadFile(hDrive, Buffer, 512, &dwSize, NULL);
+	if ((!ret) || (dwSize != 512))
+	{
+		Log("Failed to read %d %u 0x%x", ret, dwSize, LASTERR);
+		goto out;
+	}
+
+
+	liCurPosition.QuadPart = 2039 * 512;
+	liNewPosition.QuadPart = 0;
+	if (0 == SetFilePointerEx(hDrive, liCurPosition, &liNewPosition, FILE_BEGIN) ||
+		liNewPosition.QuadPart != liCurPosition.QuadPart)
+	{
+		Log("SetFilePointer2 Failed %u", LASTERR);
+		goto out;
+	}
+
+	dwSize = 0;
+	ret = WriteFile(hDrive, Buffer, 512, &dwSize, NULL);
+	if ((!ret) || dwSize != 512)
+	{
+		Log("Failed to write %d %u %u", ret, dwSize, LASTERR);
+		goto out;
+	}
+
+	bRet = TRUE;
+
+out:
+	
+	return bRet;
+}
+
 static BOOL BackupDataBeforeCleanDisk(int PhyDrive, UINT64 DiskSize, BYTE **pBackup)
 {
 	DWORD dwSize;
@@ -1835,13 +1889,35 @@ static BOOL BackupDataBeforeCleanDisk(int PhyDrive, UINT64 DiskSize, BYTE **pBac
 	BOOL Return = FALSE;
 	BOOL ret = FALSE;
 	BYTE *backup = NULL;
+	UINT64 offset;
 	HANDLE hDrive = INVALID_HANDLE_VALUE;
 	LARGE_INTEGER liCurPosition;
 	LARGE_INTEGER liNewPosition;
+	VTOY_GPT_INFO *pGPT = NULL;

 	Log("BackupDataBeforeCleanDisk %d", PhyDrive);

-	backup = malloc(SIZE_1MB * 3);
+	// step1: check write access
+	hDrive = GetPhysicalHandle(PhyDrive, TRUE, TRUE, FALSE);
+	if (hDrive == INVALID_HANDLE_VALUE)
+	{
+		Log("Failed to GetPhysicalHandle for write.");
+		goto out;
+	}
+
+	if (DiskCheckWriteAccess(hDrive))
+	{
+		Log("DiskCheckWriteAccess success");
+		CHECK_CLOSE_HANDLE(hDrive);
+	}
+	else
+	{
+		Log("DiskCheckWriteAccess failed");
+		goto out;
+	}
+
+	//step2 backup 4MB data
+	backup = malloc(SIZE_1MB * 4);
 	if (!backup)
 	{
 		goto out;
@@ -1853,7 +1929,7 @@ static BOOL BackupDataBeforeCleanDisk(int PhyDrive, UINT64 DiskSize, BYTE **pBac
 		goto out;
 	}

-	//read first 1MB
+	//read first 2MB
 	dwStatus = SetFilePointer(hDrive, 0, NULL, FILE_BEGIN);
 	if (dwStatus != 0)
 	{
@@ -1861,14 +1937,27 @@ static BOOL BackupDataBeforeCleanDisk(int PhyDrive, UINT64 DiskSize, BYTE **pBac
 	}
 	
 	dwSize = 0;
-	ret = ReadFile(hDrive, backup, SIZE_1MB, &dwSize, NULL);
-	if ((!ret) || (dwSize != SIZE_1MB))
+	ret = ReadFile(hDrive, backup, SIZE_2MB, &dwSize, NULL);
+	if ((!ret) || (dwSize != SIZE_2MB))
 	{
 		Log("Failed to read %d %u 0x%x", ret, dwSize, LASTERR);
 		goto out;
 	}
 	
-	liCurPosition.QuadPart = DiskSize - (SIZE_1MB * 2);
+	pGPT = (VTOY_GPT_INFO *)backup;
+	offset = pGPT->Head.EfiBackupLBA * 512;
+	if (offset >= (DiskSize - SIZE_2MB) && offset < DiskSize)
+	{
+		Log("EFI partition table check success"); 
+	}
+	else
+	{
+		Log("Backup EFI LBA not in last 2MB range: %llu", pGPT->Head.EfiBackupLBA);
+		goto out;
+	}
+
+	//read last 2MB
+	liCurPosition.QuadPart = DiskSize - SIZE_2MB;
 	liNewPosition.QuadPart = 0;
 	if (0 == SetFilePointerEx(hDrive, liCurPosition, &liNewPosition, FILE_BEGIN) ||
 		liNewPosition.QuadPart != liCurPosition.QuadPart)
@@ -1877,8 +1966,8 @@ static BOOL BackupDataBeforeCleanDisk(int PhyDrive, UINT64 DiskSize, BYTE **pBac
 	}

 	dwSize = 0;
-	ret = ReadFile(hDrive, backup + SIZE_1MB, 2 * SIZE_1MB, &dwSize, NULL);
-	if ((!ret) || (dwSize != 2 * SIZE_1MB))
+	ret = ReadFile(hDrive, backup + SIZE_2MB, SIZE_2MB, &dwSize, NULL);
+	if ((!ret) || (dwSize != SIZE_2MB))
 	{
 		Log("Failed to read %d %u 0x%x", ret, dwSize, LASTERR);
 		goto out;
@@ -1930,11 +2019,12 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 {
 	int i;
 	int rc = 0;
-	int MaxRetry = 3;
+	int MaxRetry = 4;
 	BOOL ForceMBR = FALSE;
 	BOOL Esp2Basic = FALSE;
 	BOOL ChangeAttr = FALSE;
 	BOOL CleanDisk = FALSE;
+	BOOL bWriteBack = TRUE;
 	HANDLE hVolume;
 	HANDLE hDrive;
 	DWORD Status;
@@ -1942,6 +2032,7 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 	BOOL bRet;
 	CHAR DriveName[] = "?:\\";
 	CHAR DriveLetters[MAX_PATH] = { 0 };
+	CHAR BackBinFile[MAX_PATH];
 	UINT64 StartSector;
 	UINT64 ReservedMB = 0;
 	MBR_HEAD BootImg;
@@ -1950,9 +2041,11 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 	VTOY_GPT_INFO *pGptInfo = NULL;
 	UINT8 ReservedData[4096];

+	Log("#####################################################");
 	Log("UpdateVentoy2PhyDrive try%d %s PhyDrive%d <<%s %s %dGB>>", TryId,
 		pPhyDrive->PartStyle ? "GPT" : "MBR", pPhyDrive->PhyDrive, pPhyDrive->VendorId, pPhyDrive->ProductId,
 		GetHumanReadableGBSize(pPhyDrive->SizeInBytes));
+	Log("#####################################################");

 	PROGRESS_BAR_SET_POS(PT_LOCK_FOR_CLEAN);

@@ -2044,7 +2137,7 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 			if (VDS_ChangeVtoyEFI2ESP(pPhyDrive->PhyDrive, StartSector * 512))
 			{
 				Esp2Basic = TRUE;
-				Sleep(1000);
+				Sleep(3000);
 			}
 		}
 		else if (TryId == 2)
@@ -2053,7 +2146,7 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 			if (VDS_ChangeVtoyEFIAttr(pPhyDrive->PhyDrive, 0x8000000000000001))
 			{
 				ChangeAttr = TRUE;
-				Sleep(1000);
+				Sleep(2000);
 			}
 		}
 		else if (TryId == 3)
@@ -2061,10 +2154,19 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 			Log("Clean disk GPT partition table");
 			if (BackupDataBeforeCleanDisk(pPhyDrive->PhyDrive, pPhyDrive->SizeInBytes, &pBackup))
 			{
+				sprintf_s(BackBinFile, sizeof(BackBinFile), ".\\ventoy\\phydrive%d_%u_%d.bin",
+					pPhyDrive->PhyDrive, GetCurrentProcessId(), g_backup_bin_index++);
+				SaveBufToFile(BackBinFile, pBackup, 4 * SIZE_1MB);
+				Log("Save backup data to %s", BackBinFile);
+
 				Log("Success to backup data before clean");
 				CleanDisk = TRUE;
-				VDS_CleanDisk(pPhyDrive->PhyDrive);
-				Sleep(1000);
+				if (!VDS_CleanDisk(pPhyDrive->PhyDrive))
+				{
+					Sleep(3000);
+					DSPT_CleanDisk(pPhyDrive->PhyDrive);
+				}
+				Sleep(3000);
 			}
 			else
 			{
@@ -2092,7 +2194,18 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
 	//If we change VTOYEFI to ESP, it can not have s volume name, so don't try to get it.
 	if (CleanDisk)
 	{
-		WriteBackupDataToDisk(hDrive, pPhyDrive->SizeInBytes - (2 * SIZE_1MB), pBackup + SIZE_1MB, 2 * SIZE_1MB);
+		//writeback the last 2MB
+		if (!WriteBackupDataToDisk(hDrive, pPhyDrive->SizeInBytes - SIZE_2MB, pBackup + SIZE_2MB, SIZE_2MB))
+		{
+			bWriteBack = FALSE;
+		}
+
+		//write the first 2MB except parttable
+		if (!WriteBackupDataToDisk(hDrive, 34 * 512, pBackup + 34 * 512, SIZE_2MB - 34 * 512))
+		{
+			bWriteBack = FALSE;
+		}
+
 		Status = ERROR_NOT_FOUND;
 	}
 	else if (Esp2Basic)
@@ -2164,24 +2277,41 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)
        goto End;
    }

-    if (!TryWritePart2(hDrive, StartSector))
+	bRet = TryWritePart2(hDrive, StartSector);
+	if (FALSE == bRet && Esp2Basic)
+	{
+		Log("TryWritePart2 agagin ...");
+		Sleep(3000);
+		bRet = TryWritePart2(hDrive, StartSector);
+	}
+
+	if (!bRet)
    {
 		if (pPhyDrive->PartStyle == 0)
 		{
-			ForceMBR = TRUE;
-
-			Log("Try write failed, now delete partition 2 for MBR...");
-			CHECK_CLOSE_HANDLE(hDrive);
-
-			Log("Now delete partition 2...");
-			VDS_DeleteVtoyEFIPartition(pPhyDrive->PhyDrive);
-
-			hDrive = GetPhysicalHandle(pPhyDrive->PhyDrive, TRUE, TRUE, FALSE);
-			if (hDrive == INVALID_HANDLE_VALUE)
+			if (DiskCheckWriteAccess(hDrive))
 			{
-				Log("Failed to GetPhysicalHandle for write.");
-				rc = 1;
-				goto End;
+				Log("MBR DiskCheckWriteAccess success");
+
+				ForceMBR = TRUE;
+
+				Log("Try write failed, now delete partition 2 for MBR...");
+				CHECK_CLOSE_HANDLE(hDrive);
+
+				Log("Now delete partition 2...");
+				VDS_DeleteVtoyEFIPartition(pPhyDrive->PhyDrive);
+
+				hDrive = GetPhysicalHandle(pPhyDrive->PhyDrive, TRUE, TRUE, FALSE);
+				if (hDrive == INVALID_HANDLE_VALUE)
+				{
+					Log("Failed to GetPhysicalHandle for write.");
+					rc = 1;
+					goto End;
+				}
+			}
+			else
+			{
+				Log("MBR DiskCheckWriteAccess failed");
 			}
 		}
 		else
@@ -2262,9 +2392,24 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)

 	if (CleanDisk)
 	{
-		WriteBackupDataToDisk(hDrive, 4 * 512, pBackup + 4 * 512, SIZE_1MB - 4 * 512);
-		WriteBackupDataToDisk(hDrive, 0, pBackup, 4 * 512);
+		if (!WriteBackupDataToDisk(hDrive, 0, pBackup, 34 * 512))
+		{
+			bWriteBack = FALSE;
+		}
+
 		free(pBackup);
+
+		if (bWriteBack)
+		{
+			Log("Write backup data success, now delete %s", BackBinFile);
+			DeleteFileA(BackBinFile);
+		}
+		else
+		{
+			Log("Write backup data failed");
+		}
+
+		Sleep(1000);
 	}

    //Refresh Drive Layout
@@ -2272,6 +2417,13 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int TryId)

 End:

+	if (hVolume != INVALID_HANDLE_VALUE)
+	{
+		bRet = DeviceIoControl(hVolume, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &dwSize, NULL);
+		Log("FSCTL_UNLOCK_VOLUME bRet:%u code:%u", bRet, LASTERR);
+		CHECK_CLOSE_HANDLE(hVolume);
+	}
+
    if (rc == 0)
    {
        Log("OK");
@@ -2291,19 +2443,19 @@ End:

 	if (pPhyDrive->PartStyle == 1)
 	{
-	if (ChangeAttr || ((pPhyDrive->Part2GPTAttr >> 56) != 0xC0))
-	{
-		Log("Change EFI partition attr %u <0x%llx> to <0x%llx>", ChangeAttr, pPhyDrive->Part2GPTAttr, 0xC000000000000001ULL);
-		if (VDS_ChangeVtoyEFIAttr(pPhyDrive->PhyDrive, 0xC000000000000001ULL))
+		if (ChangeAttr || ((pPhyDrive->Part2GPTAttr >> 56) != 0xC0))
 		{
-			Log("Change EFI partition attr success");
-			pPhyDrive->Part2GPTAttr = 0xC000000000000001ULL;
+			Log("Change EFI partition attr %u <0x%llx> to <0x%llx>", ChangeAttr, pPhyDrive->Part2GPTAttr, 0xC000000000000001ULL);
+			if (VDS_ChangeVtoyEFIAttr(pPhyDrive->PhyDrive, 0xC000000000000001ULL))
+			{
+				Log("Change EFI partition attr success");
+				pPhyDrive->Part2GPTAttr = 0xC000000000000001ULL;
+			}
+			else
+			{
+				Log("Change EFI partition attr failed");
+			}
 		}
-		else
-		{
-			Log("Change EFI partition attr failed");
-		}
-	}
 	}

    if (pGptInfo)
--- a/Ventoy2Disk/Ventoy2Disk/Utility.c
+++ b/Ventoy2Disk/Ventoy2Disk/Utility.c
@@ -267,69 +267,93 @@ static const char* GetEdition(DWORD ProductType)
    // From: https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getproductinfo
    // These values can be found in the winnt.h header.
    switch (ProductType) {
-    case 0x00000000: return "";	//  Undefined
-    case 0x00000001: return "Ultimate";
-    case 0x00000002: return "Home Basic";
-    case 0x00000003: return "Home Premium";
-    case 0x00000004: return "Enterprise";
-    case 0x00000005: return "Home Basic N";
-    case 0x00000006: return "Business";
-    case 0x00000007: return "Standard Server";
-    case 0x00000008: return "Datacenter Server";
-    case 0x00000009: return "Smallbusiness Server";
-    case 0x0000000A: return "Enterprise Server";
-    case 0x0000000B: return "Starter";
-    case 0x00000010: return "Business N";
-    case 0x00000011: return "Web Server";
-    case 0x00000012: return "Cluster Server";
-    case 0x00000013: return "Home Server";
-    case 0x0000001A: return "Home Premium N";
-    case 0x0000001B: return "Enterprise N";
-    case 0x0000001C: return "Ultimate N";
-    case 0x00000022: return "Home Premium Server";
-    case 0x0000002F: return "Starter N";
-    case 0x00000030: return "Pro";
-    case 0x00000031: return "Pro N";
-    case 0x00000042: return "Starter E";
-    case 0x00000043: return "Home Basic E";
-    case 0x00000044: return "Premium E";
-    case 0x00000045: return "Pro E";
-    case 0x00000046: return "Enterprise E";
-    case 0x00000047: return "Ultimate E";
-    case 0x00000048: return "Enterprise Eval";
-    case 0x00000054: return "Enterprise N Eval";
-    case 0x00000057: return "Thin PC";
-    case 0x0000006F: return "Core Connected";
-    case 0x00000070: return "Pro Student";
-    case 0x00000071: return "Core Connected N";
-    case 0x00000072: return "Pro Student N";
-    case 0x00000073: return "Core Connected Single Language";
-    case 0x00000074: return "Core Connected China";
-    case 0x00000079: return "Edu";
-    case 0x0000007A: return "Edu N";
-    case 0x0000007D: return "Enterprise S";
-    case 0x0000007E: return "Enterprise S N";
-    case 0x0000007F: return "Pro S";
-    case 0x00000080: return "Pro S N";
-    case 0x00000081: return "Enterprise S Eval";
-    case 0x00000082: return "Enterprise S N Eval";
-    case 0x0000008A: return "Pro Single Language";
-    case 0x0000008B: return "Pro China";
-    case 0x0000008C: return "Enterprise Subscription";
-    case 0x0000008D: return "Enterprise Subscription N";
-    case 0x00000095: return "Utility VM";
-    case 0x000000A1: return "Pro Workstation";
-    case 0x000000A2: return "Pro Workstation N";
-    case 0x000000A4: return "Pro for Education";
-    case 0x000000A5: return "Pro for Education N";
-    case 0x000000AB: return "Enterprise G";	// I swear Microsoft are just making up editions...
-    case 0x000000AC: return "Enterprise G N";
-    case 0x000000B6: return "Core OS";
-    case 0x000000B7: return "Cloud E";
-    case 0x000000B8: return "Cloud E N";
-    case 0x000000BD: return "Lite";
-    case 0xABCDABCD: return "(Unlicensed)";
-    default: return "(Unknown Edition)";
+		case 0x00000000: return "";	//  Undefined
+		case 0x00000001: return "Ultimate";
+		case 0x00000002: return "Home Basic";
+		case 0x00000003: return "Home Premium";
+		case 0x00000004: return "Enterprise";
+		case 0x00000005: return "Home Basic N";
+		case 0x00000006: return "Business";
+		case 0x00000007: return "Server Standard";
+		case 0x00000008: return "Server Datacenter";
+		case 0x00000009: return "Smallbusiness Server";
+		case 0x0000000A: return "Server Enterprise";
+		case 0x0000000B: return "Starter";
+		case 0x0000000C: return "Server Datacenter (Core)";
+		case 0x0000000D: return "Server Standard (Core)";
+		case 0x0000000E: return "Server Enterprise (Core)";
+		case 0x00000010: return "Business N";
+		case 0x00000011: return "Web Server";
+		case 0x00000012: return "HPC Edition";
+		case 0x00000013: return "Storage Server (Essentials)";
+		case 0x0000001A: return "Home Premium N";
+		case 0x0000001B: return "Enterprise N";
+		case 0x0000001C: return "Ultimate N";
+		case 0x00000022: return "Home Server";
+		case 0x00000024: return "Server Standard without Hyper-V";
+		case 0x00000025: return "Server Datacenter without Hyper-V";
+		case 0x00000026: return "Server Enterprise without Hyper-V";
+		case 0x00000027: return "Server Datacenter without Hyper-V (Core)";
+		case 0x00000028: return "Server Standard without Hyper-V (Core)";
+		case 0x00000029: return "Server Enterprise without Hyper-V (Core)";
+		case 0x0000002A: return "Hyper-V Server";
+		case 0x0000002F: return "Starter N";
+		case 0x00000030: return "Pro";
+		case 0x00000031: return "Pro N";
+		case 0x00000034: return "Server Solutions Premium";
+		case 0x00000035: return "Server Solutions Premium (Core)";
+		case 0x00000040: return "Server Hyper Core V";
+		case 0x00000042: return "Starter E";
+		case 0x00000043: return "Home Basic E";
+		case 0x00000044: return "Premium E";
+		case 0x00000045: return "Pro E";
+		case 0x00000046: return "Enterprise E";
+		case 0x00000047: return "Ultimate E";
+		case 0x00000048: return "Enterprise (Eval)";
+		case 0x0000004F: return "Server Standard (Eval)";
+		case 0x00000050: return "Server Datacenter (Eval)";
+		case 0x00000054: return "Enterprise N (Eval)";
+		case 0x00000057: return "Thin PC";
+		case 0x00000058: case 0x00000059: case 0x0000005A: case 0x0000005B: case 0x0000005C: return "Embedded";
+		case 0x00000062: return "Home N";
+		case 0x00000063: return "Home China";
+		case 0x00000064: return "Home Single Language";
+		case 0x00000065: return "Home";
+		case 0x00000067: return "Pro with Media Center";
+		case 0x00000069: case 0x0000006A: case 0x0000006B: case 0x0000006C: return "Embedded";
+		case 0x0000006F: return "Home Connected";
+		case 0x00000070: return "Pro Student";
+		case 0x00000071: return "Home Connected N";
+		case 0x00000072: return "Pro Student N";
+		case 0x00000073: return "Home Connected Single Language";
+		case 0x00000074: return "Home Connected China";
+		case 0x00000079: return "Education";
+		case 0x0000007A: return "Education N";
+		case 0x0000007D: return "Enterprise LTSB";
+		case 0x0000007E: return "Enterprise LTSB N";
+		case 0x0000007F: return "Pro S";
+		case 0x00000080: return "Pro S N";
+		case 0x00000081: return "Enterprise LTSB (Eval)";
+		case 0x00000082: return "Enterprise LTSB N (Eval)";
+		case 0x0000008A: return "Pro Single Language";
+		case 0x0000008B: return "Pro China";
+		case 0x0000008C: return "Enterprise Subscription";
+		case 0x0000008D: return "Enterprise Subscription N";
+		case 0x00000091: return "Server Datacenter SA (Core)";
+		case 0x00000092: return "Server Standard SA (Core)";
+		case 0x00000095: return "Utility VM";
+		case 0x000000A1: return "Pro for Workstations";
+		case 0x000000A2: return "Pro for Workstations N";
+		case 0x000000A4: return "Pro for Education";
+		case 0x000000A5: return "Pro for Education N";
+		case 0x000000AB: return "Enterprise G";	// I swear Microsoft are just making up editions...
+		case 0x000000AC: return "Enterprise G N";
+		case 0x000000B6: return "Home OS";
+		case 0x000000B7: return "Cloud E";
+		case 0x000000B8: return "Cloud E N";
+		case 0x000000BD: return "Lite";
+		case 0xABCDABCD: return "(Unlicensed)";
+		default: return "(Unknown Edition)";
    }
 }

--- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.aps
+++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.aps
--- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h
+++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h
@@ -187,6 +187,8 @@ extern HFONT g_language_normal_font;
 extern HFONT g_language_bold_font;
 extern int g_FilterUSB;

+
+
 void TraceOut(const char *Fmt, ...);
 void Log(const char *Fmt, ...);
 BOOL IsPathExist(BOOL Dir, const char *Fmt, ...);
--- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj
+++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj
@@ -1,31 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8D231B30-65B1-48A2-A720-F659E61DD390}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>Ventoy2Disk</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -35,18 +99,71 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
    <EmbedManifest>true</EmbedManifest>
    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <LinkIncremental>true</LinkIncremental>
+    <EmbedManifest>true</EmbedManifest>
+    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk_ARM</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+    <EmbedManifest>true</EmbedManifest>
+    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk_ARM64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <EmbedManifest>true</EmbedManifest>
+    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk_X64</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk_ARM</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk_ARM64</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)\fat_io_lib\;$(ProjectDir)\xz-embedded-20130513\linux\include;$(ProjectDir)\xz-embedded-20130513\linux\include\linux;$(ProjectDir)\xz-embedded-20130513\userspace;$(ProjectDir)\ff14\source;$(IncludePath)</IncludePath>
+    <TargetName>Ventoy2Disk_X64</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@@ -54,7 +171,7 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>VTARCH_X86;VTBIT=32;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
@@ -64,7 +181,64 @@
      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <Manifest>
-      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2Disk.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2Disk32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>VTARCH_ARM;VTBIT=32;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2DiskArm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>VTARCH_ARM64;VTBIT=64;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2DiskArm64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>VTARCH_X64;VTBIT=64;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2Disk64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
    </Manifest>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -75,7 +249,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>VTARCH_X86;VTBIT=32;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>
@@ -87,7 +261,76 @@
      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <Manifest>
-      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2Disk.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2Disk32.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>VTARCH_ARM;VTBIT=32;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2DiskArm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>VTARCH_ARM64;VTBIT=64;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2DiskArm64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>VTARCH_X64;VTBIT=64;FATFS_INC_FORMAT_SUPPORT=0;STATIC=static;INIT=;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\Res\Ventoy2Disk64.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
    </Manifest>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.user
+++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.user
@@ -6,10 +6,40 @@
    <LocalDebuggerCommandArguments>
    </LocalDebuggerCommandArguments>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    <LocalDebuggerWorkingDirectory>C:\share\ventoy-1.0.03</LocalDebuggerWorkingDirectory>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LocalDebuggerWorkingDirectory>C:\share\ventoy-1.0.03</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerWorkingDirectory>C:\share\ventoy-1.0.03</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerWorkingDirectory>K:\test\ventoy\ventoy-1.0.57</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    <LocalDebuggerCommandArguments>
    </LocalDebuggerCommandArguments>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LocalDebuggerWorkingDirectory>C:\share\ventoy-1.0.03</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LocalDebuggerWorkingDirectory>C:\share\ventoy-1.0.03</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerWorkingDirectory>K:\test\ventoy\ventoy-1.0.57</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments />
+  </PropertyGroup>
 </Project>
--- a/Ventoy2Disk/Ventoy2Disk/VentoyJson.c
+++ b/Ventoy2Disk/Ventoy2Disk/VentoyJson.c
@@ -403,7 +403,7 @@ int vtoy_json_parse(VTOY_JSON *pstJson, const char *szJsonData)
    char *pcNewBuf = NULL;
    const char *pcEnd = NULL;

-    uiMemSize = strlen(szJsonData) + 1;
+	uiMemSize = (UINT32)strlen(szJsonData) + 1;
    pcNewBuf = (char *)malloc(uiMemSize);
    if (NULL == pcNewBuf)
    {
--- a/Ventoy2Disk/Ventoy2Disk/WinDialog.c
+++ b/Ventoy2Disk/Ventoy2Disk/WinDialog.c
--- a/Ventoy2Disk/Ventoy2Disk/process.h
+++ b/Ventoy2Disk/Ventoy2Disk/process.h
@@ -365,11 +365,12 @@ if ((pf##proc == NULL) && (NT_SUCCESS(status))) status = STATUS_NOT_IMPLEMENTED;
 #define GB             1073741824LL
 #define TB          1099511627776LL

+#ifndef _WINTERNL_
 typedef struct _CLIENT_ID {
    HANDLE UniqueProcess;
    HANDLE UniqueThread;
 } CLIENT_ID;
-
+#endif



--- a/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/linux/lib/decompress_unxz.c
+++ b/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/linux/lib/decompress_unxz.c
@@ -302,7 +302,7 @@ int INIT unxz(unsigned char *in, int in_size,
 		do {
 			if (b.in_pos == b.in_size && fill != NULL) {
 				if (in_used != NULL)
-					*in_used += b.in_pos;
+					*in_used += (int)(b.in_pos);

 				b.in_pos = 0;

@@ -329,7 +329,7 @@ int INIT unxz(unsigned char *in, int in_size,
 				 * returned by xz_dec_run(), but probably
 				 * it's not too bad.
 				 */
-				if (flush(b.out, b.out_pos) != (int)b.out_pos)
+				if (flush(b.out, (unsigned int)(b.out_pos)) != (int)b.out_pos)
 					ret = XZ_BUF_ERROR;

 				b.out_pos = 0;
@@ -344,7 +344,7 @@ int INIT unxz(unsigned char *in, int in_size,
 	}

 	if (in_used != NULL)
-		*in_used += b.in_pos;
+		*in_used += (int)(b.in_pos);

 	xz_dec_end(s);

--- a/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/linux/lib/xz/xz_dec_lzma2.c
+++ b/Ventoy2Disk/Ventoy2Disk/xz-embedded-20130513/linux/lib/xz/xz_dec_lzma2.c
@@ -351,7 +351,7 @@ static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist)
 	if (dist >= dict->full || dist >= dict->size)
 		return false;

-	left = min_t(size_t, dict->limit - dict->pos, *len);
+	left = (uint32_t)min_t(size_t, dict->limit - dict->pos, *len);
 	*len -= left;

 	back = dict->pos - dist - 1;
@@ -385,7 +385,7 @@ static void dict_uncompressed(struct dictionary *dict, struct xz_buf *b,
 		if (copy_size > *left)
 			copy_size = *left;

-		*left -= copy_size;
+		*left -= (uint32_t)copy_size;

 		memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size);
 		dict->pos += copy_size;
@@ -427,7 +427,7 @@ static uint32_t dict_flush(struct dictionary *dict, struct xz_buf *b)

 	dict->start = dict->pos;
 	b->out_pos += copy_size;
-	return copy_size;
+	return (uint32_t)copy_size;
 }

 /*****************
@@ -854,7 +854,7 @@ static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
 		if (tmp > s->lzma2.compressed - s->temp.size)
 			tmp = s->lzma2.compressed - s->temp.size;
 		if (tmp > in_avail)
-			tmp = in_avail;
+			tmp = (uint32_t)in_avail;

 		memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);

@@ -877,10 +877,10 @@ static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
 		if (!lzma_main(s) || s->rc.in_pos > s->temp.size + tmp)
 			return false;

-		s->lzma2.compressed -= s->rc.in_pos;
+		s->lzma2.compressed -= (uint32_t)(s->rc.in_pos);

 		if (s->rc.in_pos < s->temp.size) {
-			s->temp.size -= s->rc.in_pos;
+			s->temp.size -= (uint32_t)(s->rc.in_pos);
 			memmove(s->temp.buf, s->temp.buf + s->rc.in_pos,
 					s->temp.size);
 			return true;
@@ -907,7 +907,7 @@ static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
 		if (in_avail > s->lzma2.compressed)
 			return false;

-		s->lzma2.compressed -= in_avail;
+		s->lzma2.compressed -= (uint32_t)in_avail;
 		b->in_pos = s->rc.in_pos;
 	}

@@ -917,7 +917,7 @@ static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
 			in_avail = s->lzma2.compressed;

 		memcpy(s->temp.buf, b->in + b->in_pos, in_avail);
-		s->temp.size = in_avail;
+		s->temp.size = (uint32_t)in_avail;
 		b->in_pos += in_avail;
 	}
Author	SHA1	Message	Date
longpanda	32602a79ab	1.0.58 release	2021-11-06 17:54:11 +08:00
longpanda	863eafd2cc	Update README.md	2021-11-04 18:27:50 +08:00
longpanda	0f135b6646	Update README.md	2021-11-04 18:26:37 +08:00
longpanda	675c24ffa3	Update README.md	2021-11-04 18:25:43 +08:00
longpanda	cd309eb663	template	2021-11-04 17:56:08 +08:00
longpanda	5cdd6540a4	template	2021-11-04 17:55:23 +08:00
longpanda	fde2e4430c	template update	2021-11-04 17:51:30 +08:00
longpanda	9a471f4956	template update	2021-11-04 17:49:55 +08:00
longpanda	1f3b3afa35	template update	2021-11-04 17:44:32 +08:00
longpanda	6947f2a047	update template	2021-11-04 17:38:28 +08:00
longpanda	0a15e4e427	Add image report template.	2021-11-04 17:20:42 +08:00
longpanda	e763d7590f	Fix a bug when booting HDM17x64_17.20.0_ADV_Linux_Downloadly.ir.iso	2021-11-02 23:23:39 +08:00
longpanda	f842d46f90	Fix the false error report about ventoy.jsonxxx file. (#1190 )	2021-11-01 19:45:53 +08:00
longpanda	cc1cc6c301	misc update	2021-11-01 19:32:43 +08:00
Allan Nordhøy	9f3d209798	Norwegian Bokmål language added (#1189 )	2021-11-01 09:37:59 +08:00
longpanda	fc742244ab	Update README.md	2021-10-30 12:04:43 +08:00
longpanda	3e66227dae	Update FUNDING.yml	2021-10-30 11:55:27 +08:00
longpanda	f32d342f66	1.0.57 release	2021-10-29 22:58:15 +08:00
Ida Bagus	09d7ae68e7	Create id_ID.txt (#1181 )	2021-10-29 17:43:11 +08:00
Hugo Carvalho	68fefbc1fc	Add pt_PT.txt (#1180 ) Add pt_PT.text to INSTALL/grub/help/	2021-10-29 17:43:00 +08:00
Hugo Carvalho	8d893d4c94	Update Portuguese(Portugal) language (#1179 )	2021-10-29 17:42:49 +08:00
Tayfun Akkoyun	84798a4f7a	Update tr_Tr.txt (#1178 ) new lines was translated	2021-10-29 17:42:33 +08:00
longpanda	87f88eeb2b	[Ventoy2Disk.exe] improve Windows edition reporting	2021-10-29 09:28:20 +08:00
longpanda	7b2615744c	Update help information	2021-10-28 18:16:50 +08:00
vboucard	d7faff4438	French translation of help messages (#1176 )	2021-10-28 18:00:38 +08:00
Ida Bagus	f15dfd7409	Update languages.json (#1174 )	2021-10-28 18:00:23 +08:00
longpanda	09162e8d97	Improvement for multi-mode option. Now you can use for example theme_uefi and theme at the same time.	2021-10-27 20:08:47 +08:00
longpanda	eb8fcc8f30	Add hr_HR/sr_CY/sr_SR languages for help information.	2021-10-26 10:37:41 +08:00
longpanda	5fcb3971bc	Optimization for Ventoy2Disk.exe	2021-10-26 09:18:41 +08:00
longpanda	e47e4484ce	Optimization for Ventoy2Disk.exe	2021-10-25 20:38:04 +08:00
longpanda	7e26decb31	Update help information	2021-10-25 11:02:46 +08:00
longpanda	e713946fd0	Case insensitive when checking checksum value.	2021-10-25 09:29:51 +08:00
longpanda	a93b0f6656	Add .md5/.sha1/.sha256/.sha512 check file feature. Hotkey m is for calculate checksum and print the result. If also exist a .md5/.sha1/.sha256/.sha512 file, then it will check the result with the value in the file. The .md5/.sha1/.sha256/.sha512 suffix is appended to the original file name not replace the original suffix. For example: /ISO/Ubuntu-20.04-amd64-desktop.iso /ISO/Ubuntu-20.04-amd64-desktop.iso.md5	2021-10-24 18:52:09 +08:00
longpanda	836e1aa11e	Add support for boot conf replace for distro which use systemd-boot in UEFI mode. (#1170)	2021-10-23 23:15:25 +08:00
longpanda	154bbc6e5f	hotkey optimization h is equal to Ctrl+h m is equal to Ctrl+m	2021-10-23 21:18:28 +08:00
longpanda	d151e74336	Optimization for Ventoy2Disk.exe	2021-10-23 15:46:28 +08:00
longpanda	df87cafdfb	Optimization for Ventoy2Disk.exe	2021-10-23 11:26:16 +08:00
longpanda	09494a5b23	Optimization for Ventoy2Disk.exe	2021-10-22 22:30:38 +08:00
longpanda	e15a1c5ece	Optimization for pyabr	2021-10-22 18:16:50 +08:00