From 93dfa555f2f140d24009d5aa50fdb820b89c06de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 03:41:19 +0000
Subject: [PATCH 1/2] Bump windows-sys from 0.52.0 to 0.59.0

Bumps [windows-sys](https://github.com/microsoft/windows-rs) from 0.52.0 to 0.59.0.
- [Release notes](https://github.com/microsoft/windows-rs/releases)
- [Commits](https://github.com/microsoft/windows-rs/compare/0.52.0...0.59.0)

---
updated-dependencies:
- dependency-name: windows-sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                 | 11 ++++++++++-
 components/core/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f3afa7599..9e3b786bcd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1525,7 +1525,7 @@ dependencies = [
  "widestring 1.1.0",
  "winapi",
  "windows-acl",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
  "xz2",
 ]
 
@@ -4483,6 +4483,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
diff --git a/components/core/Cargo.toml b/components/core/Cargo.toml
index 56eebb7158..a5f8e929d8 100644
--- a/components/core/Cargo.toml
+++ b/components/core/Cargo.toml
@@ -66,7 +66,7 @@ winapi = { version = "^0.3", features = [
   "ws2def",
 ] }
 windows-acl = "*"
-windows-sys = { version = "^0.52.0", features = [
+windows-sys = { version = "^0.59.0", features = [
   "Win32_Foundation",
   "Win32_System_Environment",
 ] }

From 5cfeda6ebbcf1b00f2b2f4034db1b23c58cf0102 Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Tue, 6 Aug 2024 15:50:59 -0700
Subject: [PATCH 2/2] fix CreateEnvironmentBlock call

Signed-off-by: Matt Wrock <matt@mattwrock.com>
---
 components/core/src/os/process/windows_child.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/core/src/os/process/windows_child.rs b/components/core/src/os/process/windows_child.rs
index 47a30b4d25..fd367559d9 100644
--- a/components/core/src/os/process/windows_child.rs
+++ b/components/core/src/os/process/windows_child.rs
@@ -994,7 +994,7 @@ fn create_user_environment(token: HANDLE,
         let mut new_env: Vec<u16> = Vec::new();
         let mut block = ptr::null_mut();
         cvt(Environment::CreateEnvironmentBlock(&mut block,
-                                                token as isize,
+                                                token as *mut std::ffi::c_void,
                                                 FALSE))?;
         let mut tail: u32 = MAXDWORD;
         let mut offset = 0;