fix(Windows): fix build regression when tray feature is used (#618)

tauri-apps · Nov 8, 2022 · 081664d · 081664d
1 parent c37bc7d
commit 081664d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.changes/config.json b/.changes/config.json
@@ -1,7 +1,9 @@
 {
   "gitSiteUrl": "https://github.com/tauri-apps/tao/",
   "timeout": 3600000,
-  "additionalBumpTypes": ["housekeeping"],
+  "additionalBumpTypes": [
+    "housekeeping"
+  ],
   "pkgManagers": {
     "rust": {
       "version": true,
@@ -35,7 +37,7 @@
       ],
       "publish": [
         {
-          "command": "cargo package --allow-dirty",
+          "command": "cargo package --allow-dirty --features tray",
           "dryRunCommand": true
         },
         {
@@ -78,4 +80,4 @@
       "manager": "rust"
     }
   }
-}
+}
diff --git a/.changes/fix-compile-regression.md b/.changes/fix-compile-regression.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+On Windows, fix compliation regression introduced in 0.15.1 when `tray` feature is active
diff --git a/src/platform_impl/windows/mod.rs b/src/platform_impl/windows/mod.rs
@@ -97,13 +97,16 @@ impl DeviceId {
 #[non_exhaustive]
 #[derive(Debug)]
 pub enum OsError {
+  #[allow(unused)]
+  CreationError(&'static str),
   IoError(std::io::Error),
 }
 impl std::error::Error for OsError {}
 
 impl std::fmt::Display for OsError {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     match self {
+      OsError::CreationError(e) => f.pad(e),
       OsError::IoError(e) => f.pad(&e.to_string()),
     }
   }

diff --git a/src/platform_impl/windows/system_tray.rs b/src/platform_impl/windows/system_tray.rs
@@ -259,7 +259,7 @@ unsafe extern "system" fn tray_subclass_proc(
   let mut subclass_input = &mut *(subclass_input_ptr);
 
   if msg == WM_DESTROY {
-    Box::from_raw(subclass_input_ptr);
+    drop(Box::from_raw(subclass_input_ptr));
   }
 
   if msg == WM_USER_UPDATE_TRAYMENU {