diff --git a/Cargo.lock b/Cargo.lock index c0963337..d82c36a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,9 +84,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.0.0" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d17bf219fcd37199b9a29e00ba65dfb8cd5b2688b7297ec14ff829c40ac50ca9" +checksum = "12e8611f9ae4e068fa3e56931fded356ff745e70987ff76924a6e0ab1c8ef2e3" dependencies = [ "atty", "bitflags", @@ -102,11 +102,11 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.0.0" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b9752c030a14235a0bd5ef3ad60a1dcac8468c30921327fc8af36b20c790b9" +checksum = "517358c28fcef6607bf6f76108e02afad7e82297d132a6b846dcc1fc3efcd153" dependencies = [ - "heck", + "heck 0.4.0", "proc-macro-error", "proc-macro2", "quote", @@ -148,9 +148,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -169,9 +169,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -315,9 +315,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -357,6 +357,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -384,9 +390,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", "hashbrown", @@ -507,7 +513,7 @@ dependencies = [ "derive-ahk", "dirs", "fs-tail", - "heck", + "heck 0.3.3", "komorebi-core", "paste", "powershell_script", @@ -1038,18 +1044,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ "proc-macro2", "quote", @@ -1058,9 +1064,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "itoa 1.0.1", "ryu", @@ -1121,7 +1127,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro2", "quote", "rustversion", @@ -1130,9 +1136,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b" +checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" dependencies = [ "proc-macro2", "quote", @@ -1416,11 +1422,15 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054d31561409bbf7e1ee4a4f0a1233ac2bb79cfadf2a398438a04d8dda69225f" +checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0" dependencies = [ - "windows-sys", + "windows_aarch64_msvc 0.30.0", + "windows_i686_gnu 0.30.0", + "windows_i686_msvc 0.30.0", + "windows_x86_64_gnu 0.30.0", + "windows_x86_64_msvc 0.30.0", ] [[package]] @@ -1429,11 +1439,11 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.28.0", + "windows_i686_gnu 0.28.0", + "windows_i686_msvc 0.28.0", + "windows_x86_64_gnu 0.28.0", + "windows_x86_64_msvc 0.28.0", ] [[package]] @@ -1442,30 +1452,60 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" +[[package]] +name = "windows_aarch64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" + [[package]] name = "windows_i686_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a" +[[package]] +name = "windows_i686_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" + [[package]] name = "windows_i686_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64" +[[package]] +name = "windows_i686_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" + [[package]] name = "windows_x86_64_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954" +[[package]] +name = "windows_x86_64_gnu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" + [[package]] name = "windows_x86_64_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f" +[[package]] +name = "windows_x86_64_msvc" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" + [[package]] name = "winput" version = "0.2.5" diff --git a/komorebi-core/Cargo.toml b/komorebi-core/Cargo.toml index 99ca3a96..6408d1c1 100644 --- a/komorebi-core/Cargo.toml +++ b/komorebi-core/Cargo.toml @@ -14,7 +14,7 @@ serde_yaml = "0.8" strum = { version = "0.23", features = ["derive"] } [dependencies.windows] -version = "0.28" +version = "0.30" features = [ "Win32_Foundation", ] diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index f88476e1..cea86513 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -40,9 +40,8 @@ miow = "0.4" winreg = "0.10" [dependencies.windows] -version = "0.28" +version = "0.30" features = [ - "std", "Win32_Foundation", "Win32_Graphics_Dwm", "Win32_Graphics_Gdi", diff --git a/komorebi/src/set_window_position.rs b/komorebi/src/set_window_position.rs index 95a1c4a2..d05ccdd7 100644 --- a/komorebi/src/set_window_position.rs +++ b/komorebi/src/set_window_position.rs @@ -18,20 +18,20 @@ use windows::Win32::UI::WindowsAndMessaging::SWP_SHOWWINDOW; bitflags! { #[derive(Default)] pub struct SetWindowPosition: u32 { - const ASYNC_WINDOW_POS = SWP_ASYNCWINDOWPOS.0; - const DEFER_ERASE = SWP_DEFERERASE.0; - const DRAW_FRAME = SWP_DRAWFRAME.0; - const FRAME_CHANGED = SWP_FRAMECHANGED.0; - const HIDE_WINDOW = SWP_HIDEWINDOW.0; - const NO_ACTIVATE = SWP_NOACTIVATE.0; - const NO_COPY_BITS = SWP_NOCOPYBITS.0; - const NO_MOVE = SWP_NOMOVE.0; - const NO_OWNER_Z_ORDER = SWP_NOOWNERZORDER.0; - const NO_REDRAW = SWP_NOREDRAW.0; - const NO_REPOSITION = SWP_NOREPOSITION.0; - const NO_SEND_CHANGING = SWP_NOSENDCHANGING.0; - const NO_SIZE = SWP_NOSIZE.0; - const NO_Z_ORDER = SWP_NOZORDER.0; - const SHOW_WINDOW = SWP_SHOWWINDOW.0; + const ASYNC_WINDOW_POS = SWP_ASYNCWINDOWPOS; + const DEFER_ERASE = SWP_DEFERERASE; + const DRAW_FRAME = SWP_DRAWFRAME; + const FRAME_CHANGED = SWP_FRAMECHANGED; + const HIDE_WINDOW = SWP_HIDEWINDOW; + const NO_ACTIVATE = SWP_NOACTIVATE; + const NO_COPY_BITS = SWP_NOCOPYBITS; + const NO_MOVE = SWP_NOMOVE; + const NO_OWNER_Z_ORDER = SWP_NOOWNERZORDER; + const NO_REDRAW = SWP_NOREDRAW; + const NO_REPOSITION = SWP_NOREPOSITION; + const NO_SEND_CHANGING = SWP_NOSENDCHANGING; + const NO_SIZE = SWP_NOSIZE; + const NO_Z_ORDER = SWP_NOZORDER; + const SHOW_WINDOW = SWP_SHOWWINDOW; } } diff --git a/komorebi/src/styles.rs b/komorebi/src/styles.rs index 54f35f83..7064575c 100644 --- a/komorebi/src/styles.rs +++ b/komorebi/src/styles.rs @@ -58,33 +58,33 @@ use windows::Win32::UI::WindowsAndMessaging::WS_VSCROLL; bitflags! { #[derive(Default)] pub struct WindowStyle: u32 { - const BORDER = WS_BORDER.0; - const CAPTION = WS_CAPTION.0; - const CHILD = WS_CHILD.0; - const CHILDWINDOW = WS_CHILDWINDOW.0; - const CLIPCHILDREN = WS_CLIPCHILDREN.0; - const CLIPSIBLINGS = WS_CLIPSIBLINGS.0; - const DISABLED = WS_DISABLED.0; - const DLGFRAME = WS_DLGFRAME.0; - const GROUP = WS_GROUP.0; - const HSCROLL = WS_HSCROLL.0; - const ICONIC = WS_ICONIC.0; - const MAXIMIZE = WS_MAXIMIZE.0; - const MAXIMIZEBOX = WS_MAXIMIZEBOX.0; - const MINIMIZE = WS_MINIMIZE.0; - const MINIMIZEBOX = WS_MINIMIZEBOX.0; - const OVERLAPPED = WS_OVERLAPPED.0; - const OVERLAPPEDWINDOW = WS_OVERLAPPEDWINDOW.0; - const POPUP = WS_POPUP.0; - const POPUPWINDOW = WS_POPUPWINDOW.0; - const SIZEBOX = WS_SIZEBOX.0; - const SYSMENU = WS_SYSMENU.0; - const TABSTOP = WS_TABSTOP.0; - const THICKFRAME = WS_THICKFRAME.0; - const TILED = WS_TILED.0; - const TILEDWINDOW = WS_TILEDWINDOW.0; - const VISIBLE = WS_VISIBLE.0; - const VSCROLL = WS_VSCROLL.0; + const BORDER = WS_BORDER; + const CAPTION = WS_CAPTION; + const CHILD = WS_CHILD; + const CHILDWINDOW = WS_CHILDWINDOW; + const CLIPCHILDREN = WS_CLIPCHILDREN; + const CLIPSIBLINGS = WS_CLIPSIBLINGS; + const DISABLED = WS_DISABLED; + const DLGFRAME = WS_DLGFRAME; + const GROUP = WS_GROUP; + const HSCROLL = WS_HSCROLL; + const ICONIC = WS_ICONIC; + const MAXIMIZE = WS_MAXIMIZE; + const MAXIMIZEBOX = WS_MAXIMIZEBOX; + const MINIMIZE = WS_MINIMIZE; + const MINIMIZEBOX = WS_MINIMIZEBOX; + const OVERLAPPED = WS_OVERLAPPED; + const OVERLAPPEDWINDOW = WS_OVERLAPPEDWINDOW; + const POPUP = WS_POPUP; + const POPUPWINDOW = WS_POPUPWINDOW; + const SIZEBOX = WS_SIZEBOX; + const SYSMENU = WS_SYSMENU; + const TABSTOP = WS_TABSTOP; + const THICKFRAME = WS_THICKFRAME; + const TILED = WS_TILED; + const TILEDWINDOW = WS_TILEDWINDOW; + const VISIBLE = WS_VISIBLE; + const VSCROLL = WS_VSCROLL; } } @@ -92,32 +92,32 @@ bitflags! { bitflags! { #[derive(Default)] pub struct ExtendedWindowStyle: u32 { - const ACCEPTFILES = WS_EX_ACCEPTFILES.0; - const APPWINDOW = WS_EX_APPWINDOW.0; - const CLIENTEDGE = WS_EX_CLIENTEDGE.0; - const COMPOSITED = WS_EX_COMPOSITED.0; - const CONTEXTHELP = WS_EX_CONTEXTHELP.0; - const CONTROLPARENT = WS_EX_CONTROLPARENT.0; - const DLGMODALFRAME = WS_EX_DLGMODALFRAME.0; - const LAYERED = WS_EX_LAYERED.0; - const LAYOUTRTL = WS_EX_LAYOUTRTL.0; - const LEFT = WS_EX_LEFT.0; - const LEFTSCROLLBAR = WS_EX_LEFTSCROLLBAR.0; - const LTRREADING = WS_EX_LTRREADING.0; - const MDICHILD = WS_EX_MDICHILD.0; - const NOACTIVATE = WS_EX_NOACTIVATE.0; - const NOINHERITLAYOUT = WS_EX_NOINHERITLAYOUT.0; - const NOPARENTNOTIFY = WS_EX_NOPARENTNOTIFY.0; - const NOREDIRECTIONBITMAP = WS_EX_NOREDIRECTIONBITMAP.0; - const OVERLAPPEDWINDOW = WS_EX_OVERLAPPEDWINDOW.0; - const PALETTEWINDOW = WS_EX_PALETTEWINDOW.0; - const RIGHT = WS_EX_RIGHT.0; - const RIGHTSCROLLBAR = WS_EX_RIGHTSCROLLBAR.0; - const RTLREADING = WS_EX_RTLREADING.0; - const STATICEDGE = WS_EX_STATICEDGE.0; - const TOOLWINDOW = WS_EX_TOOLWINDOW.0; - const TOPMOST = WS_EX_TOPMOST.0; - const TRANSPARENT = WS_EX_TRANSPARENT.0; - const WINDOWEDGE = WS_EX_WINDOWEDGE.0; + const ACCEPTFILES = WS_EX_ACCEPTFILES; + const APPWINDOW = WS_EX_APPWINDOW; + const CLIENTEDGE = WS_EX_CLIENTEDGE; + const COMPOSITED = WS_EX_COMPOSITED; + const CONTEXTHELP = WS_EX_CONTEXTHELP; + const CONTROLPARENT = WS_EX_CONTROLPARENT; + const DLGMODALFRAME = WS_EX_DLGMODALFRAME; + const LAYERED = WS_EX_LAYERED; + const LAYOUTRTL = WS_EX_LAYOUTRTL; + const LEFT = WS_EX_LEFT; + const LEFTSCROLLBAR = WS_EX_LEFTSCROLLBAR; + const LTRREADING = WS_EX_LTRREADING; + const MDICHILD = WS_EX_MDICHILD; + const NOACTIVATE = WS_EX_NOACTIVATE; + const NOINHERITLAYOUT = WS_EX_NOINHERITLAYOUT; + const NOPARENTNOTIFY = WS_EX_NOPARENTNOTIFY; + const NOREDIRECTIONBITMAP = WS_EX_NOREDIRECTIONBITMAP; + const OVERLAPPEDWINDOW = WS_EX_OVERLAPPEDWINDOW; + const PALETTEWINDOW = WS_EX_PALETTEWINDOW; + const RIGHT = WS_EX_RIGHT; + const RIGHTSCROLLBAR = WS_EX_RIGHTSCROLLBAR; + const RTLREADING = WS_EX_RTLREADING; + const STATICEDGE = WS_EX_STATICEDGE; + const TOOLWINDOW = WS_EX_TOOLWINDOW; + const TOPMOST = WS_EX_TOPMOST; + const TRANSPARENT = WS_EX_TRANSPARENT; + const WINDOWEDGE = WS_EX_WINDOWEDGE; } } diff --git a/komorebi/src/windows_api.rs b/komorebi/src/windows_api.rs index 5b081679..c7bd20a1 100644 --- a/komorebi/src/windows_api.rs +++ b/komorebi/src/windows_api.rs @@ -6,7 +6,6 @@ use std::ffi::c_void; use color_eyre::eyre::anyhow; use color_eyre::eyre::Error; use color_eyre::Result; -use windows::core::Handle; use windows::core::Result as WindowsCrateResult; use windows::Win32::Foundation::BOOL; use windows::Win32::Foundation::HANDLE; @@ -38,7 +37,6 @@ use windows::Win32::System::Threading::GetCurrentThreadId; use windows::Win32::System::Threading::OpenProcess; use windows::Win32::System::Threading::QueryFullProcessImageNameW; use windows::Win32::System::Threading::PROCESS_ACCESS_RIGHTS; -use windows::Win32::System::Threading::PROCESS_NAME_FORMAT; use windows::Win32::System::Threading::PROCESS_QUERY_INFORMATION; use windows::Win32::UI::Input::KeyboardAndMouse::SetFocus; use windows::Win32::UI::WindowsAndMessaging::AllowSetForegroundWindow; @@ -68,7 +66,6 @@ use windows::Win32::UI::WindowsAndMessaging::GWL_STYLE; use windows::Win32::UI::WindowsAndMessaging::GW_HWNDNEXT; use windows::Win32::UI::WindowsAndMessaging::HWND_NOTOPMOST; use windows::Win32::UI::WindowsAndMessaging::HWND_TOPMOST; -use windows::Win32::UI::WindowsAndMessaging::SET_WINDOW_POS_FLAGS; use windows::Win32::UI::WindowsAndMessaging::SHOW_WINDOW_CMD; use windows::Win32::UI::WindowsAndMessaging::SPIF_SENDCHANGE; use windows::Win32::UI::WindowsAndMessaging::SPI_GETACTIVEWINDOWTRACKING; @@ -167,7 +164,7 @@ impl WindowsApi { EnumDisplayMonitors( HDC(0), std::ptr::null_mut(), - Option::from(callback), + callback, LPARAM(callback_data_address), ) } @@ -179,7 +176,7 @@ impl WindowsApi { let mut monitors: Vec = vec![]; let monitors_ref: &mut Vec = monitors.as_mut(); Self::enum_display_monitors( - windows_callbacks::valid_display_monitors, + Option::Some(windows_callbacks::valid_display_monitors), monitors_ref as *mut Vec as isize, )?; @@ -188,13 +185,13 @@ impl WindowsApi { pub fn load_monitor_information(monitors: &mut Ring) -> Result<()> { Self::enum_display_monitors( - windows_callbacks::enum_display_monitor, + Option::Some(windows_callbacks::enum_display_monitor), monitors as *mut Ring as isize, ) } pub fn enum_windows(callback: WNDENUMPROC, callback_data_address: isize) -> Result<()> { - unsafe { EnumWindows(Option::from(callback), LPARAM(callback_data_address)) } + unsafe { EnumWindows(callback, LPARAM(callback_data_address)) } .ok() .process() } @@ -205,7 +202,7 @@ impl WindowsApi { if let Some(workspace) = monitor.workspaces_mut().front_mut() { // EnumWindows will enumerate through windows on all monitors Self::enum_windows( - windows_callbacks::enum_window, + Option::Some(windows_callbacks::enum_window), workspace.containers_mut() as *mut VecDeque as isize, )?; @@ -268,7 +265,7 @@ impl WindowsApi { layout.top, layout.right, layout.bottom, - SET_WINDOW_POS_FLAGS(flags), + flags, ) } .ok() @@ -469,16 +466,9 @@ impl WindowsApi { let mut path: Vec = vec![0; len as usize]; let text_ptr = path.as_mut_ptr(); - unsafe { - QueryFullProcessImageNameW( - handle, - PROCESS_NAME_FORMAT(0), - PWSTR(text_ptr), - &mut len as *mut u32, - ) - } - .ok() - .process()?; + unsafe { QueryFullProcessImageNameW(handle, 0, PWSTR(text_ptr), &mut len as *mut u32) } + .ok() + .process()?; Ok(String::from_utf16(&path[..len as usize])?) } diff --git a/komorebic/Cargo.toml b/komorebic/Cargo.toml index c1b36866..5e4c4ccf 100644 --- a/komorebic/Cargo.toml +++ b/komorebic/Cargo.toml @@ -26,7 +26,7 @@ serde_json = "1" uds_windows = "1" [dependencies.windows] -version = "0.28" +version = "0.30" features = [ "Win32_Foundation", "Win32_UI_WindowsAndMessaging"