github-starred/lan-mouse
2
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-05-15 14:15:52 -06:00
Code Issues 107 Projects Packages Wiki Activity Actions

fix a race condition in windows capture

Browse source
This commit is contained in:
Ferdinand Schober 2024-04-11 13:07:11 +02:00
parent 058097c618
commit 141ea2809d
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/capture/windows.rs
View file

@ -9,6 +9,7 @@ use std::ptr::{addr_of, addr_of_mut};
use futures::executor::block_on;
use std::default::Default;
use std::sync::atomic::{AtomicU32, Ordering};
use std::sync::mpsc;
use std::task::ready;
use std::{io, pin::Pin, thread};
use tokio::sync::mpsc::{channel, Receiver, Sender};
@ -55,6 +56,8 @@ enum EventType {
unsafe fn signal_message_thread(event_type: EventType) {
if let Some(event_tid) = get_event_tid() {
PostThreadMessageW(event_tid, WM_USER, WPARAM(event_type as usize), LPARAM(0)).unwrap();
} else {
log::warn!("lost event");
}
}
@ -451,9 +454,10 @@ fn get_msg() -> Option<MSG> {
}
}
fn message_thread() {
fn message_thread(ready_tx: mpsc::Sender<()>) {
unsafe {
set_event_tid(GetCurrentThreadId());
ready_tx.send(()).expect("channel closed");
let mouse_proc: HOOKPROC = Some(mouse_proc);
let kybrd_proc: HOOKPROC = Some(kybrd_proc);
let window_proc: WNDPROC = Some(window_proc);
@ -551,7 +555,10 @@ impl WindowsInputCapture {
unsafe {
let (tx, rx) = channel(10);
EVENT_TX.replace(tx);
let msg_thread = Some(thread::spawn(message_thread));
let (ready_tx, ready_rx) = mpsc::channel();
let msg_thread = Some(thread::spawn(|| message_thread(ready_tx)));
/* wait for thread to set its id */
ready_rx.recv().expect("channel closed");
Ok(Self {
msg_thread,
event_rx: rx,