openharmony/third_party_rust_libloading
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_rust_libloading.git synced 2026-07-21 00:26:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Windows fixes

Browse Source
This commit is contained in:
Simonas Kazlauskas
2015-11-07 13:23:39 +02:00
parent 35a5973376
commit e45a096cb3
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/os/windows/mod.rs
+13 -10
View File
@@ -5,7 +5,7 @@
extern crate winapi;
extern crate kernel32;
use std::ffi::{CStr, OsStr};
use std::ffi::{CStr, OsStr, OsString};
use std::marker;
use std::mem;
use std::ptr;
@@ -92,13 +92,16 @@ impl Library {
impl ::std::fmt::Debug for Library {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
let buf = [winapi::WCHAR; 1024] = mem::uninitialized();
let len = unsafe { kernel32::GetModuleFileNameW((self.0).0, &mut buf, 1024) };
if len == 0 {
f.write_str(&format!("Library@{:p}", (self.0).0))
} else {
let string: OsString = OsString::from_wide(&buf[..len]);
f.write_str(&format!("Library@{:p} from {:?}", (self.0).0, string))
unsafe {
let mut buf: [winapi::WCHAR; 1024] = mem::uninitialized();
let len = kernel32::GetModuleFileNameW((self.0).0,
(&mut buf[..]).as_mut_ptr(), 1024) as usize;
if len == 0 {
f.write_str(&format!("Library@{:p}", (self.0).0))
} else {
let string: OsString = OsString::from_wide(&buf[..len]);
f.write_str(&format!("Library@{:p} from {:?}", (self.0).0, string))
}
}
}
}
@@ -118,9 +121,9 @@ impl<T> ::std::ops::Deref for Symbol<T> {
}
}
impl ::std::fmt::Debug for Symbol {
impl<T> ::std::fmt::Debug for Symbol<T> {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
f.write_str("Symbol@{:p}", self.pointer)
f.write_str(&format!("Symbol@{:p}", self.pointer))
}
}