Merge pull request #70 from sn99/master

Migrate from winapi to windows-rs by microsoft

Author: jyn514

Cargo.toml

@@ -45,7 +45,7 @@ git2 = "0.14.0"
 nix = "0.20.0"
 
 [target.'cfg(windows)'.dependencies]
-winapi = "0.3"
+windows-sys = {version = "0.36.1", features = ["Win32_Foundation", "Win32_System_Threading"]}
 
 [dev-dependencies]
 env_logger = "0.8"

src/native/windows.rs

@@ -3,16 +3,15 @@ use crate::cmd::KillFailedError;
 use failure::{bail, Error};
 use std::fs::File;
 use std::path::Path;
-use winapi::um::handleapi::CloseHandle;
-use winapi::um::processthreadsapi::{OpenProcess, TerminateProcess};
-use winapi::um::winnt::PROCESS_TERMINATE;
+use windows_sys::Win32::Foundation::CloseHandle;
+use windows_sys::Win32::System::Threading::{OpenProcess, TerminateProcess, PROCESS_TERMINATE};
 
 pub(crate) fn kill_process(id: u32) -> Result<(), KillFailedError> {
     let error = Err(KillFailedError { pid: id });
 
     unsafe {
         let handle = OpenProcess(PROCESS_TERMINATE, 0, id);
-        if handle.is_null() {
+        if handle == 0 || handle == -1 {
             return error;
         }
         if TerminateProcess(handle, 101) == 0 {