fix: Windows build errors in wm

Author: lars-berger

packages/wm-platform/src/dispatcher.rs

@@ -509,7 +509,7 @@ impl Dispatcher {
     }
   }
 
-  /// Gets the window at the specified point.
+  /// Gets the top-level window at the specified point.
   pub fn window_from_point(
     &self,
     point: &Point,

packages/wm-platform/src/platform_impl/windows/display.rs

@@ -37,21 +37,21 @@ pub trait DisplayExtWindows {
 
 /// Windows-specific extensions for `DisplayDevice`.
 pub trait DisplayDeviceExtWindows {
-  /// Gets the device interface path.
+  /// Gets the device path.
   ///
   /// This can be an empty string for virtual display devices.
   ///
   /// # Platform-specific
   ///
   /// This method is only available on Windows.
-  fn device_interface_path(&self) -> &str;
+  fn device_path(&self) -> Option<String>;
 
-  /// Gets the hardware ID from the device interface path.
+  /// Gets the hardware ID from the device path.
   ///
   /// # Example usage
   ///
   /// ```rust,no_run
-  /// device.device_interface_path(); // "\\?\DISPLAY#DEL40A3#5&1234abcd&0&UID256#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}"
+  /// device.device_path(); // "\\?\DISPLAY#DEL40A3#5&1234abcd&0&UID256#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}"
   /// device.hardware_id(); // Some("DEL40A3")
   /// ```
   ///
@@ -75,8 +75,8 @@ impl DisplayExtWindows for crate::Display {
 }
 
 impl DisplayDeviceExtWindows for crate::DisplayDevice {
-  fn device_interface_path(&self) -> &str {
-    &self.inner.device_interface_path
+  fn device_path(&self) -> Option<String> {
+    self.inner.device_path.clone()
   }
 
   fn hardware_id(&self) -> Option<String> {
@@ -184,8 +184,8 @@ impl Display {
         };
 
         // When passing the `EDD_GET_DEVICE_INTERFACE_NAME` flag, the
-        // returned `DISPLAY_DEVICEW` will contain the device interface
-        // path in the `DeviceID` field.
+        // returned `DISPLAY_DEVICEW` will contain the device path in the
+        // `DeviceID` field.
         unsafe {
           EnumDisplayDevicesW(
             PCWSTR(monitor_info.szDevice.as_ptr()),
@@ -200,14 +200,7 @@ impl Display {
       // Filter out any devices that are not active.
       .filter(|device| device.StateFlags & DISPLAY_DEVICE_ACTIVE != 0)
       .map(|device| {
-        // NOTE: This may be an empty string for virtual display devices.
-        let device_interface_path =
-          String::from_utf16_lossy(&device.DeviceID)
-            .trim_end_matches('\0')
-            .to_string();
-
-        DisplayDevice::new(adapter_name.clone(), device_interface_path)
-          .into()
+        DisplayDevice::new(adapter_name.clone(), &device.DeviceID).into()
       })
       .collect();
 
@@ -274,19 +267,25 @@ pub(crate) struct DisplayDevice {
   /// Device interface path (e.g.
   /// `\\?\DISPLAY#DEL40A3#5&1234abcd&0&UID256#
   /// {e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}`).
-  device_interface_path: String,
+  device_path: Option<String>,
 }
 
 impl DisplayDevice {
   /// Windows-specific implementation of [`DisplayDevice::new`].
   #[must_use]
-  pub(crate) fn new(
-    adapter_name: String,
-    device_interface_path: String,
-  ) -> Self {
+  pub(crate) fn new(adapter_name: String, device_path: &[u16]) -> Self {
+    // NOTE: This may be an empty string for virtual display devices.
+    let device_path = String::from_utf16_lossy(device_path)
+      .trim_end_matches('\0')
+      .to_string();
+
+    // Check that the device path is valid. If not, set it to `None`.
+    let device_path =
+      (device_path.split('#').count() >= 4).then_some(device_path);
+
     Self {
       adapter_name,
-      device_interface_path,
+      device_path,
     }
   }
 
@@ -304,7 +303,8 @@ impl DisplayDevice {
   /// [`DisplayDeviceExtWindows::hardware_id`].
   fn hardware_id(&self) -> Option<String> {
     self
-      .device_interface_path
+      .device_path
+      .as_deref()?
       .split('#')
       .nth(1)
       .map(ToString::to_string)

packages/wm-platform/src/platform_impl/windows/native_window.rs

@@ -227,13 +227,6 @@ pub trait NativeWindowWindowsExt {
     &self,
     opacity_delta: &Delta<OpacityValue>,
   ) -> crate::Result<()>;
-
-  /// Gets the root ancestor (top-level) window.
-  ///
-  /// # Platform-specific
-  ///
-  /// This method is only available on Windows.
-  fn root_window(&self) -> crate::Result<crate::NativeWindow>;
 }
 
 impl NativeWindowWindowsExt for crate::NativeWindow {
@@ -334,18 +327,6 @@ impl NativeWindowWindowsExt for crate::NativeWindow {
   ) -> crate::Result<()> {
     self.inner.adjust_transparency(opacity_delta)
   }
-
-  fn root_window(&self) -> crate::Result<crate::NativeWindow> {
-    let handle = unsafe { GetAncestor(self.inner.hwnd(), GA_ROOT) };
-
-    if handle.0 == 0 {
-      return Err(crate::Error::Platform(
-        "Failed to get root ancestor window.".to_string(),
-      ));
-    }
-
-    Ok(NativeWindow::new(handle.0).into())
-  }
 }
 
 #[derive(Clone, Debug)]
@@ -1096,12 +1077,16 @@ pub(crate) fn window_from_point(
   };
 
   let handle = unsafe { WindowFromPoint(point) };
-
   if handle.0 == 0 {
     return Ok(None);
   }
 
-  Ok(Some(NativeWindow::new(handle.0).into()))
+  let root = unsafe { GetAncestor(handle, GA_ROOT) };
+  if root.0 == 0 {
+    return Ok(None);
+  }
+
+  Ok(Some(NativeWindow::new(root.0).into()))
 }
 
 /// Windows-specific implementation of [`Dispatcher::reset_focus`].

packages/wm/src/events/handle_display_settings_changed.rs

@@ -1,6 +1,4 @@
 use anyhow::Context;
-#[cfg(target_os = "windows")]
-use wm_platform::{DisplayDeviceExtWindows, DisplayExtWindows};
 
 use crate::{
   commands::monitor::{
@@ -115,20 +113,21 @@ fn find_matching_monitor<'a>(
       #[cfg(target_os = "windows")]
       {
         existing.handle == properties.handle
-          || existing.device_path.is_some_and(|device_path| {
-            device_path == properties.device_path()
+          || existing.device_path.as_deref().is_some_and(|device_path| {
+            properties.device_path.as_deref() == Some(device_path)
           })
-          || existing.hardware_id.is_some_and(|hardware_id| {
+          || existing.hardware_id.as_deref().is_some_and(|hardware_id| {
             let is_unique = monitors
               .iter()
               .filter(|other_monitor| {
-                other_monitor.native_properties().hardware_id
-                  == hardware_id
+                other_monitor.native_properties().hardware_id.as_deref()
+                  == Some(hardware_id)
               })
               .count()
               == 1;
 
-            is_unique && hardware_id == properties.hardware_id
+            is_unique
+              && properties.hardware_id.as_deref() == Some(hardware_id)
           })
       }
     };

packages/wm/src/events/handle_mouse_move.rs

@@ -86,8 +86,6 @@ pub fn handle_mouse_move(
         state
           .dispatcher
           .window_from_point(position)?
-          .map(|native| native.root_window())
-          .ok()
           .and_then(|native| state.window_from_native(&native))
       }
     };

packages/wm/src/models/native_monitor_properties.rs

@@ -1,4 +1,6 @@
 use wm_platform::{Display, Rect};
+#[cfg(target_os = "windows")]
+use wm_platform::{DisplayDeviceExtWindows, DisplayExtWindows};
 
 #[derive(Debug, Clone)]
 pub struct NativeMonitorProperties {