Update winapi to 0.3

Cargo.toml

@@ -26,12 +26,19 @@ cocoa = "0.11"
 core-foundation = "0.4"
 core-graphics = "0.10"
 
-[target.'cfg(target_os = "windows")'.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.2"
-dwmapi-sys = "0.1"
+[target.'cfg(target_os = "windows")'.dependencies.winapi]
+version = "0.3"
+features = [
+    "winnt",
+    "winuser",
+    "wingdi",
+    "shellapi",
+    "dwmapi",
+    "processthreadsapi",
+    "libloaderapi",
+    "windowsx",
+    "hidusage",
+]
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
 wayland-client = { version = "0.12.0", features = ["dlopen"] }

src/lib.rs

@@ -88,14 +88,6 @@ extern crate libc;
 
 #[cfg(target_os = "windows")]
 extern crate winapi;
-#[cfg(target_os = "windows")]
-extern crate kernel32;
-#[cfg(target_os = "windows")]
-extern crate shell32;
-#[cfg(target_os = "windows")]
-extern crate user32;
-#[cfg(target_os = "windows")]
-extern crate dwmapi;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[macro_use]
 extern crate objc;

src/os/windows.rs

@@ -5,7 +5,7 @@ use libc;
 use MonitorId;
 use Window;
 use WindowBuilder;
-use winapi;
+use winapi::shared::windef::HWND;
 
 /// Additional methods on `Window` that are specific to Windows.
 pub trait WindowExt {
@@ -24,13 +24,13 @@ impl WindowExt for Window {
 
 /// Additional methods on `WindowBuilder` that are specific to Windows.
 pub trait WindowBuilderExt {
-    fn with_parent_window(self, parent: winapi::HWND) -> WindowBuilder;
+    fn with_parent_window(self, parent: HWND) -> WindowBuilder;
 }
 
 impl WindowBuilderExt for WindowBuilder {
     /// Sets a parent to the window to be created.
     #[inline]
-    fn with_parent_window(mut self, parent: winapi::HWND) -> WindowBuilder {
+    fn with_parent_window(mut self, parent: HWND) -> WindowBuilder {
         self.platform_specific.parent = Some(parent);
         self
     }