alex/rust_minifb
1
0
Fork 0
mirror of https://github.com/italicsjenga/rust_minifb.git synced 2025-01-26 02:36:32 +11:00
Code Issues Projects Releases Packages Wiki Activity

Make sure to keep wchars alive

Browse source
This commit is contained in:
Daniel Collin 2015-12-11 09:46:10 +01:00
parent 474e6db31d
commit 2f5503d115
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/windows.rs
View file

@ -186,10 +186,10 @@ pub enum MinifbError {
UnableToCreateWindow, UnableToCreateWindow,
} }
fn to_wstring(str: &str) -> *const u16 { fn to_wstring(str: &str) -> Vec<u16> {
let mut v: Vec<u16> = OsStr::new(str).encode_wide().chain(Some(0).into_iter()).collect(); let mut v: Vec<u16> = OsStr::new(str).encode_wide().chain(Some(0).into_iter()).collect();
v.push(0u16); v.push(0u16);
v.as_ptr() v
} }
pub struct Window { pub struct Window {
@ -214,7 +214,7 @@ impl Window {
hCursor: ptr::null_mut(), hCursor: ptr::null_mut(),
hbrBackground: ptr::null_mut(), hbrBackground: ptr::null_mut(),
lpszMenuName: ptr::null(), lpszMenuName: ptr::null(),
lpszClassName: class_name, lpszClassName: class_name.as_ptr(),
}; };
if user32::RegisterClassW(&class) == 0 { if user32::RegisterClassW(&class) == 0 {
@ -236,9 +236,11 @@ impl Window {
rect.right -= rect.left; rect.right -= rect.left;
rect.bottom -= rect.top; rect.bottom -= rect.top;
let window_name = to_wstring(name);
let handle = user32::CreateWindowExW(0, let handle = user32::CreateWindowExW(0,
class_name, class_name.as_ptr(),
to_wstring(name), window_name.as_ptr(),
winapi::WS_OVERLAPPEDWINDOW & winapi::WS_OVERLAPPEDWINDOW &
!winapi::WS_MAXIMIZEBOX & !winapi::WS_MAXIMIZEBOX &
!winapi::WS_THICKFRAME, !winapi::WS_THICKFRAME,