1. change icon from * to a lock icon

2. typo correct
3. misc update

diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe
index 032375b32d47c37e33c11ee123ddfcc53689f725..770a8b1b5e06246b5ec7bc66b7b53f646fe66994 100644 (file)
Binary files a/INSTALL/Ventoy2Disk.exe and b/INSTALL/Ventoy2Disk.exe differ

diff --git a/INSTALL/VentoyWeb.sh b/INSTALL/VentoyWeb.sh
index 9baf33b820bc7f938ac005c1ba5f7044baee1f9b..bb6a910acb4ee93f8bc1dce62bf826cb6c35820d 100644 (file)
--- a/INSTALL/VentoyWeb.sh
+++ b/INSTALL/VentoyWeb.sh
@@ -101,8 +101,8 @@ vtVer=$(cat ventoy/version)
 echo ""
 echo "==============================================================="
 if [ "$LANG" = "zh_CN.UTF-8" ]; then
 echo ""
 echo "==============================================================="
 if [ "$LANG" = "zh_CN.UTF-8" ]; then

-    echo "  Ventoy Server $vtVer ÒѾ­Æô¶¯ ..."
-    echo "  Çë´ò¿ªä¯ÀÀÆ÷£¬·ÃÎÊ http://${HOST}:${PORT}"
+    echo "  Ventoy Server $vtVer 已经启动 ..."
+    echo "  请打开浏览器，访问 http://${HOST}:${PORT}"

 else
     echo "  Ventoy Server $vtVer is running ..."
     echo "  Please open your browser and visit http://${HOST}:${PORT}"
 else
     echo "  Ventoy Server $vtVer is running ..."
     echo "  Please open your browser and visit http://${HOST}:${PORT}"

diff --git a/INSTALL/tool/VentoyWorker.sh b/INSTALL/tool/VentoyWorker.sh
index 7e276db5b45e5833bcab1ffb4ec691e225a69b0b..ac2102c8bf122f735d56ecde38c3b31a313df0c2 100644 (file)
--- a/INSTALL/tool/VentoyWorker.sh
+++ b/INSTALL/tool/VentoyWorker.sh
@@ -6,9 +6,9 @@ print_usage() {
     
     echo 'Usage:  Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX'
     echo '  CMD:'
     
     echo 'Usage:  Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX'
     echo '  CMD:'

-    echo '   -i  install ventoy to sdX (fail if disk already installed with ventoy)'
-    echo '   -I  force install ventoy to sdX (no matter installed or not)'
-    echo '   -u  update ventoy in sdX'
+    echo '   -i  install Ventoy to sdX (fails if disk already installed with Ventoy)'
+    echo '   -I  force install Ventoy to sdX (no matter installed or not)'
+    echo '   -u  update Ventoy in sdX'

     echo '   -l  list Ventoy information in sdX'
     echo ''
     echo '  OPTION: (optional)'
     echo '   -l  list Ventoy information in sdX'
     echo ''
     echo '  OPTION: (optional)'


@@ -96,7 +96,7 @@ vtdebug "MODE=$MODE FORCE=$FORCE RESERVE_SPACE=$RESERVE_SPACE RESERVE_SIZE_MB=$R
 if check_tool_work_ok; then
     vtdebug "check tool work ok"
 else
 if check_tool_work_ok; then
     vtdebug "check tool work ok"
 else

-    vterr "Some tools can not run in current system. Please check log.txt for detail."
+    vterr "Some tools can not run on current system. Please check log.txt for details."

     exit 1
 fi
 
     exit 1
 fi
 


@@ -160,14 +160,14 @@ if [ -d ./tmp_mnt ]; then
     umount ./tmp_mnt >/dev/null 2>&1
     rm -rf ./tmp_mnt
     if [ -d ./tmp_mnt ]; then
     umount ./tmp_mnt >/dev/null 2>&1
     rm -rf ./tmp_mnt
     if [ -d ./tmp_mnt ]; then

-        vterr "tmp_mnt directory exit, please delete it first."
+        vterr "tmp_mnt directory exits, please delete it first."

         exit 1
     fi
 fi
 
 
 if [ "$MODE" = "install" ]; then
         exit 1
     fi
 fi
 
 
 if [ "$MODE" = "install" ]; then

-    vtdebug "install ventoy ..."
+    vtdebug "install Ventoy ..."

 
     if [ -n "$VTGPT" ]; then
         if parted -v > /dev/null 2>&1; then
 
     if [ -n "$VTGPT" ]; then
         if parted -v > /dev/null 2>&1; then


@@ -193,7 +193,7 @@ if [ "$MODE" = "install" ]; then
         if [ -z "$FORCE" ]; then
             vtwarn "$DISK already contains a Ventoy with version $version"
             vtwarn "Use -u option to do a safe upgrade operation."
         if [ -z "$FORCE" ]; then
             vtwarn "$DISK already contains a Ventoy with version $version"
             vtwarn "Use -u option to do a safe upgrade operation."

-            vtwarn "OR if you really want to reinstall ventoy to $DISK, please use -I option."
+            vtwarn "OR if you really want to reinstall Ventoy to $DISK, please use -I option."

             vtwarn ""
             exit 1
         fi
             vtwarn ""
             exit 1
         fi


@@ -366,11 +366,11 @@ if [ "$MODE" = "install" ]; then
     echo ""
     
 else
     echo ""
     
 else

-    vtdebug "update ventoy ..."
+    vtdebug "update Ventoy ..."

     
     oldver=$(get_disk_ventoy_version $DISK)
     if [ $? -ne 0 ]; then
     
     oldver=$(get_disk_ventoy_version $DISK)
     if [ $? -ne 0 ]; then

-        vtwarn "$DISK does not contain ventoy or data corupted"
+        vtwarn "$DISK does not contain Ventoy or data corrupted"

         echo ""
         vtwarn "Please use -i option if you want to install ventoy to $DISK"
         echo ""
         echo ""
         vtwarn "Please use -i option if you want to install ventoy to $DISK"
         echo ""


@@ -481,7 +481,7 @@ else
     fi
 
     echo ""
     fi
 
     echo ""

-    vtinfo "Update Ventoy to $DISK successfully finished."
+    vtinfo "Update Ventoy on $DISK successfully finished."

     echo ""
     
 fi
     echo ""
     
 fi

diff --git a/Ventoy2Disk/Ventoy2Disk/Language.c b/Ventoy2Disk/Ventoy2Disk/Language.c
index 6bc75d69239242ee631aa5d76986dd0d8b5c8672..e8a971242f2146c0b1014822b8fabfd28e688423 100644 (file)
--- a/Ventoy2Disk/Ventoy2Disk/Language.c
+++ b/Ventoy2Disk/Ventoy2Disk/Language.c
@@ -26,3 +26,13 @@ const TCHAR * GetString(enum STR_ID ID)
 {
        return g_cur_lang_data->MsgString[ID];
 };
 {
        return g_cur_lang_data->MsgString[ID];
 };

+
+static const UINT16 g_unicode_icon[UNICODE_BUTT][3] =
+{
+    { 0xD83D, 0xDD12, 0x0000 },
+};
+
+const UINT16 * GetUnicodeIcon(icon)
+{
+    return g_unicode_icon[icon];
+}

diff --git a/Ventoy2Disk/Ventoy2Disk/Language.h b/Ventoy2Disk/Ventoy2Disk/Language.h
index 413299608af698e1b19ecd014ea1f2e708c565b6..144a9b23137c3a2c721fe72479d3e88d35a27ae3 100644 (file)
--- a/Ventoy2Disk/Ventoy2Disk/Language.h
+++ b/Ventoy2Disk/Ventoy2Disk/Language.h
@@ -125,4 +125,13 @@ const TCHAR * GetString(enum STR_ID ID);
 \r
 #define _G(a) GetString(a)\r
 \r
 \r
 #define _G(a) GetString(a)\r
 \r

+typedef enum UNICODE_ICON\r
+{\r
+    UNICODE_LOCK = 0,\r
+    UNICODE_BUTT\r
+}UNICODE_ICON;\r
+\r
+const UINT16 * GetUnicodeIcon(icon);\r
+#define _UICON(i) GetUnicodeIcon(i)\r
+\r

 #endif\r
 #endif\r

diff --git a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
index b863bb173585c1816386e48a4d60892d6690ad5d..768169330d5a9b357523ba698b3741c1f15d6017 100644 (file)
--- a/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
+++ b/Ventoy2Disk/Ventoy2Disk/PhyDrive.c
@@ -1693,7 +1693,7 @@ int InstallVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int PartStyle)
     }\r
 \r
     PROGRESS_BAR_SET_POS(PT_WRITE_STG1_IMG);\r
     }\r
 \r
     PROGRESS_BAR_SET_POS(PT_WRITE_STG1_IMG);\r

