Bump winapi to 0.3

Cargo.toml

@@ -37,12 +37,7 @@ core-foundation = "0.4"
 core-graphics = "0.12.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.2"
-user32-sys = "0.2"
-kernel32-sys = "0.2"
-dwmapi-sys = "0.1"
+winapi = { version = "0.3", features = ["winuser", "winnt", "wingdi", "dwmapi", "shellapi", "windowsx", "libloaderapi", "processthreadsapi"] }
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies]
 image = { version = "0.17", optional = true }

src/api/egl/ffi.rs

@@ -28,7 +28,7 @@ pub type EGLNativeDisplayType = *const libc::c_void;
 pub type EGLNativePixmapType = *const libc::c_void;     // FIXME: egl_native_pixmap_t instead
 
 #[cfg(target_os = "windows")]
-pub type EGLNativeWindowType = winapi::HWND;
+pub type EGLNativeWindowType = winapi::shared::windef::HWND;
 #[cfg(target_os = "linux")]
 pub type EGLNativeWindowType = *const libc::c_void;
 #[cfg(target_os = "android")]

src/api/wgl/make_current_guard.rs

@@ -2,25 +2,25 @@ use std::marker::PhantomData;
 use std::os::raw::c_void;
 use std::io;
 
-use winapi;
+use winapi::shared::windef::{HDC, HGLRC};
 use CreationError;
 
 use super::gl;
 /// A guard for when you want to make the context current. Destroying the guard restores the
 /// previously-current context.
 pub struct CurrentContextGuard<'a, 'b> {
-    previous_hdc: winapi::HDC,
-    previous_hglrc: winapi::HGLRC,
+    previous_hdc: HDC,
+    previous_hglrc: HGLRC,
     marker1: PhantomData<&'a ()>,
     marker2: PhantomData<&'b ()>,
 }
 
 impl<'a, 'b> CurrentContextGuard<'a, 'b> {
-    pub unsafe fn make_current(hdc: winapi::HDC, context: winapi::HGLRC)
+    pub unsafe fn make_current(hdc: HDC, context: HGLRC)
                                -> Result<CurrentContextGuard<'a, 'b>, CreationError>
     {
-        let previous_hdc = gl::wgl::GetCurrentDC() as winapi::HDC;
-        let previous_hglrc = gl::wgl::GetCurrentContext() as winapi::HGLRC;
+        let previous_hdc = gl::wgl::GetCurrentDC() as HDC;
+        let previous_hglrc = gl::wgl::GetCurrentContext() as HGLRC;
 
         let result = gl::wgl::MakeCurrent(hdc as *const _, context as *const _);
         if result == 0 {