Skip to content

fix: Windows build errors with windows crate v0.52 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wooklae-cho wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Windows build errors with windows crate v0.52 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tools/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use objc::{msg_send, sel, sel_impl};
#[cfg(target_os = "windows")]
use windows::Win32::Foundation::{HWND, RECT};
#[cfg(target_os = "windows")]
use windows::Win32::UI::WindowsAndMessaging::{GetWindowRect, GetWindowText, GetWindowTextLengthW};
use windows::Win32::UI::WindowsAndMessaging::{GetWindowRect, GetWindowTextW, GetWindowTextLengthW};

#[cfg(target_os = "linux")]
use x11::xlib;
Expand Down
14 changes: 7 additions & 7 deletions src/utils/platform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct EnumData {

#[cfg(target_os = "windows")]
pub fn get_window_by_pid(pid: u32) -> Result<Option<windows::Win32::Foundation::HWND>> {
use windows::Win32::Foundation::HWND;
use windows::Win32::Foundation::LPARAM;
use windows::Win32::UI::WindowsAndMessaging::EnumWindows;
use std::sync::Mutex;

Expand All @@ -25,29 +25,29 @@ pub fn get_window_by_pid(pid: u32) -> Result<Option<windows::Win32::Foundation::
unsafe {
EnumWindows(
Some(enum_window_callback),
&data as *const _ as isize,
);
LPARAM(&data as *const _ as isize),
).ok();
}

let result = data.lock().unwrap();
Ok(result.window)
}

#[cfg(target_os = "windows")]
unsafe extern "system" fn enum_window_callback(hwnd: HWND, lparam: isize) -> i32 {
unsafe extern "system" fn enum_window_callback(hwnd: windows::Win32::Foundation::HWND, lparam: windows::Win32::Foundation::LPARAM) -> windows::Win32::Foundation::BOOL {
use std::sync::Mutex;
use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;

let data = &*(lparam as *const Mutex<EnumData>);
let data = &*(lparam.0 as *const Mutex<EnumData>);
let mut process_id = 0u32;
GetWindowThreadProcessId(hwnd, Some(&mut process_id));

let mut enum_data = data.lock().unwrap();
if process_id == enum_data.target_pid {
enum_data.window = Some(hwnd);
return 0;
return windows::Win32::Foundation::BOOL(0);
}
1
windows::Win32::Foundation::BOOL(1)
}

#[cfg(target_os = "linux")]
Expand Down