-    Log("Writting Boot Image ............................. ");\r
+    Log("Writing Boot Image ............................. ");\r

     if (WriteGrubStage1ToPhyDrive(hDrive, PartStyle) != 0)\r
     {\r
         Log("WriteGrubStage1ToPhyDrive failed.");\r
     if (WriteGrubStage1ToPhyDrive(hDrive, PartStyle) != 0)\r
     {\r
         Log("WriteGrubStage1ToPhyDrive failed.");\r


@@ -1702,7 +1702,7 @@ int InstallVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive, int PartStyle)
     }\r
 \r
     PROGRESS_BAR_SET_POS(PT_WRITE_PART_TABLE);\r
     }\r
 \r
     PROGRESS_BAR_SET_POS(PT_WRITE_PART_TABLE);\r

-    Log("Writting Partition Table ........................ ");\r
+    Log("Writing Partition Table ........................ ");\r

     SetFilePointer(hDrive, 0, NULL, FILE_BEGIN);\r
 \r
     if (PartStyle)\r
     SetFilePointer(hDrive, 0, NULL, FILE_BEGIN);\r
 \r
     if (PartStyle)\r

diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h
index d615e2abb0d22c04210981f0e8ef28453bb642ee..b9a84db4fa90ed933e0c29d9c47125d44f61cb37 100644 (file)
--- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h
+++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h
@@ -231,6 +231,6 @@ UINT32 VentoyCrc32(void *Buffer, UINT32 Length);
     liCurrentPosition.QuadPart = pos; \\r
     SetFilePointerEx(hDrive, liCurrentPosition, &liCurrentPosition, FILE_BEGIN)\\r
 \r
     liCurrentPosition.QuadPart = pos; \\r
     SetFilePointerEx(hDrive, liCurrentPosition, &liCurrentPosition, FILE_BEGIN)\\r
 \r

-#define SECURE_ICON_STRING "*"\r
+#define SECURE_ICON_STRING _UICON(UNICODE_LOCK)\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc
index bb68eb2207377d0ee1c623303b081a4a58cc4282..a5db5c6d5a8065114556d84bcfcede01fa8cc1fb 100644 (file)
Binary files a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc and b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc differ

diff --git a/Ventoy2Disk/Ventoy2Disk/WinDialog.c b/Ventoy2Disk/Ventoy2Disk/WinDialog.c
index 98613fbab6771d86be7fe24e6929a7c8a2326fdc..bec810e8cc5bcea12f86cd4574367a229fe9a688 100644 (file)
Binary files a/Ventoy2Disk/Ventoy2Disk/WinDialog.c and b/Ventoy2Disk/Ventoy2Disk/WinDialog.c differ