aphrody-labs/cef-rs
1
0 Fork 0
mirror of https://github.com/aphrody-labs/cef-rs.git synced 2026-10-13 21:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: preserve CefString alias in arguments

Browse Source
This commit is contained in:
Bill Avery committed 2025-03-21 01:06:39 -07:00
1 parent 461ab52712
commit b5ed4f57c8
2 files changed
+31 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cef/examples/cefsimple/main.rs
+3 -3
View File
@@ -280,8 +280,8 @@ fn main() {
let sandbox = SandboxInfo::new();
let switch = CefStringUserfreeUtf16::from("type");
let is_browser_process = cmd.has_switch(Some(&CefStringUtf16::from(&switch))) != 1;
let switch = CefStringUserfree::from("type");
let is_browser_process = cmd.has_switch(Some(&CefString::from(&switch))) != 1;
let window = Arc::new(Mutex::new(None));
let mut app = DemoApp::new(window.clone());
@@ -297,7 +297,7 @@ fn main() {
assert!(ret == -1, "cannot execute browser process");
} else {
let process_type = CefStringUserfreeUtf8::from(&CefString::from(
&cmd.get_switch_value(Some(&CefStringUtf16::from(&switch))),
&cmd.get_switch_value(Some(&CefString::from(&switch))),
));
println!("launch process {process_type}");
assert!(ret >= 0, "cannot execute non-browser process");
update-bindings/src/parse_tree.rs
+28 -4
View File
@@ -485,7 +485,7 @@ impl SignatureRef<'_> {
.get(&ty_string)
.and_then(|i| tree.struct_declarations.get(*i))
.map(|s| s.methods.is_empty()
&&!s.fields.is_empty()
&& !s.fields.is_empty()
&& !s.fields.iter().map(|f| f.name.as_str()).eq(["_unused"]))
.unwrap_or_default() =>
{
@@ -523,6 +523,24 @@ impl SignatureRef<'_> {
let #name = #name.map(|arg| arg.as_raw()).#impl_default;
})
}
Some(NameMapEntry {
ty: NameMapType::TypeAlias,
..
}) if ty_string.as_str() == "cef_string_t" => {
let impl_default = match modifiers {
[TypeModifier::ConstPtr] => {
quote! { unwrap_or(std::ptr::null()) }
}
[TypeModifier::MutPtr] => {
quote! { unwrap_or(std::ptr::null_mut()) }
}
_ => quote! { unwrap_or_default() },
};
Some(quote! {
let #name = #name.map(|arg| arg.as_raw()).#impl_default;
})
}
Some(_) => {
Some(quote! {
let #name = #name.as_raw();
@@ -839,7 +857,9 @@ impl SignatureRef<'_> {
}),
_ => None,
}
} else if CUSTOM_STRING_TYPES.contains(&ty_string.as_str()) {
} else if ty_string.as_str() == "cef_string_t" ||
CUSTOM_STRING_TYPES.contains(&ty_string.as_str())
{
match modifiers {
[TypeModifier::MutPtr] => Some(quote! {
let mut #arg_name = if #arg_name.is_null() { None } else { Some(#arg_name.into()) };
@@ -969,7 +989,9 @@ impl SignatureRef<'_> {
})
.flatten()
.or_else(|| {
if CUSTOM_STRING_TYPES.contains(&ty_string.as_str()) {
if ty_string.as_str() == "cef_string_t" ||
CUSTOM_STRING_TYPES.contains(&ty_string.as_str())
{
None
} else {
let ty =
@@ -1259,7 +1281,9 @@ const CUSTOM_STRING_USERFREE_ALIASES: &[&str] = &[
];
fn is_custom_string_userfree_alias(name: &str) -> bool {
name == "cef_string_userfree_t" || CUSTOM_STRING_USERFREE_ALIASES.contains(&name)
name == "cef_string_t"
|| name == "cef_string_userfree_t"
|| CUSTOM_STRING_USERFREE_ALIASES.contains(&name)
}
struct StructDeclarationRef<'a> {