From db14cfc34b394f341fdc541c93a20acb7623b9b7 Mon Sep 17 00:00:00 2001
From: Kirill Chibisov <contact@kchibisov.com>
Date: Wed, 16 Aug 2023 16:10:09 +0400
Subject: [PATCH] ci: bump github actions

---
 .github/workflows/ci.yml      | 4 ++--
 Cargo.toml                    | 1 +
 glutin/Cargo.toml             | 2 +-
 glutin/src/api/wgl/display.rs | 4 ++--
 glutin/src/api/wgl/mod.rs     | 4 ++--
 glutin_egl_sys/Cargo.toml     | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e603727cf8..e61853d03a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     name: Check formatting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: nightly
@@ -62,7 +62,7 @@ jobs:
 
     runs-on: ${{ matrix.platform.os }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     # Used to cache cargo-web
     - name: Cache cargo folder
       uses: actions/cache@v1
diff --git a/Cargo.toml b/Cargo.toml
index 9b6fd1bd7a..277b23a41e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "glutin",
     "glutin-winit",
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
index 82592334c0..ea4ba957df 100644
--- a/glutin/Cargo.toml
+++ b/glutin/Cargo.toml
@@ -30,7 +30,7 @@ glutin_egl_sys = { version = "0.5.1", path = "../glutin_egl_sys", optional = tru
 glutin_wgl_sys = { version = "0.4.0", path = "../glutin_wgl_sys", optional = true }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.45"
+version = "0.48"
 features = [
     "Win32_Foundation",
     "Win32_Graphics_Gdi",
diff --git a/glutin/src/api/wgl/display.rs b/glutin/src/api/wgl/display.rs
index fb19098bb9..62c1309bf5 100644
--- a/glutin/src/api/wgl/display.rs
+++ b/glutin/src/api/wgl/display.rs
@@ -8,7 +8,7 @@ use std::sync::Arc;
 
 use glutin_wgl_sys::wgl;
 use raw_window_handle::{RawDisplayHandle, RawWindowHandle};
-use windows_sys::Win32::Foundation::HINSTANCE;
+use windows_sys::Win32::Foundation::HMODULE;
 use windows_sys::Win32::Graphics::Gdi::HDC;
 use windows_sys::Win32::System::LibraryLoader as dll_loader;
 
@@ -206,7 +206,7 @@ impl Sealed for Display {}
 
 pub(crate) struct DisplayInner {
     /// Client WGL extensions.
-    pub(crate) lib_opengl32: HINSTANCE,
+    pub(crate) lib_opengl32: HMODULE,
 
     /// Extra functions used by the impl.
     pub(crate) wgl_extra: Option<&'static WglExtra>,
diff --git a/glutin/src/api/wgl/mod.rs b/glutin/src/api/wgl/mod.rs
index 87e51a9c31..1d4de18eba 100644
--- a/glutin/src/api/wgl/mod.rs
+++ b/glutin/src/api/wgl/mod.rs
@@ -9,7 +9,7 @@ use std::os::windows::ffi::OsStrExt;
 
 use glutin_wgl_sys::{wgl, wgl_extra};
 use once_cell::sync::OnceCell;
-use windows_sys::Win32::Foundation::{HINSTANCE, HWND};
+use windows_sys::Win32::Foundation::{HMODULE, HWND};
 use windows_sys::Win32::Graphics::{Gdi as gdi, OpenGL as gl};
 use windows_sys::Win32::UI::WindowsAndMessaging::{self as wm, WINDOWPLACEMENT, WNDCLASSEXW};
 
@@ -46,7 +46,7 @@ impl Deref for WglExtra {
 }
 
 unsafe fn load_extra_functions(
-    instance: HINSTANCE,
+    instance: HMODULE,
     win: HWND,
 ) -> Result<(&'static WglExtra, HashSet<&'static str>)> {
     let rect = unsafe {
diff --git a/glutin_egl_sys/Cargo.toml b/glutin_egl_sys/Cargo.toml
index c63ab74baa..c10f464848 100644
--- a/glutin_egl_sys/Cargo.toml
+++ b/glutin_egl_sys/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2021"
 gl_generator = "0.14"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.45"
+version = "0.48"
 features = [
     "Win32_Foundation",
     "Win32_Graphics_Gdi",