leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port to windows-sys v0.48.0 (#2842)

Browse source
This commit is contained in:
John Nunley 2023-06-03 15:02:37 -07:00 • committed by GitHub
parent 5bbe87960e
commit 642ce2bfa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/platform_impl/windows/event_loop.rs
View file

@ -30,7 +30,10 @@ use windows_sys::Win32::{
SC_SCREENSAVE,
},
Media::{timeBeginPeriod, timeEndPeriod, timeGetDevCaps, TIMECAPS, TIMERR_NOERROR},
System::{Ole::RevokeDragDrop, Threading::GetCurrentThreadId, WindowsProgramming::INFINITE},
System::{
Ole::RevokeDragDrop,
Threading::{GetCurrentThreadId, INFINITE},
},
UI::{
Controls::{HOVER_DEFAULT, WM_MOUSELEAVE},
Input::{

4
src/platform_impl/windows/util.rs
View file

@ -13,7 +13,7 @@ use once_cell::sync::Lazy;
use windows_sys::{
core::{HRESULT, PCWSTR},
Win32::{
Foundation::{BOOL, HINSTANCE, HWND, RECT},
Foundation::{BOOL, HMODULE, HWND, RECT},
Graphics::Gdi::{ClientToScreen, HMONITOR},
System::{
LibraryLoader::{GetProcAddress, LoadLibraryA},
@ -149,7 +149,7 @@ pub fn is_minimized(window: HWND) -> bool {
unsafe { IsIconic(window) != false.into() }
}
pub fn get_instance_handle() -> HINSTANCE {
pub fn get_instance_handle() -> HMODULE {
// Gets the instance handle by taking the address of the
// pseudo-variable created by the microsoft linker:
// https://devblogs.microsoft.com/oldnewthing/20041025-00/?p=37483

4
src/platform_impl/windows/window.rs
View file

@ -14,7 +14,7 @@ use std::{
use windows_sys::Win32::{
Foundation::{
HINSTANCE, HWND, LPARAM, OLE_E_WRONGCOMPOBJ, POINT, POINTS, RECT, RPC_E_CHANGED_MODE, S_OK,
HMODULE, HWND, LPARAM, OLE_E_WRONGCOMPOBJ, POINT, POINTS, RECT, RPC_E_CHANGED_MODE, S_OK,
WPARAM,
},
Graphics::{
@ -315,7 +315,7 @@ impl Window {
}
#[inline]
pub fn hinstance(&self) -> HINSTANCE {
pub fn hinstance(&self) -> HMODULE {
unsafe { super::get_window_long(self.hwnd(), GWLP_HINSTANCE) }
}