1c/example-native-api-rs
1
0
Fork 0
mirror of https://github.com/medigor/example-native-api-rs.git synced 2025-07-03 00:58:13 +02:00
Code Issues Releases Activity

убрал лишние лайфтаймы

Browse Source
This commit is contained in:
medigor
2022-12-07 22:05:31 +03:00
parent b55e50ccee
commit 3bd8e7fc42
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/addin1.rs
View File

@ -140,9 +140,14 @@ impl Addin for Addin1 {
fn is_prop_writable(&mut self, num: usize) -> bool { fn is_prop_writable(&mut self, num: usize) -> bool {
match num { match num {
0 => false,
1 => true,
2 => true, 2 => true,
3 => true, 3 => true,
_ => true, 4 => true,
5 => true,
6 => true,
_ => false,
} }
} }

17
src/ffi.rs
View File

@ -289,11 +289,8 @@ struct LanguageExtenderBaseVTable<T: Addin> {
find_prop: unsafe extern "system" fn(&mut LanguageExtenderBase<T>, *const u16) -> c_long, find_prop: unsafe extern "system" fn(&mut LanguageExtenderBase<T>, *const u16) -> c_long,
get_prop_name: get_prop_name:
unsafe extern "system" fn(&mut LanguageExtenderBase<T>, c_long, c_long) -> *const u16, unsafe extern "system" fn(&mut LanguageExtenderBase<T>, c_long, c_long) -> *const u16,
get_prop_val: for<'a> unsafe extern "system" fn( get_prop_val:
&mut LanguageExtenderBase<T>, unsafe extern "system" fn(&mut LanguageExtenderBase<T>, c_long, &mut TVariant) -> bool,
c_long,
&'a mut TVariant,
) -> bool,
set_prop_val: set_prop_val:
unsafe extern "system" fn(&mut LanguageExtenderBase<T>, c_long, &TVariant) -> bool, unsafe extern "system" fn(&mut LanguageExtenderBase<T>, c_long, &TVariant) -> bool,
is_prop_readable: unsafe extern "system" fn(&mut LanguageExtenderBase<T>, c_long) -> bool, is_prop_readable: unsafe extern "system" fn(&mut LanguageExtenderBase<T>, c_long) -> bool,
@ -316,7 +313,7 @@ struct LanguageExtenderBaseVTable<T: Addin> {
*const TVariant, *const TVariant,
c_long, c_long,
) -> bool, ) -> bool,
call_as_func: for<'a> unsafe extern "system" fn( call_as_func: unsafe extern "system" fn(
&mut LanguageExtenderBase<T>, &mut LanguageExtenderBase<T>,
c_long, c_long,
&mut TVariant, &mut TVariant,
@ -379,10 +376,10 @@ unsafe extern "system" fn get_prop_name<T: Addin>(
name.as_ptr() name.as_ptr()
} }
unsafe extern "system" fn get_prop_val<'a, T: Addin>( unsafe extern "system" fn get_prop_val<T: Addin>(
component: &mut LanguageExtenderBase<T>, component: &mut LanguageExtenderBase<T>,
num: c_long, num: c_long,
val: &'a mut TVariant, val: &mut TVariant,
) -> bool { ) -> bool {
let Some(mem) = component.memory else { let Some(mem) = component.memory else {
return false; return false;
@ -499,10 +496,10 @@ unsafe extern "system" fn call_as_proc<T: Addin>(
.call_as_proc(method_num as usize, param_values.as_slice()) .call_as_proc(method_num as usize, param_values.as_slice())
} }
unsafe extern "system" fn call_as_func<'a, T: Addin>( unsafe extern "system" fn call_as_func<T: Addin>(
component: &mut LanguageExtenderBase<T>, component: &mut LanguageExtenderBase<T>,
method_num: c_long, method_num: c_long,
ret_value: &'a mut TVariant, ret_value: &mut TVariant,
params: *const TVariant, params: *const TVariant,
size_array: c_long, size_array: c_long,
) -> bool { ) -> bool {