fix(windows): clone HSTRING so it is not dropped eagerly (#1221)

* fix(windows): move the HSTRING to callback ref: https://discord.com/channels/616186924390023171/1229300159607996437/1229300159607996437 * clone `HSTRING` Co-authored-by: Crend King <[email protected]> * do same for brwoser args * Update webview-data-dir.md * as_ref * fmt --------- Co-authored-by: Crend King <[email protected]>
tauri-apps · Apr 24, 2024 · c7ca3db · c7ca3db
1 parent 07c1743
commit c7ca3db
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.changes/webview-data-dir.md b/.changes/webview-data-dir.md
@@ -0,0 +1,5 @@
+---
+"wry": "patch"
+---
+
+On Windows, fix data directory created next to the executable with a gibberish name even if it was explicitly provided in `WebConext::new`
diff --git a/src/webview2/mod.rs b/src/webview2/mod.rs
@@ -248,7 +248,7 @@ impl InnerWebView {
       .as_deref()
       .and_then(|context| context.data_directory())
       .and_then(|path| path.to_str())
-      .map(String::from);
+      .map(HSTRING::from);
 
     // additional browser args
     let additional_browser_args = pl_attrs.additional_browser_args.unwrap_or_else(|| {
@@ -280,18 +280,16 @@ impl InnerWebView {
 
       arguments
     });
-    let additional_browser_args = HSTRING::from(additional_browser_args);
-    let additional_browser_args = PCWSTR::from_raw(additional_browser_args.as_ptr());
 
-    let data_directory = data_directory.map(HSTRING::from);
-    let data_directory = data_directory.map(|d| PCWSTR::from_raw(d.as_ptr()));
+    let additional_browser_args = HSTRING::from(additional_browser_args);
 
     let (tx, rx) = mpsc::channel();
     CreateCoreWebView2EnvironmentCompletedHandler::wait_for_async_operation(
       Box::new(move |environmentcreatedhandler| unsafe {
         let options: ICoreWebView2EnvironmentOptions =
           CoreWebView2EnvironmentOptions::default().into();
 
+        let additional_browser_args = PCWSTR::from_raw(additional_browser_args.as_ptr());
         let _ = options.SetAdditionalBrowserArguments(additional_browser_args);
 
         // Get user's system language
@@ -304,9 +302,12 @@ impl InnerWebView {
         );
         options.SetLanguage(PCWSTR::from_raw(lang.as_ptr()))?;
 
+        let data_directory_param = data_directory
+          .as_ref()
+          .map(|d| PCWSTR::from_raw(d.as_ptr()));
         CreateCoreWebView2EnvironmentWithOptions(
           PCWSTR::null(),
-          data_directory.unwrap_or_else(PCWSTR::null),
+          data_directory_param.unwrap_or_else(PCWSTR::null),
           &options,
           &environmentcreatedhandler,
         )