WIP: chore: upgrade windows 0.59.0 → 0.62.0

Author: ErichDonGubler

.deny.toml

@@ -22,12 +22,6 @@ skip = [
     # Deno uses an old version
     { name = "which", version = "6.0.3" },
 
-    # Temporarily allow older Windows version until updates make it through
-    { name = "windows", version = "0.59" },
-    { name = "windows-core", version = "0.59" },
-    { name = "windows-implement", version = "0.59" },
-    { name = "windows-strings", version = "0.3" },
-
     # cargo-metadata uses old version. Only used for infrastructure.
     { name = "toml", version = "0.8.23" },
     { name = "ordered-float", version = "2.10.1" },

Cargo.lock

@@ -210,10 +210,12 @@ gpu-alloc = "0.6"
 gpu-descriptor = "0.3.2"
 
 # DX12 dependencies
-gpu-allocator = { version = "0.28", default-features = false, features = ["hashbrown"] }
+gpu-allocator = { version = "0.28", default-features = false, features = [
+    "hashbrown",
+] }
 range-alloc = "0.1"
 mach-dxcompiler-rs = { version = "0.1.4", default-features = false } # remember to increase max_shader_model if applicable
-windows-core = { version = "0.61", default-features = false }
+windows-core = { version = "0.62", default-features = false }
 
 # Gles dependencies
 khronos-egl = "6"
@@ -223,7 +225,7 @@ glutin-winit = { version = "0.4", default-features = false }
 glutin_wgl_sys = "0.6"
 
 # DX12 and GLES dependencies
-windows = { version = "0.61", default-features = false }
+windows = { version = "0.62", default-features = false }
 
 # wasm32 dependencies
 console_error_panic_hook = "0.1.5"
@@ -255,6 +257,18 @@ ndk-sys = "0.6"
 [patch.crates-io]
 wgpu = { path = "./wgpu" }
 
+# https://github.com/Xudong-Huang/generator-rs/pull/76
+generator = { git = "https://github.com/Xudong-Huang/generator-rs", rev = "6201b45c99b2f41d133e4c5ca1803885d61be732" }
+
+anstyle = { git = "https://github.com/erichdongubler-contrib/anstyle", rev = "c065f776e0190b400cc0afcb0ef4d36fe295dc43" }
+anstyle-query = { git = "https://github.com/erichdongubler-contrib/anstyle", rev = "c065f776e0190b400cc0afcb0ef4d36fe295dc43" }
+anstyle-wincon = { git = "https://github.com/erichdongubler-contrib/anstyle", rev = "c065f776e0190b400cc0afcb0ef4d36fe295dc43" }
+
+# https://github.com/rust-lang/backtrace-rs/pull/727
+backtrace = { git = "https://github.com/rust-lang/backtrace-rs", rev = "00105b6b2692cdbc93056d0162a52f5565480240" }
+
+gethostname = { git = "https://github.com/erichdongubler-contrib/gethostname.rs", rev = "5cd016032cb925d2396018af7b1f261a8957482e" }
+
 [profile.release]
 lto = "thin"
 debug = true

Cargo.toml

@@ -226,7 +226,7 @@ unsafe fn setup_pixel_format(dc: Gdi::HDC) -> Result<(), crate::InstanceError> {
         if index == 0 {
             return Err(crate::InstanceError::with_source(
                 String::from("unable to choose pixel format"),
-                Error::from_win32(),
+                Error::from_thread(),
             ));
         }
 
@@ -244,7 +244,7 @@ unsafe fn setup_pixel_format(dc: Gdi::HDC) -> Result<(), crate::InstanceError> {
         if index == 0 {
             return Err(crate::InstanceError::with_source(
                 String::from("unable to get pixel format index"),
-                Error::from_win32(),
+                Error::from_thread(),
             ));
         }
         let mut format = Default::default();
@@ -254,7 +254,7 @@ unsafe fn setup_pixel_format(dc: Gdi::HDC) -> Result<(), crate::InstanceError> {
         {
             return Err(crate::InstanceError::with_source(
                 String::from("unable to read pixel format"),
-                Error::from_win32(),
+                Error::from_thread(),
             ));
         }
 
@@ -311,7 +311,7 @@ fn create_global_window_class() -> Result<CString, crate::InstanceError> {
     if atom == 0 {
         return Err(crate::InstanceError::with_source(
             String::from("unable to register window class"),
-            Error::from_win32(),
+            Error::from_thread(),
         ));
     }
 
@@ -398,7 +398,7 @@ fn create_instance_device() -> Result<InstanceDevice, crate::InstanceError> {
                 if dc.is_invalid() {
                     return Err(crate::InstanceError::with_source(
                         String::from("unable to create memory device"),
-                        Error::from_win32(),
+                        Error::from_thread(),
                     ));
                 }
                 let dc = DeviceContextHandle {
@@ -484,7 +484,7 @@ impl crate::Instance for Instance {
             if context.is_null() {
                 return Err(crate::InstanceError::with_source(
                     String::from("unable to create OpenGL context"),
-                    Error::from_win32(),
+                    Error::from_thread(),
                 ));
             }
             WglContext {
@@ -676,7 +676,7 @@ impl Surface {
         if dc.is_invalid() {
             log::error!(
                 "unable to get the device context from window: {}",
-                Error::from_win32()
+                Error::from_thread()
             );
             return Err(crate::SurfaceError::Other(
                 "unable to get the device context from window",
@@ -754,7 +754,7 @@ impl crate::Surface for Surface {
         if dc.is_invalid() {
             log::error!(
                 "unable to get the device context from window: {}",
-                Error::from_win32()
+                Error::from_thread()
             );
             return Err(crate::SurfaceError::Other(
                 "unable to get the device context from window",
@@ -828,7 +828,7 @@ impl crate::Surface for Surface {
         };
 
         if unsafe { extra.SwapIntervalEXT(if vsync { 1 } else { 0 }) } == Foundation::FALSE.0 {
-            log::error!("unable to set swap interval: {}", Error::from_win32());
+            log::error!("unable to set swap interval: {}", Error::from_thread());
             return Err(crate::SurfaceError::Other("unable to set swap interval"));
         }