alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #283 from tomaka/update-rustc

Browse source 
Update for rustc
This commit is contained in:
tomaka 2015-02-19 20:33:04 +01:00
parent 72e9c0fc59 1ee6f8fa1a
commit 95d70ce549
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/win32/init.rs
View file

@ -111,7 +111,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
if handle.is_null() { if handle.is_null() {
return Err(OsError(format!("CreateWindowEx function failed: {}", return Err(OsError(format!("CreateWindowEx function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
} }
handle handle
@ -122,7 +122,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
let hdc = unsafe { user32::GetDC(dummy_window) }; let hdc = unsafe { user32::GetDC(dummy_window) };
if hdc.is_null() { if hdc.is_null() {
let err = Err(OsError(format!("GetDC function failed: {}", let err = Err(OsError(format!("GetDC function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
unsafe { user32::DestroyWindow(dummy_window); } unsafe { user32::DestroyWindow(dummy_window); }
return err; return err;
} }
@ -139,7 +139,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
mem::size_of::<winapi::PIXELFORMATDESCRIPTOR>() as winapi::UINT, &mut output) } == 0 mem::size_of::<winapi::PIXELFORMATDESCRIPTOR>() as winapi::UINT, &mut output) } == 0
{ {
let err = Err(OsError(format!("DescribePixelFormat function failed: {}", let err = Err(OsError(format!("DescribePixelFormat function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
unsafe { user32::DestroyWindow(dummy_window); } unsafe { user32::DestroyWindow(dummy_window); }
return err; return err;
} }
@ -151,7 +151,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
unsafe { unsafe {
if gdi32::SetPixelFormat(dummy_hdc, 1, &pixel_format) == 0 { if gdi32::SetPixelFormat(dummy_hdc, 1, &pixel_format) == 0 {
let err = Err(OsError(format!("SetPixelFormat function failed: {}", let err = Err(OsError(format!("SetPixelFormat function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
user32::DestroyWindow(dummy_window); user32::DestroyWindow(dummy_window);
return err; return err;
} }
@ -211,7 +211,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
if handle.is_null() { if handle.is_null() {
return Err(OsError(format!("CreateWindowEx function failed: {}", return Err(OsError(format!("CreateWindowEx function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
} }
handle handle
@ -222,7 +222,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
let hdc = unsafe { user32::GetDC(real_window) }; let hdc = unsafe { user32::GetDC(real_window) };
if hdc.is_null() { if hdc.is_null() {
let err = Err(OsError(format!("GetDC function failed: {}", let err = Err(OsError(format!("GetDC function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
unsafe { user32::DestroyWindow(real_window); } unsafe { user32::DestroyWindow(real_window); }
return err; return err;
} }
@ -233,7 +233,7 @@ fn init(title: Vec<u16>, builder: BuilderAttribs<'static>, builder_sharelists: O
unsafe { unsafe {
if gdi32::SetPixelFormat(hdc, 1, &pixel_format) == 0 { if gdi32::SetPixelFormat(hdc, 1, &pixel_format) == 0 {
let err = Err(OsError(format!("SetPixelFormat function failed: {}", let err = Err(OsError(format!("SetPixelFormat function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
user32::DestroyWindow(real_window); user32::DestroyWindow(real_window);
return err; return err;
} }
@ -395,7 +395,7 @@ fn create_context(extra: Option<(&gl::wgl_extra::Wgl, &BuilderAttribs<'static>)>
if ctxt.is_null() { if ctxt.is_null() {
return Err(OsError(format!("OpenGL context creation failed: {}", return Err(OsError(format!("OpenGL context creation failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
} }
Ok(ctxt as winapi::HGLRC) Ok(ctxt as winapi::HGLRC)
@ -508,7 +508,7 @@ fn load_opengl32_dll() -> Result<winapi::HMODULE, CreationError> {
if lib.is_null() { if lib.is_null() {
return Err(OsError(format!("LoadLibrary function failed: {}", return Err(OsError(format!("LoadLibrary function failed: {}",
os::error_string(os::errno() as usize)))); os::error_string(os::errno()))));
} }
Ok(lib) Ok(lib)