fix: windows crash when creating a webview if winres fails

Author: Klemen2

packages/desktop/src/default_icon.rs

@@ -6,10 +6,10 @@ use std::path::Path;
 
 /// Trait that creates icons for various types
 pub trait DioxusIconTrait {
-    fn get_icon() -> Self
+    fn get_icon() -> Result<Self>
     where
         Self: Sized;
-    fn from_memory(value: &[u8]) -> Self
+    fn from_memory(value: &[u8]) -> Result<Self>
     where
         Self: Sized;
     fn path<P: AsRef<Path>>(path: P, size: Option<(u32, u32)>) -> Result<Self>
@@ -24,11 +24,11 @@ static DEFAULT_ICON: &[u8] = include_bytes!("./assets/default_icon.png");
 #[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
 use crate::trayicon::DioxusTrayIcon;
 
-fn load_image_from_memory(value: &[u8]) -> (Vec<u8>, u32, u32) {
-    let img = load_from_memory(value).expect("MISSING DEFAULT ICON");
+fn load_image_from_memory(value: &[u8]) -> Result<(Vec<u8>, u32, u32)> {
+    let img = load_from_memory(value)?;
     let rgba = img.to_rgba8();
     let (width, height) = img.dimensions();
-    (rgba.to_vec(), width, height)
+    Ok((rgba.to_vec(), width, height))
 }
 
 fn load_image_from_path<P: AsRef<Path>>(path: P) -> Result<(Vec<u8>, u32, u32)> {
@@ -40,25 +40,26 @@ fn load_image_from_path<P: AsRef<Path>>(path: P) -> Result<(Vec<u8>, u32, u32)>
 
 #[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
 impl DioxusIconTrait for DioxusTrayIcon {
-    fn get_icon() -> Self
+    fn get_icon() -> Result<Self>
     where
         Self: Sized,
     {
+        #[cfg(target_os = "windows")]
         #[cfg(any(target_os = "linux", target_os = "macos"))]
         {
-            let (img, width, height) = load_image_from_memory(DEFAULT_ICON);
-            DioxusTrayIcon::from_rgba(img, width, height).expect("image parse failed")
+            let (img, width, height) = load_image_from_memory(DEFAULT_ICON)?;
+            DioxusTrayIcon::from_rgba(img, width, height).map_err(Into::into)
         }
         #[cfg(target_os = "windows")]
-        DioxusTrayIcon::from_resource(32512, None).expect("image parse failed")
+        DioxusTrayIcon::from_resource(32512, None).map_err(Into::into)
     }
 
-    fn from_memory(value: &[u8]) -> Self
+    fn from_memory(value: &[u8]) -> Result<Self>
     where
         Self: Sized,
     {
-        let (icon, width, height) = load_image_from_memory(value);
-        DioxusTrayIcon::from_rgba(icon, width, height).expect("image parse failed")
+        let (icon, width, height) = load_image_from_memory(value)?;
+        DioxusTrayIcon::from_rgba(icon, width, height).map_err(Into::into)
     }
 
     fn path<P: AsRef<Path>>(path: P, size: Option<(u32, u32)>) -> Result<Self>
@@ -79,25 +80,25 @@ use crate::menubar::DioxusMenuIcon;
 
 #[cfg(not(any(target_os = "ios", target_os = "android")))]
 impl DioxusIconTrait for DioxusMenuIcon {
-    fn get_icon() -> Self
+    fn get_icon() -> Result<Self>
     where
         Self: Sized,
     {
         #[cfg(not(target_os = "windows"))]
         {
-            let (img, width, height) = load_image_from_memory(DEFAULT_ICON);
-            DioxusMenuIcon::from_rgba(img, width, height).expect("image parse failed")
+            let (img, width, height) = load_image_from_memory(DEFAULT_ICON)?;
+            DioxusMenuIcon::from_rgba(img, width, height).map_err(Into::into)
         }
         #[cfg(target_os = "windows")]
-        DioxusMenuIcon::from_resource(32512, None).expect("image parse failed")
+        DioxusMenuIcon::from_resource(32512, None).map_err(Into::into)
     }
 
-    fn from_memory(value: &[u8]) -> Self
+    fn from_memory(value: &[u8]) -> Result<Self>
     where
         Self: Sized,
     {
-        let (icon, width, height) = load_image_from_memory(value);
-        DioxusMenuIcon::from_rgba(icon, width, height).expect("image parse failed")
+        let (icon, width, height) = load_image_from_memory(value)?;
+        DioxusMenuIcon::from_rgba(icon, width, height).map_err(Into::into)
     }
 
     fn path<P: AsRef<Path>>(path: P, size: Option<(u32, u32)>) -> Result<Self>
@@ -119,25 +120,25 @@ use tao::window::Icon;
 use tao::platform::windows::IconExtWindows;
 
 impl DioxusIconTrait for Icon {
-    fn get_icon() -> Self
+    fn get_icon() -> Result<Self>
     where
         Self: Sized,
     {
         #[cfg(not(target_os = "windows"))]
         {
-            let (img, width, height) = load_image_from_memory(DEFAULT_ICON);
-            Icon::from_rgba(img, width, height).expect("image parse failed")
+            let (img, width, height) = load_image_from_memory(DEFAULT_ICON)?;
+            Icon::from_rgba(img, width, height).map_err(Into::into)
         }
         #[cfg(target_os = "windows")]
-        Icon::from_resource(32512, None).expect("image parse failed")
+        Icon::from_resource(32512, None).map_err(Into::into)
     }
 
-    fn from_memory(value: &[u8]) -> Self
+    fn from_memory(value: &[u8]) -> Result<Self>
     where
         Self: Sized,
     {
-        let (icon, width, height) = load_image_from_memory(value);
-        Icon::from_rgba(icon, width, height).expect("image parse failed")
+        let (icon, width, height) = load_image_from_memory(value)?;
+        Icon::from_rgba(icon, width, height).map_err(Into::into)
     }
 
     fn path<P: AsRef<Path>>(path: P, size: Option<(u32, u32)>) -> Result<Self>
@@ -154,12 +155,12 @@ impl DioxusIconTrait for Icon {
 }
 
 /// Provides the default icon of the app
-pub fn default_icon<T: DioxusIconTrait>() -> T {
+pub fn default_icon<T: DioxusIconTrait>() -> Result<T> {
     T::get_icon()
 }
 
 /// Helper function to load image from include_bytes!("image.png")
-pub fn icon_from_memory<T: DioxusIconTrait>(value: &[u8]) -> T {
+pub fn icon_from_memory<T: DioxusIconTrait>(value: &[u8]) -> Result<T> {
     T::from_memory(value)
 }
 

packages/desktop/src/trayicon.rs

@@ -28,15 +28,21 @@ pub type DioxusTray = ();
 pub fn init_tray_icon(menu: DioxusTrayMenu, icon: Option<DioxusTrayIcon>) -> DioxusTray {
     #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
     {
-        let builder = tray_icon::TrayIconBuilder::new()
+        let icon = icon.map(Ok).unwrap_or_else(|| crate::default_icon());
+
+        let tray = tray_icon::TrayIconBuilder::new()
             .with_menu(Box::new(menu))
-            .with_menu_on_left_click(false)
-            .with_icon(match icon {
-                Some(value) => value,
-                None => crate::default_icon(),
-            });
+            .with_menu_on_left_click(false);
+
+        let tray = match icon {
+            Ok(icon) => tray.with_icon(icon),
+            Err(err) => {
+                tracing::trace!("No tray icon: {:?}", err);
+                tray
+            }
+        };
 
-        provide_context(builder.build().expect("tray icon builder failed"))
+        provide_context(tray.build().expect("tray icon builder failed"))
     }
 }
 

packages/desktop/src/webview.rs

@@ -234,7 +234,7 @@ impl WebviewInstance {
 
         // We assume that if the icon is None in cfg, then the user just didnt set it
         if cfg.window.window.window_icon.is_none() {
-            window = window.with_window_icon(Some(crate::default_icon()));
+            window = window.with_window_icon(crate::default_icon().ok());
         }
 
         let window = Arc::new(window.build(&shared.target).unwrap());