diff --git a/Plugson/src/main_windows.c b/Plugson/src/main_windows.c index 066eb63b..6f74d2b7 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 d2f2c3c2..bf9f8af4 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.