update machine-uid for x86 sciter access x64 machine id
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
parent
6f3123bf02
commit
c42fbe3d45
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -3598,9 +3598,10 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "machine-uid"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26141aceb9f046065617266f41a4a652e4583da643472a10a89b4b3664d99eb6"
|
||||
source = "git+https://github.com/21pages/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542"
|
||||
dependencies = [
|
||||
"bindgen 0.59.2",
|
||||
"cc",
|
||||
"winreg 0.11.0",
|
||||
]
|
||||
|
||||
@ -5191,7 +5192,6 @@ dependencies = [
|
||||
"libpulse-binding",
|
||||
"libpulse-simple-binding",
|
||||
"mac_address",
|
||||
"machine-uid",
|
||||
"magnum-opus",
|
||||
"mouce",
|
||||
"num_cpus",
|
||||
|
@ -80,7 +80,6 @@ cpal = "0.15"
|
||||
ringbuf = "0.3"
|
||||
|
||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
||||
machine-uid = "0.3"
|
||||
mac_address = "1.1"
|
||||
sciter-rs = { git = "https://github.com/open-trade/rust-sciter", branch = "dyn" }
|
||||
sys-locale = "0.3"
|
||||
|
@ -40,7 +40,7 @@ uuid = { version = "1.3", features = ["v4"] }
|
||||
|
||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
||||
mac_address = "1.1"
|
||||
machine-uid = "0.3"
|
||||
machine-uid = { git = "https://github.com/21pages/machine-uid" }
|
||||
sysinfo = "0.29"
|
||||
|
||||
[features]
|
||||
|
@ -45,6 +45,8 @@ pub mod keyboard;
|
||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||
pub use dlopen;
|
||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||
pub use machine_uid;
|
||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||
pub use sysinfo;
|
||||
pub use toml;
|
||||
pub use uuid;
|
||||
|
@ -552,7 +552,7 @@ impl UI {
|
||||
}
|
||||
|
||||
fn is_ok_change_id(&self) -> bool {
|
||||
machine_uid::get().is_ok()
|
||||
hbb_common::machine_uid::get().is_ok()
|
||||
}
|
||||
|
||||
fn get_async_job_status(&self) -> String {
|
||||
|
@ -1037,7 +1037,12 @@ pub async fn change_id_shared_(id: String, old_id: String) -> &'static str {
|
||||
}
|
||||
|
||||
#[cfg(not(any(target_os = "android", target_os = "ios")))]
|
||||
let uuid = Bytes::from(machine_uid::get().unwrap_or("".to_owned()).as_bytes().to_vec());
|
||||
let uuid = Bytes::from(
|
||||
hbb_common::machine_uid::get()
|
||||
.unwrap_or("".to_owned())
|
||||
.as_bytes()
|
||||
.to_vec(),
|
||||
);
|
||||
#[cfg(any(target_os = "android", target_os = "ios"))]
|
||||
let uuid = Bytes::from(hbb_common::get_uuid());
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user