mirror of
https://github.com/Sarsoo/csbindgen.git
synced 2024-12-23 06:56:27 +00:00
Merge branch 'main' into support-reference
This commit is contained in:
commit
d4ba618c35
16
csbindgen-tests/src/lib.rs
vendored
16
csbindgen-tests/src/lib.rs
vendored
@ -606,8 +606,24 @@ pub struct CallbackTable {
|
|||||||
pub foobar: extern "C" fn(i: i32) -> i32,
|
pub foobar: extern "C" fn(i: i32) -> i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
pub extern "C" fn reference_type(_a: &i32, _b: &*mut i32, _c: &[u8; 16], _d: &Context) {}
|
pub extern "C" fn reference_type(_a: &i32, _b: &*mut i32, _c: &[u8; 16], _d: &Context) {}
|
||||||
|
|
||||||
|
pub struct InternalHiddenContext {
|
||||||
|
pub a: i32
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct TreatAsEmptyStruct {
|
||||||
|
internal: std::sync::Arc<InternalHiddenContext>
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn init_treat_as_empty_struct_context(_out: NonNull<Box<TreatAsEmptyStruct>>) {}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C" fn free_treat_as_empty_struct_context(_src: *mut TreatAsEmptyStruct) {}
|
||||||
|
|
||||||
|
|
||||||
// fn run_physix(){
|
// fn run_physix(){
|
||||||
// unsafe {
|
// unsafe {
|
||||||
// let foundation = physx_create_foundation();
|
// let foundation = physx_create_foundation();
|
||||||
|
@ -170,6 +170,15 @@ pub fn collect_struct(ast: &syn::File, result: &mut Vec<RustStruct>) {
|
|||||||
is_union: true,
|
is_union: true,
|
||||||
});
|
});
|
||||||
} else if let Item::Struct(t) = item {
|
} else if let Item::Struct(t) = item {
|
||||||
|
let mut repr = None;
|
||||||
|
for attr in &t.attrs {
|
||||||
|
let last_segment = attr.path.segments.last().unwrap();
|
||||||
|
if last_segment.ident == "repr" {
|
||||||
|
repr = Some(attr.tokens.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(_) = repr {
|
||||||
if let syn::Fields::Named(f) = &t.fields {
|
if let syn::Fields::Named(f) = &t.fields {
|
||||||
let struct_name = t.ident.to_string();
|
let struct_name = t.ident.to_string();
|
||||||
let fields = collect_fields(f);
|
let fields = collect_fields(f);
|
||||||
@ -195,6 +204,16 @@ pub fn collect_struct(ast: &syn::File, result: &mut Vec<RustStruct>) {
|
|||||||
is_union: false,
|
is_union: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// non #[repr(?)] struct, treat as Unit struct
|
||||||
|
let struct_name = t.ident.to_string();
|
||||||
|
let fields: Vec<FieldMember> = Vec::new();
|
||||||
|
result.push(RustStruct {
|
||||||
|
struct_name,
|
||||||
|
fields,
|
||||||
|
is_union: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
13
dotnet-sandbox/NativeMethods.cs
vendored
13
dotnet-sandbox/NativeMethods.cs
vendored
@ -176,9 +176,17 @@ namespace CsBindgen
|
|||||||
[DllImport(__DllName, EntryPoint = "call_bindgen_lz4", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
|
[DllImport(__DllName, EntryPoint = "call_bindgen_lz4", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
|
||||||
public static extern void call_bindgen_lz4();
|
public static extern void call_bindgen_lz4();
|
||||||
|
|
||||||
|
|
||||||
[DllImport(__DllName, EntryPoint = "reference_type", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
|
[DllImport(__DllName, EntryPoint = "reference_type", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
|
||||||
public static extern void reference_type(int* _a, int** _b, void/* byte[] */* _c, Context* _d);
|
public static extern void reference_type(int* _a, int** _b, void/* byte[] */* _c, Context* _d);
|
||||||
|
|
||||||
|
[DllImport(__DllName, EntryPoint = "init_treat_as_empty_struct_context", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
|
||||||
|
public static extern void init_treat_as_empty_struct_context(TreatAsEmptyStruct** _out);
|
||||||
|
|
||||||
|
[DllImport(__DllName, EntryPoint = "free_treat_as_empty_struct_context", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
|
||||||
|
public static extern void free_treat_as_empty_struct_context(TreatAsEmptyStruct* _src);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -263,6 +271,11 @@ namespace CsBindgen
|
|||||||
public delegate* unmanaged[Cdecl]<int, int> foobar;
|
public delegate* unmanaged[Cdecl]<int, int> foobar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[StructLayout(LayoutKind.Sequential)]
|
||||||
|
internal unsafe partial struct TreatAsEmptyStruct
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
[Flags]
|
[Flags]
|
||||||
internal enum EnumFlags : uint
|
internal enum EnumFlags : uint
|
||||||
|
Loading…
Reference in New Issue
Block a user