winwrap更新

ePi5131 · Jul 23, 2023 · 33dddfa · 33dddfa
1 parent daf519b
commit 33dddfa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/patch/global_minimum.hpp b/patch/global_minimum.hpp
@@ -17,6 +17,7 @@
 #include <bit>
 #include <cstdint>
 #include <Windows.h>
+#include <winwrap.hpp>
 
 namespace GLOBAL {
 	inline HMODULE aviutl_hmod;
@@ -25,6 +26,6 @@ namespace GLOBAL {
 
 	inline void init_minimum(HINSTANCE patch_hmod) {
 		GLOBAL::patchaul_hinst = patch_hmod;
-		GLOBAL::aviutl_base = std::bit_cast<uint32_t>(GetModuleHandleA(NULL));
+		GLOBAL::aviutl_base = std::bit_cast<uint32_t>(WinWrap::Module::getCallingProcessModule());
 	}
 }
diff --git a/patch/patch_exception_log.hpp b/patch/patch_exception_log.hpp
@@ -339,7 +339,7 @@ namespace patch {
 
 	public:
 		void operator()() {
-			log_dir = WinWrap::Module{}.getFileNameW();
+			log_dir = WinWrap::Module::getCallingProcessModule().getFileNameW();
 			log_dir.resize(log_dir.find_last_of(L"/\\") + 1);
 			log_dir += L"log\\";
 

diff --git a/patch/patch_warning_duplicate_plugins.cpp b/patch/patch_warning_duplicate_plugins.cpp
@@ -140,7 +140,7 @@ static bool warning_duplicate_message(
 
 
 static HMODULE warning_duplicate_common(path_cache& map, LPCSTR lpLibFileName) {
-	static auto exe_dir = std::filesystem::path{ WinWrap::Module{GetModuleHandleA(NULL)}.getFileNameW() }.parent_path();
+	static auto exe_dir = std::filesystem::path{ WinWrap::Module::getCallingProcessModule().getFileNameW() }.parent_path();
 
 	const std::filesystem::path arg_path{ lpLibFileName };
 	const auto arg_filename = arg_path.filename();

diff --git a/patch/winwrap b/patch/winwrap