From 01292939d3481c6c36a8f3f6b5eaf21a2e4beeb3 Mon Sep 17 00:00:00 2001 From: longpanda Date: Tue, 5 Apr 2022 19:19:06 +0800 Subject: [PATCH] update --- Plugson/src/main_windows.c | 39 +++++----- Vlnk/src/main_windows.c | 147 +++++++++++++++++++------------------ 2 files changed, 94 insertions(+), 92 deletions(-) diff --git a/Plugson/src/main_windows.c b/Plugson/src/main_windows.c index 066eb63..6f74d2b 100644 --- a/Plugson/src/main_windows.c +++ b/Plugson/src/main_windows.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -10,7 +10,7 @@ #include #include -char g_ventoy_dir[MAX_PATH]; +char g_ventoy_dir[MAX_PATH]; static BOOL g_running = FALSE; static HWND g_refresh_button; @@ -44,22 +44,22 @@ typedef enum MSGID const WCHAR *g_msg_cn[MSGID_BUTT] = { - L"´íÎó", - L"ÌáÐÑ", - L"ÇëÔÚ Ventoy Å̸ùĿ¼ÏÂÔËÐб¾³ÌÐò£¡£¨´æ·ÅISOÎļþµÄλÖã©", - L"´´½¨ ventoy Ŀ¼ʧ°Ü£¬ÎÞ·¨¼ÌÐø£¡", - L"ventoy Ŀ¼´æÔÚ£¬µ«ÊÇ´óСд²»Æ¥Å䣬ÇëÏȽ«ÆäÖØÃüÃû£¡", - L"ÄÚ²¿´íÎ󣬳ÌÐò¼´½«Í˳ö£¡", - L"Ë¢ÐÂ", - L"Æô¶¯", - L"Í£Ö¹", - L"Á´½Ó", - L"Í˳ö", - - L"Í£Ö¹ÔËÐкóä¯ÀÀÆ÷Ò³Ã潫»á¹Ø±Õ£¬ÊÇ·ñ¼ÌÐø£¿", - L"µ±Ç°·þÎñÕýÔÚÔËÐУ¬ÊÇ·ñÍ˳ö£¿", - L"ÇëÏȹرÕÕýÔÚÔËÐÐµÄ VentoyPlugson ³ÌÐò£¡", - L"ventoy\\plugson.tar.xz Îļþ²»´æÔÚ£¬ÇëÔÚÕýÈ·µÄĿ¼ÏÂÔËÐУ¡", + L"错误", + L"提醒", + L"请在 Ventoy 盘根目录下运行本程序！（存放ISO文件的位置）", + L"创建 ventoy 目录失败，无法继续！", + L"ventoy 目录存在，但是大小写不匹配，请先将其重命名！", + L"内部错误，程序即将退出！", + L"刷新", + L"启动", + L"停止", + L"链接", + L"退出", + + L"停止运行后浏览器页面将会关闭，是否继续？", + L"当前服务正在运行，是否退出？", + L"请先关闭正在运行的 VentoyPlugson 程序！", + L"ventoy\\plugson.tar.xz 文件不存在，请在正确的目录下运行！", }; const WCHAR *g_msg_en[MSGID_BUTT] = { @@ -93,7 +93,7 @@ void ventoy_log_exit(void); static BOOL OnDestroyDialog() { - ventoy_http_exit(); + ventoy_http_exit(); ventoy_disk_exit(); #ifndef VENTOY_SIM ventoy_www_exit(); @@ -468,6 +468,7 @@ static int ParseCmdLine(LPSTR lpCmdLine, char *ip, char *port) // //copy from Rufus +//Copyright © 2011-2021 Pete Batard // #include // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking. diff --git a/Vlnk/src/main_windows.c b/Vlnk/src/main_windows.c index d2f2c3c..bf9f8af 100644 --- a/Vlnk/src/main_windows.c +++ b/Vlnk/src/main_windows.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -45,24 +45,24 @@ typedef enum MSGID const WCHAR *g_msg_cn[MSGID_BUTT] = { - L"´íÎó", - L"ÌáÐÑ", - L"´´½¨", - L"½âÎö", - L"Ö¸¶¨µÄÎļþ²»´æÔÚ", - L"²»Ö§³ÖΪ´ËÎļþ´´½¨vlnk", - L"²»Ö§³ÖµÄÎļþϵͳ", - L"²»Ö§³ÖµÄÎļþºó׺Ãû", - L"»ñÈ¡´ÅÅÌÐÅϢʱ·¢Éú´íÎó", - L"Vlnk Îļþ´´½¨³É¹¦¡£", - L"ÇëÏȹرÕÕýÔÚÔËÐÐµÄ VentoyVlnk ³ÌÐò£¡", - L"´´½¨Îļþʧ°Ü", - L"´ËÎļþÒѾ­ÊÇÒ»¸övlnkÎļþÁË£¡", - L"·Ç·¨µÄvlnkÎļþ!", - L"´Ë vlnk ÎļþÖ¸Ïò ", - L"´Ë vlnk Ö¸ÏòµÄÎļþ²»´æÔÚ£¡", - L"Îļþ·¾¶Ì«³¤£¡", - L"·Ç·¨µÄvlnkÎļþºó׺Ãû!", + L"错误", + L"提醒", + L"创建", + L"解析", + L"指定的文件不存在", + L"不支持为此文件创建vlnk", + L"不支持的文件系统", + L"不支持的文件后缀名", + L"获取磁盘信息时发生错误", + L"Vlnk 文件创建成功。", + L"请先关闭正在运行的 VentoyVlnk 程序！", + L"创建文件失败", + L"此文件已经是一个vlnk文件了！", + L"非法的vlnk文件!", + L"æ­¤ vlnk 文件指向 ", + L"æ­¤ vlnk 指向的文件不存在！", + L"文件路径太长！", + L"非法的vlnk文件后缀名!", }; const WCHAR *g_msg_en[MSGID_BUTT] = { @@ -105,62 +105,62 @@ static int VtoyMessageBox return MessageBox(hWnd, lpText, lpCaption, uType); } - -static void Log2File(const char *log) -{ - time_t stamp; - struct tm ttm; - FILE *fp; - - time(&stamp); - localtime_s(&ttm, &stamp); - - fopen_s(&fp, g_LogFile, "a+"); - if (fp) - { - fprintf_s(fp, "[%04u/%02u/%02u %02u:%02u:%02u] %s", - ttm.tm_year + 1900, ttm.tm_mon + 1, ttm.tm_mday, - ttm.tm_hour, ttm.tm_min, ttm.tm_sec, log); - fclose(fp); - } -} - -void LogW(const WCHAR *Fmt, ...) -{ - WCHAR log[512]; - CHAR alog[2048]; - va_list arg; - - if (g_LogFile[0] == 0) - { - return; - } - - va_start(arg, Fmt); - vswprintf_s(log, 512, Fmt, arg); - va_end(arg); - - WideCharToMultiByte(CP_UTF8, 0, log, -1, alog, 2048, 0, 0); - - Log2File(alog); + +static void Log2File(const char *log) +{ + time_t stamp; + struct tm ttm; + FILE *fp; + + time(&stamp); + localtime_s(&ttm, &stamp); + + fopen_s(&fp, g_LogFile, "a+"); + if (fp) + { + fprintf_s(fp, "[%04u/%02u/%02u %02u:%02u:%02u] %s", + ttm.tm_year + 1900, ttm.tm_mon + 1, ttm.tm_mday, + ttm.tm_hour, ttm.tm_min, ttm.tm_sec, log); + fclose(fp); + } +} + +void LogW(const WCHAR *Fmt, ...) +{ + WCHAR log[512]; + CHAR alog[2048]; + va_list arg; + + if (g_LogFile[0] == 0) + { + return; + } + + va_start(arg, Fmt); + vswprintf_s(log, 512, Fmt, arg); + va_end(arg); + + WideCharToMultiByte(CP_UTF8, 0, log, -1, alog, 2048, 0, 0); + + Log2File(alog); } - -void LogA(const CHAR *Fmt, ...) -{ - CHAR log[512]; - va_list arg; - - if (g_LogFile[0] == 0) - { - return; - } - - va_start(arg, Fmt); - vsprintf_s(log, 512, Fmt, arg); - va_end(arg); - - Log2File(log); + +void LogA(const CHAR *Fmt, ...) +{ + CHAR log[512]; + va_list arg; + + if (g_LogFile[0] == 0) + { + return; + } + + va_start(arg, Fmt); + vsprintf_s(log, 512, Fmt, arg); + va_end(arg); + + Log2File(log); } static int Utf8ToUtf16(const char* src, WCHAR * dst) @@ -834,6 +834,7 @@ static int ParseCmdLine(LPSTR lpCmdLine) // //copy from Rufus +//Copyright © 2011-2021 Pete Batard // #include // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking. -- 2.47.3