Bug 1494386 - Uplift u2f-hid-rs 0.2.2, Windows aarch64 fix r=keeler
authorJ.C. Jones <jjones@mozilla.com>
Fri, 05 Oct 2018 00:05:04 +0000
changeset 498176 75aa1ec0f564189333f7d377c2a33a95996c36a2
parent 498175 01a517eeb9e6aaa9f5973599976a0dfcebbbbe8f
child 498177 7ee4eac9ae35ab547b05e0ff600c4f26cc079144
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1494386
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1494386 - Uplift u2f-hid-rs 0.2.2, Windows aarch64 fix r=keeler See https://github.com/jcjones/u2f-hid-rs/pull/67 Differential Revision: https://phabricator.services.mozilla.com/D7795
Cargo.lock
dom/webauthn/u2f-hid-rs/Cargo.toml
dom/webauthn/u2f-hid-rs/src/windows/winapi.rs
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -963,17 +963,17 @@ dependencies = [
  "netwerk_helper 0.0.1",
  "nserror 0.1.0",
  "nsstring 0.1.0",
  "prefs_parser 0.0.1",
  "profiler_helper 0.1.0",
  "rkv 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rsdparsa_capi 0.1.0",
  "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "u2fhid 0.2.1",
+ "u2fhid 0.2.2",
  "webrender_bindings 0.1.0",
  "xpcom 0.1.0",
 ]
 
 [[package]]
 name = "gl_generator"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2639,17 +2639,17 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "u2fhid"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/dom/webauthn/u2f-hid-rs/Cargo.toml
+++ b/dom/webauthn/u2f-hid-rs/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "u2fhid"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Kyle Machulis <kyle@nonpolynomial.com>", "J.C. Jones <jc@mozilla.com>", "Tim Taubert <ttaubert@mozilla.com>"]
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libudev = "^0.2"
 
 [target.'cfg(target_os = "freebsd")'.dependencies]
 devd-rs = "0.2.1"
 
--- a/dom/webauthn/u2f-hid-rs/src/windows/winapi.rs
+++ b/dom/webauthn/u2f-hid-rs/src/windows/winapi.rs
@@ -15,17 +15,17 @@ use util::io_err;
 extern crate libc;
 extern crate winapi;
 
 use platform::winapi::winapi::shared::{guiddef, minwindef, ntdef, windef};
 use platform::winapi::winapi::shared::{hidclass, hidpi, hidusage};
 use platform::winapi::winapi::um::{handleapi, setupapi};
 
 #[link(name = "setupapi")]
-extern "stdcall" {
+extern "system" {
     fn SetupDiGetClassDevsW(
         ClassGuid: *const guiddef::GUID,
         Enumerator: ntdef::PCSTR,
         hwndParent: windef::HWND,
         flags: minwindef::DWORD,
     ) -> setupapi::HDEVINFO;
 
     fn SetupDiDestroyDeviceInfoList(DeviceInfoSet: setupapi::HDEVINFO) -> minwindef::BOOL;
@@ -44,17 +44,17 @@ extern "stdcall" {
         DeviceInterfaceDetailData: setupapi::PSP_DEVICE_INTERFACE_DETAIL_DATA_W,
         DeviceInterfaceDetailDataSize: minwindef::DWORD,
         RequiredSize: minwindef::PDWORD,
         DeviceInfoData: setupapi::PSP_DEVINFO_DATA,
     ) -> minwindef::BOOL;
 }
 
 #[link(name = "hid")]
-extern "stdcall" {
+extern "system" {
     fn HidD_GetPreparsedData(
         HidDeviceObject: ntdef::HANDLE,
         PreparsedData: *mut hidpi::PHIDP_PREPARSED_DATA,
     ) -> ntdef::BOOLEAN;
 
     fn HidD_FreePreparsedData(PreparsedData: hidpi::PHIDP_PREPARSED_DATA) -> ntdef::BOOLEAN;
 
     fn HidP_GetCaps(