set DLL search path in maa-cli instead of maa-sys

MaaAssistantArknights · Oct 13, 2023 · bea75e2 · bea75e2
1 parent 4a2151e
commit bea75e2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/maa-cli/Cargo.toml b/maa-cli/Cargo.toml
@@ -47,3 +47,6 @@ features = ["rustls-tls", "blocking", "stream", "json"]
 
 [dev-dependencies]
 serde_test = "1.0.176"
+
+[target.windows.dependencies]
+windows-sys = { version = "0.48.0", features = ["Win32_System_LibraryLoader"] }
diff --git a/maa-cli/src/installer/maa_core.rs b/maa-cli/src/installer/maa_core.rs
@@ -308,11 +308,6 @@ pub fn find_lib_dir(dirs: &Dirs) -> Option<PathBuf> {
     None
 }
 
-pub fn find_maa_core(dirs: &Dirs) -> Option<PathBuf> {
-    let lib_dir = find_lib_dir(dirs)?;
-    Some(lib_dir.join(MAA_CORE_NAME))
-}
-
 pub fn find_resource(dirs: &Dirs) -> Option<PathBuf> {
     let resource_dir = dirs.resource();
     if resource_dir.exists() {

diff --git a/maa-cli/src/run/mod.rs b/maa-cli/src/run/mod.rs
@@ -12,7 +12,7 @@ use crate::{
         Error as ConfigError, FindFile,
     },
     dirs::{Dirs, Ensure},
-    installer::maa_core::{find_maa_core, find_resource, MAA_CORE_NAME},
+    installer::maa_core::{find_lib_dir, find_resource, MAA_CORE_NAME},
     log::{set_level, LogLevel},
     {debug, normal, warning},
 };
@@ -458,8 +458,17 @@ fn process_resource_dir(path: PathBuf) -> Option<PathBuf> {
 }
 
 fn load_core(dirs: &Dirs) {
-    if let Some(core_path) = find_maa_core(dirs) {
-        maa_sys::binding::load(core_path);
+    if let Some(lib_dir) = find_lib_dir(dirs) {
+        // Set DLL directory on Windows
+        #[cfg(target_os = "windows")]
+        {
+            use std::os::windows::ffi::OsStrExt;
+            use windows_sys::windows::Win32::System::LibraryLoader::SetDllDirectoryW;
+
+            let lib_dir_w: Vec<u16> = lib_dir.as_ref().encode_wide().chain(Some(0)).collect();
+            unsafe { SetDllDirectoryW(lib_dir_w.as_ptr()) };
+        }
+        maa_sys::binding::load(lib_dir.join(MAA_CORE_NAME));
     } else {
         maa_sys::binding::load(MAA_CORE_NAME);
     }

diff --git a/maa-sys/Cargo.toml b/maa-sys/Cargo.toml
@@ -13,6 +13,3 @@ libloading = { version = "0.8.0", optional = true }
 
 [build-dependencies]
 directories = "5"
-
-[target.windows.dependencies]
-windows-sys = { version = "0.48.0", features = ["Win32_System_LibraryLoader"] }
diff --git a/maa-sys/src/link.rs b/maa-sys/src/link.rs
@@ -54,20 +54,6 @@ macro_rules! link {
         }
 
         pub fn load(path: impl AsRef<std::ffi::OsStr>) {
-                // Set DLL search path to the directory of the shared library.
-                #[cfg(target_os = "windows")]
-                {
-                    use windows_sys::windows::Win32::System::LibraryLoader::SetDllDirectoryW;
-                    use std::os::windows::ffi::OsStrExt;
-
-                    let pathbuf = std::path::PathBuf::from(path.as_ref());
-
-                    if let Some(dll_dir) = pathbuf.parent() {
-                        let wine_dll_dir: Vec<u16> = path.as_ref().encode_wide().chain(Some(0)).collect();
-                        unsafe { SetDllDirectoryW(path.as_ptr()) };
-                    }
-                }
-
                 SHARED_LIBRARY.with(|lib| {
                     *lib.borrow_mut() = Some(Arc::new(SharedLibrary::new(path).unwrap()));
                 });