yyc12345/wfassoc
1
0
Fork 0
Code Activity

feat: remove some optional in rust and cbindgen

Browse Source
This commit is contained in:
yyc12345
2026-05-27 13:16:51 +08:00
parent 77924b5937
commit 8c61aa1e1d
5 changed files with 105 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
wfassoc-cdylib/src/lib.rs
View File

@@ -492,16 +492,9 @@ pub extern "C" fn WFProgramResolveName(
let mut pool = pull_writer!(PROGRAM_POOL)?;
let program = pool.get_mut(in_program)?;
let name = match program.resolve_name()? {
Some(name) => {
cstr_ffi::set_ffi_string(&name)?;
cstr_ffi::get_ffi_string()
},
None => {
std::ptr::null()
},
};
Ok(name)
let name = program.resolve_name()?;
cstr_ffi::set_ffi_string(&name)?;
Ok(cstr_ffi::get_ffi_string())
})
}
@@ -515,16 +508,8 @@ pub extern "C" fn WFProgramResolveIcon(
let program = pool.get_mut(in_program)?;
let icon = program.resolve_icon()?;
let token = match icon {
Some(icon) => {
let mut pool = pull_writer!(ICON_RC_POOL)?;
pool.allocate(icon)?
},
None => {
object_pool::invalid_token()
},
};
Ok(token)
let mut pool = pull_writer!(ICON_RC_POOL)?;
Ok(pool.allocate(icon)?)
})
}
@@ -707,11 +692,8 @@ pub extern "C" fn WFExtStatusGetIcon(
let pool = pull_reader!(EXT_STATUS_POOL)?;
let ext_status = pool.get(in_ext_status)?;
let icon = match ext_status.get_icon() {
Some(icon) => icon.get_icon(),
None => ffi_types::INVALID_HICON,
};
Ok(icon)
let icon = ext_status.get_icon();
Ok(icon.get_icon())
})
}
@@ -750,11 +732,8 @@ pub extern "C" fn WFSelfExtStatusGetIcon(
let pool = pull_reader!(SELF_EXT_STATUS_POOL)?;
let self_ext_status = pool.get(in_self_ext_status)?;
let icon = match self_ext_status.get_icon() {
Some(icon) => icon.get_icon(),
None => ffi_types::INVALID_HICON,
};
Ok(icon)
let icon = self_ext_status.get_icon();
Ok(icon.get_icon())
})
}