leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix embedded NULs in C wide strings returned from Windows API (#2264)

Browse source
This commit is contained in:
Kas 2022-04-30 13:58:51 +02:00 • committed by GitHub
parent e7f88588bf
commit ea09d1d10e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/platform_impl/windows/monitor.rs
View file

@ -1,10 +1,7 @@
use std::{
collections::{BTreeSet, VecDeque},
ffi::OsString,
hash::Hash,
io, mem,
os::windows::prelude::OsStringExt,
ptr,
io, mem, ptr,
};
use windows_sys::Win32::{
@ -17,6 +14,7 @@ use windows_sys::Win32::{
},
};
use super::util::decode_wide;
use crate::{
dpi::{PhysicalPosition, PhysicalSize},
monitor::{MonitorHandle as RootMonitorHandle, VideoMode as RootVideoMode},
@ -169,7 +167,7 @@ impl MonitorHandle {
pub fn name(&self) -> Option<String> {
let monitor_info = get_monitor_info(self.0).unwrap();
Some(
OsString::from_wide(&monitor_info.szDevice)
decode_wide(&monitor_info.szDevice)
.to_string_lossy()
.to_string(),
)