From: longpanda Date: Thu, 25 Feb 2021 13:03:56 +0000 (+0800) Subject: Ventoy2Disk.exe add a star to identify secure boot X-Git-Tag: v1.0.36~5 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/7279ba9bc82b02f102e59f4f2f974dace14b93ff Ventoy2Disk.exe add a star to identify secure boot --- diff --git a/INSTALL/Ventoy2Disk.exe b/INSTALL/Ventoy2Disk.exe index 8aa71d6..032375b 100644 Binary files a/INSTALL/Ventoy2Disk.exe and b/INSTALL/Ventoy2Disk.exe differ diff --git a/Ventoy2Disk/Ventoy2Disk/Language.h b/Ventoy2Disk/Ventoy2Disk/Language.h index 4ab1384..4132996 100644 --- a/Ventoy2Disk/Ventoy2Disk/Language.h +++ b/Ventoy2Disk/Ventoy2Disk/Language.h @@ -1,127 +1,128 @@ -/****************************************************************************** - * Language.h - * - * Copyright (c) 2020, longpanda - * - * This program 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. - * - * This program 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 this program; if not, see . - * - */ - -#ifndef __LANGUAGE_H__ -#define __LANGUAGE_H__ - - -typedef enum STR_ID -{ - STR_ERROR = 0, - STR_WARNING, // 1 - STR_INFO, // 2 - STR_INCORRECT_DIR, //3 - STR_INCORRECT_TREE_DIR, //4 - - STR_DEVICE, //5 - STR_LOCAL_VER, //6 - STR_DISK_VER, //7 - STR_STATUS, //8 - STR_INSTALL, //9 - STR_UPDATE, //10 - - STR_UPDATE_TIP, //11 - STR_INSTALL_TIP, //12 - STR_INSTALL_TIP2,//13 - - STR_INSTALL_SUCCESS,//14 - STR_INSTALL_FAILED,//15 - STR_UPDATE_SUCCESS,//16 - STR_UPDATE_FAILED,//17 - - STR_WAIT_PROCESS,//18 - - STR_MENU_OPTION,//19 - STR_MENU_SECURE_BOOT,//20 - - STR_MENU_PART_CFG,//21 - STR_BTN_OK,//22 - STR_BTN_CANCEL,//23 - STR_PRESERVE_SPACE,//24 - STR_SPACE_VAL_INVALID,//25 - - STR_MENU_CLEAR, //26 - STR_CLEAR_SUCCESS, //27 - STR_CLEAR_FAILED, //28 - STR_MENU_PART_STYLE, //29 - STR_DISK_2TB_MBR_ERROR,//30 - - STR_SHOW_ALL_DEV, //31 - STR_PART_ALIGN_4KB, //32 - STR_WEB_COMMUNICATION_ERR, //33 - STR_WEB_REMOTE_ABNORMAL, //34 - STR_WEB_REQUEST_TIMEOUT, //35 - STR_WEB_SERVICE_UNAVAILABLE, //36 - STR_WEB_TOKEN_MISMATCH, //37 - - STR_ID_MAX -}STR_ID; - -extern BOOL g_SecureBoot; - -#define VTOY_MENU_SECURE_BOOT 0xA000 -#define VTOY_MENU_PART_CFG 0xA001 -#define VTOY_MENU_CLEAN 0xA002 -#define VTOY_MENU_PART_STYLE 0xA003 -#define VTOY_MENU_PART_MBR 0xA004 -#define VTOY_MENU_PART_GPT 0xA005 -#define VTOY_MENU_ALL_DEV 0xA006 - - -typedef enum OPT_SUBMENU -{ - OPT_SUBMENU_SECURE_BOOT = 0, - OPT_SUBMENU_PART_STYLE, - OPT_SUBMENU_PART_CFG, - OPT_SUBMENU_CLEAR, - OPT_SUBMENU_ALL_DEV, - - OPT_SUBMENU_MAX -}OPT_SUBMENU; - - -#define VTOY_MENU_LANGUAGE_BEGIN 0xB000 - - -#define VENTOY_LANGUAGE_INI TEXT(".\\ventoy\\languages.ini") -#define VENTOY_CFG_INI TEXT(".\\Ventoy2Disk.ini") -#define VENTOY_CFG_INI_A ".\\Ventoy2Disk.ini" -#define VENTOY_MAX_LANGUAGE 200 - -#define GET_INI_STRING(Section, Key, Buf) GetPrivateProfileString(Section, Key, TEXT("#"), Buf, sizeof(Buf), VENTOY_LANGUAGE_INI) - -typedef struct VENTOY_LANGUAGE -{ - WCHAR Name[128]; - WCHAR FontFamily[64]; - int FontSize; - - WCHAR StrId[STR_ID_MAX][64]; - WCHAR MsgString[STR_ID_MAX][1024]; - -}VENTOY_LANGUAGE; - -extern VENTOY_LANGUAGE *g_cur_lang_data; - -const TCHAR * GetString(enum STR_ID ID); - -#define _G(a) GetString(a) - -#endif +/****************************************************************************** + * Language.h + * + * Copyright (c) 2020, longpanda + * + * This program 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. + * + * This program 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 this program; if not, see . + * + */ + +#ifndef __LANGUAGE_H__ +#define __LANGUAGE_H__ + + +typedef enum STR_ID +{ + STR_ERROR = 0, + STR_WARNING, // 1 + STR_INFO, // 2 + STR_INCORRECT_DIR, //3 + STR_INCORRECT_TREE_DIR, //4 + + STR_DEVICE, //5 + STR_LOCAL_VER, //6 + STR_DISK_VER, //7 + STR_STATUS, //8 + STR_INSTALL, //9 + STR_UPDATE, //10 + + STR_UPDATE_TIP, //11 + STR_INSTALL_TIP, //12 + STR_INSTALL_TIP2,//13 + + STR_INSTALL_SUCCESS,//14 + STR_INSTALL_FAILED,//15 + STR_UPDATE_SUCCESS,//16 + STR_UPDATE_FAILED,//17 + + STR_WAIT_PROCESS,//18 + + STR_MENU_OPTION,//19 + STR_MENU_SECURE_BOOT,//20 + + STR_MENU_PART_CFG,//21 + STR_BTN_OK,//22 + STR_BTN_CANCEL,//23 + STR_PRESERVE_SPACE,//24 + STR_SPACE_VAL_INVALID,//25 + + STR_MENU_CLEAR, //26 + STR_CLEAR_SUCCESS, //27 + STR_CLEAR_FAILED, //28 + STR_MENU_PART_STYLE, //29 + STR_DISK_2TB_MBR_ERROR,//30 + + STR_SHOW_ALL_DEV, //31 + STR_PART_ALIGN_4KB, //32 + STR_WEB_COMMUNICATION_ERR, //33 + STR_WEB_REMOTE_ABNORMAL, //34 + STR_WEB_REQUEST_TIMEOUT, //35 + STR_WEB_SERVICE_UNAVAILABLE, //36 + STR_WEB_TOKEN_MISMATCH, //37 + STR_WEB_SERVICE_BUSY, //38 + + STR_ID_MAX +}STR_ID; + +extern BOOL g_SecureBoot; + +#define VTOY_MENU_SECURE_BOOT 0xA000 +#define VTOY_MENU_PART_CFG 0xA001 +#define VTOY_MENU_CLEAN 0xA002 +#define VTOY_MENU_PART_STYLE 0xA003 +#define VTOY_MENU_PART_MBR 0xA004 +#define VTOY_MENU_PART_GPT 0xA005 +#define VTOY_MENU_ALL_DEV 0xA006 + + +typedef enum OPT_SUBMENU +{ + OPT_SUBMENU_SECURE_BOOT = 0, + OPT_SUBMENU_PART_STYLE, + OPT_SUBMENU_PART_CFG, + OPT_SUBMENU_CLEAR, + OPT_SUBMENU_ALL_DEV, + + OPT_SUBMENU_MAX +}OPT_SUBMENU; + + +#define VTOY_MENU_LANGUAGE_BEGIN 0xB000 + + +#define VENTOY_LANGUAGE_INI TEXT(".\\ventoy\\languages.ini") +#define VENTOY_CFG_INI TEXT(".\\Ventoy2Disk.ini") +#define VENTOY_CFG_INI_A ".\\Ventoy2Disk.ini" +#define VENTOY_MAX_LANGUAGE 200 + +#define GET_INI_STRING(Section, Key, Buf) GetPrivateProfileString(Section, Key, TEXT("#"), Buf, sizeof(Buf), VENTOY_LANGUAGE_INI) + +typedef struct VENTOY_LANGUAGE +{ + WCHAR Name[128]; + WCHAR FontFamily[64]; + int FontSize; + + WCHAR StrId[STR_ID_MAX][64]; + WCHAR MsgString[STR_ID_MAX][1024]; + +}VENTOY_LANGUAGE; + +extern VENTOY_LANGUAGE *g_cur_lang_data; + +const TCHAR * GetString(enum STR_ID ID); + +#define _G(a) GetString(a) + +#endif diff --git a/Ventoy2Disk/Ventoy2Disk/PartDialog.c b/Ventoy2Disk/Ventoy2Disk/PartDialog.c index 429252a..8375140 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/PartDialog.c and b/Ventoy2Disk/Ventoy2Disk/PartDialog.c differ diff --git a/Ventoy2Disk/Ventoy2Disk/Res/secure.ico b/Ventoy2Disk/Ventoy2Disk/Res/secure.ico new file mode 100644 index 0000000..ae05822 Binary files /dev/null and b/Ventoy2Disk/Ventoy2Disk/Res/secure.ico differ diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h index 1531418..d615e2a 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.h @@ -231,5 +231,6 @@ UINT32 VentoyCrc32(void *Buffer, UINT32 Length); liCurrentPosition.QuadPart = pos; \ SetFilePointerEx(hDrive, liCurrentPosition, &liCurrentPosition, FILE_BEGIN)\ +#define SECURE_ICON_STRING "*" #endif diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc index 8382171..bb68eb2 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc and b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.rc differ diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj index 821d13e..7824269 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj @@ -140,6 +140,7 @@ + diff --git a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters index 1eac7fb..a4dede7 100644 --- a/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters +++ b/Ventoy2Disk/Ventoy2Disk/Ventoy2Disk.vcxproj.filters @@ -153,5 +153,8 @@ 资源文件 + + 资源文件 + \ No newline at end of file diff --git a/Ventoy2Disk/Ventoy2Disk/WinDialog.c b/Ventoy2Disk/Ventoy2Disk/WinDialog.c index d82253e..98613fb 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/WinDialog.c and b/Ventoy2Disk/Ventoy2Disk/WinDialog.c differ diff --git a/Ventoy2Disk/Ventoy2Disk/resource.h b/Ventoy2Disk/Ventoy2Disk/resource.h index f65e064..34c5ecd 100644 Binary files a/Ventoy2Disk/Ventoy2Disk/resource.h and b/Ventoy2Disk/Ventoy2Disk/resource.h differ