update

diff --git a/Plugson/src/main_windows.c b/Plugson/src/main_windows.c
index 066eb63bfd9784d912303d2ef733cc82a9ce5040..6f74d2b713e9fde402ed426afd7368f936a2db4f 100644 (file)
--- a/Plugson/src/main_windows.c
+++ b/Plugson/src/main_windows.c
@@ -1,4 +1,4 @@
-#include <Windows.h>\r
+#include <Windows.h>\r

 #include <Shlobj.h>\r
 #include <tlhelp32.h>\r
 #include <Psapi.h>\r
 #include <Shlobj.h>\r
 #include <tlhelp32.h>\r
 #include <Psapi.h>\r


@@ -10,7 +10,7 @@
 #include <ventoy_disk.h>\r
 #include <ventoy_http.h>\r
 \r
 #include <ventoy_disk.h>\r
 #include <ventoy_http.h>\r
 \r

-char g_ventoy_dir[MAX_PATH];
+char g_ventoy_dir[MAX_PATH];\r

 \r
 static BOOL g_running = FALSE;\r
 static HWND g_refresh_button;\r
 \r
 static BOOL g_running = FALSE;\r
 static HWND g_refresh_button;\r


@@ -44,22 +44,22 @@ typedef enum MSGID
 \r
 const WCHAR *g_msg_cn[MSGID_BUTT] =\r
 {\r
 \r
 const WCHAR *g_msg_cn[MSGID_BUTT] =\r
 {\r

-    L"´íÎó",\r
-       L"ÌáÐÑ",\r
-    L"ÇëÔÚ Ventoy Å̸ùĿ¼ÏÂÔËÐб¾³ÌÐò£¡£¨´æ·ÅISOÎļþµÄλÖã©",\r
-       L"´´½¨ ventoy Ŀ¼ʧ°Ü£¬ÎÞ·¨¼ÌÐø£¡",\r
-       L"ventoy Ŀ¼´æÔÚ£¬µ«ÊÇ´óСд²»Æ¥Å䣬ÇëÏȽ«ÆäÖØÃüÃû£¡",\r
-       L"ÄÚ²¿´íÎ󣬳ÌÐò¼´½«Í˳ö£¡",\r
-       L"Ë¢ÐÂ",\r
-       L"Æô¶¯",\r
-       L"ֹͣ",\r
-       L"Á´½Ó",\r
-       L"Í˳ö",\r
-\r
-       L"Í£Ö¹ÔËÐкóä¯ÀÀÆ÷Ò³Ã潫»á¹Ø±Õ£¬ÊÇ·ñ¼ÌÐø£¿",\r
-       L"µ±Ç°·þÎñÕýÔÚÔËÐУ¬ÊÇ·ñÍ˳ö£¿",\r
-       L"ÇëÏȹرÕÕýÔÚÔËÐÐµÄ VentoyPlugson ³ÌÐò£¡",\r
-       L"ventoy\\plugson.tar.xz Îļþ²»´æÔÚ£¬ÇëÔÚÕýÈ·µÄĿ¼ÏÂÔËÐУ¡",\r
+    L"错误",\r
+       L"提醒",\r
+    L"请在 Ventoy 盘根目录下运行本程序！（存放ISO文件的位置）",\r
+       L"创建 ventoy 目录失败，无法继续！",\r
+       L"ventoy 目录存在，但是大小写不匹配，请先将其重命名！",\r
+       L"内部错误，程序即将退出！",\r
+       L"刷新",\r
+       L"启动",\r
+       L"停止",\r
+       L"链接",\r
+       L"退出",\r
+\r
+       L"停止运行后浏览器页面将会关闭，是否继续？",\r
+       L"当前服务正在运行，是否退出？",\r
+       L"请先关闭正在运行的 VentoyPlugson 程序！",\r
+       L"ventoy\\plugson.tar.xz 文件不存在，请在正确的目录下运行！",\r

 };\r
 const WCHAR *g_msg_en[MSGID_BUTT] =\r
 {\r
 };\r
 const WCHAR *g_msg_en[MSGID_BUTT] =\r
 {\r


@@ -93,7 +93,7 @@ void ventoy_log_exit(void);
 \r
 static BOOL OnDestroyDialog()\r
 {    \r
 \r
 static BOOL OnDestroyDialog()\r
 {    \r

-    ventoy_http_exit();
+    ventoy_http_exit();\r

     ventoy_disk_exit();\r
 #ifndef VENTOY_SIM        \r
     ventoy_www_exit();\r
     ventoy_disk_exit();\r
 #ifndef VENTOY_SIM        \r
     ventoy_www_exit();\r


@@ -468,6 +468,7 @@ static int ParseCmdLine(LPSTR lpCmdLine, char *ip, char *port)
 \r
 //\r
 //copy from Rufus\r
 \r
 //\r
 //copy from Rufus\r

+//Copyright © 2011-2021 Pete Batard <pete@akeo.ie>\r

 //\r
 #include <delayimp.h>\r
 // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking.\r
 //\r
 #include <delayimp.h>\r
 // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking.\r

diff --git a/Vlnk/src/main_windows.c b/Vlnk/src/main_windows.c
index d2f2c3c2b1795fe8954461264d69a048eed8a773..bf9f8af402a0acfc9432e63e72e85b9b26b3cb49 100644 (file)
--- a/Vlnk/src/main_windows.c
+++ b/Vlnk/src/main_windows.c
@@ -1,4 +1,4 @@
-#include <Windows.h>\r
+#include <Windows.h>\r

 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r


@@ -45,24 +45,24 @@ typedef enum MSGID
 \r
 const WCHAR *g_msg_cn[MSGID_BUTT] =\r
 {\r
 \r
 const WCHAR *g_msg_cn[MSGID_BUTT] =\r
 {\r

-    L"´íÎó",\r
-       L"ÌáÐÑ",\r
-       L"´´½¨",\r
-       L"½âÎö",        \r
-    L"Ö¸¶¨µÄÎļþ²»´æÔÚ", \r
-    L"²»Ö§³ÖΪ´ËÎļþ´´½¨vlnk",\r
-    L"²»Ö§³ÖµÄÎļþϵͳ",\r
-    L"²»Ö§³ÖµÄÎļþºó׺Ãû",\r
-    L"»ñÈ¡´ÅÅÌÐÅϢʱ·¢Éú´íÎó",\r
-    L"Vlnk Îļþ´´½¨³É¹¦¡£",\r
-    L"ÇëÏȹرÕÕýÔÚÔËÐÐµÄ VentoyVlnk ³ÌÐò£¡",\r
-    L"´´½¨Îļþʧ°Ü",\r
-    L"´ËÎļþÒѾ­ÊÇÒ»¸övlnkÎļþÁË£¡",\r
-    L"·Ç·¨µÄvlnkÎļþ!",\r
-    L"´Ë vlnk ÎļþÖ¸Ïò ",\r
-    L"´Ë vlnk Ö¸ÏòµÄÎļþ²»´æÔÚ£¡",\r
-    L"Îļþ·¾¶Ì«³¤£¡",\r
-    L"·Ç·¨µÄvlnkÎļþºó׺Ãû!",\r
+    L"错误",\r
+       L"提醒",\r
+       L"创建",\r
+       L"解析",      \r
+    L"指定的文件不存在", \r
+    L"不支持为此文件创建vlnk",\r
+    L"不支持的文件系统",\r
+    L"不支持的文件后缀名",\r
+    L"获取磁盘信息时发生错误",\r
+    L"Vlnk 文件创建成功。",\r
+    L"请先关闭正在运行的 VentoyVlnk 程序！",\r
+    L"创建文件失败",\r
+    L"此文件已经是一个vlnk文件了！",\r
+    L"非法的vlnk文件!",\r
+    L"此 vlnk 文件指向 ",\r
+    L"此 vlnk 指向的文件不存在！",\r
+    L"文件路径太长！",\r
+    L"非法的vlnk文件后缀名!",\r

 };\r
 const WCHAR *g_msg_en[MSGID_BUTT] =\r
 {\r
 };\r
 const WCHAR *g_msg_en[MSGID_BUTT] =\r
 {\r


@@ -105,62 +105,62 @@ static int VtoyMessageBox
 \r
     return MessageBox(hWnd, lpText, lpCaption, uType);\r
 }\r
 \r
     return MessageBox(hWnd, lpText, lpCaption, uType);\r
 }\r

-
-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);
+\r
+static void Log2File(const char *log)\r
+{\r
+    time_t stamp;\r
+    struct tm ttm;\r
+    FILE *fp;\r
+\r
+    time(&stamp);\r
+    localtime_s(&ttm, &stamp);\r
+\r
+    fopen_s(&fp, g_LogFile, "a+");\r
+    if (fp)\r
+    {\r
+        fprintf_s(fp, "[%04u/%02u/%02u %02u:%02u:%02u] %s",\r
+            ttm.tm_year + 1900, ttm.tm_mon + 1, ttm.tm_mday,\r
+            ttm.tm_hour, ttm.tm_min, ttm.tm_sec, log);\r
+        fclose(fp);\r
+    }\r
+}\r
+\r
+void LogW(const WCHAR *Fmt, ...)\r
+{\r
+    WCHAR log[512];\r
+    CHAR  alog[2048];\r
+    va_list arg;\r
+\r
+    if (g_LogFile[0] == 0)\r
+    {\r
+        return;\r
+    }\r
+\r
+    va_start(arg, Fmt);\r
+    vswprintf_s(log, 512, Fmt, arg);\r
+    va_end(arg);\r
+\r
+    WideCharToMultiByte(CP_UTF8, 0, log, -1, alog, 2048, 0, 0);\r
+\r
+    Log2File(alog);\r

 }\r
 \r
 }\r
 \r

-
-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);
+\r
+void LogA(const CHAR *Fmt, ...)\r
+{\r
+    CHAR log[512];\r
+    va_list arg;\r
+\r
+    if (g_LogFile[0] == 0)\r
+    {\r
+        return;\r
+    }\r
+\r
+    va_start(arg, Fmt);\r
+    vsprintf_s(log, 512, Fmt, arg);\r
+    va_end(arg);\r
+\r
+    Log2File(log);\r

 }\r
 \r
 static int Utf8ToUtf16(const char* src, WCHAR * dst)\r
 }\r
 \r
 static int Utf8ToUtf16(const char* src, WCHAR * dst)\r


@@ -834,6 +834,7 @@ static int ParseCmdLine(LPSTR lpCmdLine)
 \r
 //\r
 //copy from Rufus\r
 \r
 //\r
 //copy from Rufus\r

+//Copyright © 2011-2021 Pete Batard <pete@akeo.ie>\r

 //\r
 #include <delayimp.h>\r
 // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking.\r
 //\r
 #include <delayimp.h>\r
 // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking.\r