X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/293f677cbfbaae984fc3063c62d4b9afa0067520..c6008be3944525591df7b08939afdbbb3609bdfd:/Plugson/src/main_windows.c

diff --git a/Plugson/src/main_windows.c b/Plugson/src/main_windows.c
index 67d6ee0..6f74d2b 100644
--- a/Plugson/src/main_windows.c
+++ b/Plugson/src/main_windows.c
@@ -1,4 +1,4 @@
-#include <Windows.h>
+#include <Windows.h>
 #include <Shlobj.h>
 #include <tlhelp32.h>
 #include <Psapi.h>
@@ -10,7 +10,7 @@
 #include <ventoy_disk.h>
 #include <ventoy_http.h>
 
-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();
@@ -464,13 +464,71 @@ static int ParseCmdLine(LPSTR lpCmdLine, char *ip, char *port)
 	return 0;
 }
 
+
+
+//
+//copy from Rufus
+//Copyright © 2011-2021 Pete Batard <pete@akeo.ie>
+//
+#include <delayimp.h>
+// For delay-loaded DLLs, use LOAD_LIBRARY_SEARCH_SYSTEM32 to avoid DLL search order hijacking.
+FARPROC WINAPI dllDelayLoadHook(unsigned dliNotify, PDelayLoadInfo pdli)
+{
+	if (dliNotify == dliNotePreLoadLibrary) {
+		// Windows 7 without KB2533623 does not support the LOAD_LIBRARY_SEARCH_SYSTEM32 flag.
+		// That is is OK, because the delay load handler will interrupt the NULL return value
+		// to mean that it should perform a normal LoadLibrary.
+		return (FARPROC)LoadLibraryExA(pdli->szDll, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+	}
+	return NULL;
+}
+
+#if defined(_MSC_VER)
+// By default the Windows SDK headers have a `const` while MinGW does not.
+const
+#endif
+PfnDliHook __pfnDliNotifyHook2 = dllDelayLoadHook;
+
+typedef BOOL(WINAPI* SetDefaultDllDirectories_t)(DWORD);
+static void DllProtect(void)
+{
+	SetDefaultDllDirectories_t pfSetDefaultDllDirectories = NULL;
+
+	// Disable loading system DLLs from the current directory (sideloading mitigation)
+	// PS: You know that official MSDN documentation for SetDllDirectory() that explicitly
+	// indicates that "If the parameter is an empty string (""), the call removes the current
+	// directory from the default DLL search order"? Yeah, that doesn't work. At all.
+	// Still, we invoke it, for platforms where the following call might actually work...
+	SetDllDirectoryA("");
+
+	// For libraries on the KnownDLLs list, the system will always load them from System32.
+	// For other DLLs we link directly to, we can delay load the DLL and use a delay load
+	// hook to load them from System32. Note that, for this to work, something like:
+	// 'somelib.dll;%(DelayLoadDLLs)' must be added to the 'Delay Loaded Dlls' option of
+	// the linker properties in Visual Studio (which means this won't work with MinGW).
+	// For all other DLLs, use SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32).
+	// Finally, we need to perform the whole gymkhana below, where we can't call on
+	// SetDefaultDllDirectories() directly, because Windows 7 doesn't have the API exposed.
+	// Also, no, Coverity, we never need to care about freeing kernel32 as a library.
+	// coverity[leaked_storage]
+
+	pfSetDefaultDllDirectories = (SetDefaultDllDirectories_t)
+		GetProcAddress(LoadLibraryW(L"kernel32.dll"), "SetDefaultDllDirectories");
+	if (pfSetDefaultDllDirectories != NULL)
+		pfSetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32);
+}
+
+
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, INT nCmdShow)
 {
     int rc;
 	HANDLE hMutex;
+	WCHAR CurDir[MAX_PATH];
 
     UNREFERENCED_PARAMETER(hPrevInstance);
 
+	DllProtect();
+
     if (GetUserDefaultUILanguage() == 0x0804)
     {
         g_sysinfo.language = LANGUAGE_CN;
@@ -489,7 +547,9 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 		return 1;
 	}
 
-	GetCurrentDirectoryA(MAX_PATH, g_cur_dir);
+	GetCurrentDirectoryW(MAX_PATH, CurDir);
+	WideCharToMultiByte(CP_UTF8, 0, CurDir, -1, g_cur_dir, MAX_PATH, NULL, 0);
+
 	sprintf_s(g_ventoy_dir, sizeof(g_ventoy_dir), "%s", g_cur_dir);
 	sprintf_s(g_log_file, sizeof(g_log_file), "%s\\%s", g_cur_dir, LOG_FILE);
 	ventoy_log_init();