MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update

This commit is contained in:
longpanda 2022-04-05 19:19:06 +08:00
parent dcc5889677
commit 01292939d3
2 changed files with 93 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Plugson/src/main_windows.c
View File

@ -1,4 +1,4 @@
#include <Windows.h> #include <Windows.h>
#include <Shlobj.h> #include <Shlobj.h>
#include <tlhelp32.h> #include <tlhelp32.h>
#include <Psapi.h> #include <Psapi.h>
@ -10,7 +10,7 @@
#include <ventoy_disk.h> #include <ventoy_disk.h>
#include <ventoy_http.h> #include <ventoy_http.h>
char g_ventoy_dir[MAX_PATH]; char g_ventoy_dir[MAX_PATH];
static BOOL g_running = FALSE; static BOOL g_running = FALSE;
static HWND g_refresh_button; static HWND g_refresh_button;
@ -44,22 +44,22 @@ typedef enum MSGID
const WCHAR *g_msg_cn[MSGID_BUTT] = const WCHAR *g_msg_cn[MSGID_BUTT] =
{ {
L"错误", L"错误",
L"提醒", L"提醒",
L"请在 Ventoy 盘根目录下运行本程序！（存放ISO文件的位置）", L"请在 Ventoy 盘根目录下运行本程序！（存放ISO文件的位置）",
L"创建 ventoy 目录失败，无法继续！", L"创建 ventoy 目录失败，无法继续！",
L"ventoy 目录存在，但是大小写不匹配，请先将其重命名！", L"ventoy 目录存在，但是大小写不匹配，请先将其重命名！",
L"内部错误，程序即将退出！", L"内部错误，程序即将退出！",
L"刷新", L"刷新",
L"启动", L"启动",
L"停止", L"停止",
L"链接", L"链接",
L"退出", L"退出",
L"停止运行后浏览器页面将会关闭，是否继续？", L"停止运行后浏览器页面将会关闭，是否继续？",
L"当前服务正在运行，是否退出？", L"当前服务正在运行，是否退出？",
L"请先关闭正在运行的 VentoyPlugson 程序！", L"请先关闭正在运行的 VentoyPlugson 程序！",
L"ventoy\\plugson.tar.xz 文件不存在，请在正确的目录下运行！", L"ventoy\\plugson.tar.xz 文件不存在，请在正确的目录下运行！",
}; };
const WCHAR *g_msg_en[MSGID_BUTT] = const WCHAR *g_msg_en[MSGID_BUTT] =
{ {
@ -93,7 +93,7 @@ void ventoy_log_exit(void);
static BOOL OnDestroyDialog() static BOOL OnDestroyDialog()
{ {
ventoy_http_exit(); ventoy_http_exit();
ventoy_disk_exit(); ventoy_disk_exit();
#ifndef VENTOY_SIM #ifndef VENTOY_SIM
ventoy_www_exit(); ventoy_www_exit();
@ -468,6 +468,7 @@ static int ParseCmdLine(LPSTR lpCmdLine, char *ip, char *port)
// //
//copy from Rufus //copy from Rufus
//Copyright © 2011-2021 Pete Batard <pete@akeo.ie>
// //
#include <delayimp.h> #include <delayimp.h>
// For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking. // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking.

147
Vlnk/src/main_windows.c
View File

@ -1,4 +1,4 @@
#include <Windows.h> #include <Windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -45,24 +45,24 @@ typedef enum MSGID
const WCHAR *g_msg_cn[MSGID_BUTT] = const WCHAR *g_msg_cn[MSGID_BUTT] =
{ {
L"错误", L"错误",
L"提醒", L"提醒",
L"创建", L"创建",
L"解析", L"解析",
L"指定的文件不存在", L"指定的文件不存在",
L"不支持为此文件创建vlnk", L"不支持为此文件创建vlnk",
L"不支持的文件系统", L"不支持的文件系统",
L"不支持的文件后缀名", L"不支持的文件后缀名",
L"获取磁盘信息时发生错误", L"获取磁盘信息时发生错误",
L"Vlnk 文件创建成功。", L"Vlnk 文件创建成功。",
L"请先关闭正在运行的 VentoyVlnk 程序！", L"请先关闭正在运行的 VentoyVlnk 程序！",
L"创建文件失败", L"创建文件失败",
L"此文件已经是一个vlnk文件了！", L"此文件已经是一个vlnk文件了！",
L"非法的vlnk文件!", L"非法的vlnk文件!",
L"此 vlnk 文件指向 ", L"此 vlnk 文件指向 ",
L"此 vlnk 指向的文件不存在！", L"此 vlnk 指向的文件不存在！",
L"文件路径太长！", L"文件路径太长！",
L"非法的vlnk文件后缀名!", L"非法的vlnk文件后缀名!",
}; };
const WCHAR *g_msg_en[MSGID_BUTT] = const WCHAR *g_msg_en[MSGID_BUTT] =
{ {
@ -105,62 +105,62 @@ static int VtoyMessageBox
return MessageBox(hWnd, lpText, lpCaption, uType); return MessageBox(hWnd, lpText, lpCaption, uType);
} }
static void Log2File(const char *log) static void Log2File(const char *log)
{ {
time_t stamp; time_t stamp;
struct tm ttm; struct tm ttm;
FILE *fp; FILE *fp;
time(&stamp); time(&stamp);
localtime_s(&ttm, &stamp); localtime_s(&ttm, &stamp);
fopen_s(&fp, g_LogFile, "a+"); fopen_s(&fp, g_LogFile, "a+");
if (fp) if (fp)
{ {
fprintf_s(fp, "[%04u/%02u/%02u %02u:%02u:%02u] %s", fprintf_s(fp, "[%04u/%02u/%02u %02u:%02u:%02u] %s",
ttm.tm_year + 1900, ttm.tm_mon + 1, ttm.tm_mday, ttm.tm_year + 1900, ttm.tm_mon + 1, ttm.tm_mday,
ttm.tm_hour, ttm.tm_min, ttm.tm_sec, log); ttm.tm_hour, ttm.tm_min, ttm.tm_sec, log);
fclose(fp); 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 LogW(const WCHAR *Fmt, ...)
void LogA(const CHAR *Fmt, ...) {
{ WCHAR log[512];
CHAR log[512]; CHAR alog[2048];
va_list arg; va_list arg;
if (g_LogFile[0] == 0) if (g_LogFile[0] == 0)
{ {
return; return;
} }
va_start(arg, Fmt); va_start(arg, Fmt);
vsprintf_s(log, 512, Fmt, arg); vswprintf_s(log, 512, Fmt, arg);
va_end(arg); va_end(arg);
Log2File(log); 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);
} }
static int Utf8ToUtf16(const char* src, WCHAR * dst) static int Utf8ToUtf16(const char* src, WCHAR * dst)
@ -834,6 +834,7 @@ static int ParseCmdLine(LPSTR lpCmdLine)
// //
//copy from Rufus //copy from Rufus
//Copyright © 2011-2021 Pete Batard <pete@akeo.ie>
// //
#include <delayimp.h> #include <delayimp.h>
// For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking. // For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking.