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

Cleanup temporary objects in case of error during creation on win32

Browse source 
See #10
This commit is contained in:
Tomaka17 2014-08-22 11:26:00 +02:00
parent 5c92587442
commit d6fec79334
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/win32/init.rs
View file

@ -135,6 +135,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if hdc.is_null() { if hdc.is_null() {
tx.send(Err(format!("GetDC function failed: {}", tx.send(Err(format!("GetDC function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
unsafe { ffi::DestroyWindow(dummy_window); }
return; return;
} }
hdc hdc
@ -162,6 +163,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if pf_index == 0 { if pf_index == 0 {
tx.send(Err(format!("ChoosePixelFormat function failed: {}", tx.send(Err(format!("ChoosePixelFormat function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
unsafe { ffi::DestroyWindow(dummy_window); }
return; return;
} }
@ -170,6 +172,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
{ {
tx.send(Err(format!("DescribePixelFormat function failed: {}", tx.send(Err(format!("DescribePixelFormat function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
unsafe { ffi::DestroyWindow(dummy_window); }
return; return;
} }
@ -181,6 +184,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if ffi::SetPixelFormat(dummy_hdc, 1, &pixel_format) == 0 { if ffi::SetPixelFormat(dummy_hdc, 1, &pixel_format) == 0 {
tx.send(Err(format!("SetPixelFormat function failed: {}", tx.send(Err(format!("SetPixelFormat function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
ffi::DestroyWindow(dummy_window);
return; return;
} }
} }
@ -191,6 +195,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if ctxt.is_null() { if ctxt.is_null() {
tx.send(Err(format!("wglCreateContext function failed: {}", tx.send(Err(format!("wglCreateContext function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
unsafe { ffi::DestroyWindow(dummy_window); }
return; return;
} }
ctxt ctxt
@ -259,6 +264,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if hdc.is_null() { if hdc.is_null() {
tx.send(Err(format!("GetDC function failed: {}", tx.send(Err(format!("GetDC function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
unsafe { ffi::DestroyWindow(real_window); }
return; return;
} }
hdc hdc
@ -269,6 +275,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if ffi::SetPixelFormat(hdc, 1, &pixel_format) == 0 { if ffi::SetPixelFormat(hdc, 1, &pixel_format) == 0 {
tx.send(Err(format!("SetPixelFormat function failed: {}", tx.send(Err(format!("SetPixelFormat function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
ffi::DestroyWindow(real_window);
return; return;
} }
} }
@ -299,6 +306,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if ctxt.is_null() { if ctxt.is_null() {
tx.send(Err(format!("OpenGL context creation failed: {}", tx.send(Err(format!("OpenGL context creation failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
unsafe { ffi::DestroyWindow(real_window); }
return; return;
} }
@ -324,6 +332,8 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if lib.is_null() { if lib.is_null() {
tx.send(Err(format!("LoadLibrary function failed: {}", tx.send(Err(format!("LoadLibrary function failed: {}",
os::error_string(os::errno() as uint)))); os::error_string(os::errno() as uint))));
unsafe { ffi::wglDeleteContext(context); }
unsafe { ffi::DestroyWindow(real_window); }
return; return;
} }
lib lib