Return errors

Author: Legend-Master

plugins/recent-doc/src/commands.rs

@@ -102,8 +102,8 @@ pub(crate) fn clear_recent_documents<R: Runtime>(_app: AppHandle<R>) -> Result<(
 
         let dests: IApplicationDestinations =
             CoCreateInstance(&ApplicationDestinations, None, CLSCTX_INPROC_SERVER)?;
-        let _ = dests.SetAppID(PCWSTR::from_raw(app_id_hstring.as_ptr()));
-        let _ = dests.RemoveAllDestinations();
+        dests.SetAppID(&app_id_hstring)?;
+        dests.RemoveAllDestinations()?;
     }
 
     #[cfg(target_os = "macos")]
@@ -132,25 +132,23 @@ pub(crate) fn get_recent_documents<R: Runtime>(_app: AppHandle<R>) -> Result<Vec
 
         let app_id = &_app.config().identifier;
         let app_id_hstring = HSTRING::from(app_id);
-        let app_id_pcwstr = PCWSTR::from_raw(app_id_hstring.as_ptr());
 
         let doc_lists: IApplicationDocumentLists =
             CoCreateInstance(&ApplicationDocumentLists, None, CLSCTX_INPROC_SERVER)?;
-        let _ = doc_lists.SetAppID(app_id_pcwstr);
-        if let Ok(obj_array) = doc_lists.GetList::<IObjectArray>(ADLT_RECENT, 30) {
-            let count = obj_array.GetCount().unwrap_or(0);
-
-            for i in 0..count {
-                if let Ok(shell_item) = obj_array.GetAt::<IShellItem>(i) {
-                    if let Ok(name_pwstr) = shell_item.GetDisplayName(SIGDN_FILESYSPATH) {
-                        if let Ok(path) = name_pwstr.to_string() {
-                            if !path.is_empty() {
-                                recent_docs.push(path);
-                            }
+        doc_lists.SetAppID(&app_id_hstring)?;
+        let obj_array: IObjectArray = doc_lists.GetList(ADLT_RECENT, 30)?;
+        let count = obj_array.GetCount()?;
+
+        for i in 0..count {
+            if let Ok(shell_item) = obj_array.GetAt::<IShellItem>(i) {
+                if let Ok(name_pwstr) = shell_item.GetDisplayName(SIGDN_FILESYSPATH) {
+                    if let Ok(path) = name_pwstr.to_string() {
+                        if !path.is_empty() {
+                            recent_docs.push(path);
                         }
-
-                        CoTaskMemFree(Some(name_pwstr.as_ptr() as *const core::ffi::c_void));
                     }
+
+                    CoTaskMemFree(Some(name_pwstr.as_ptr() as *const core::ffi::c_void));
                 }
             }
         }