Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added FFI bindings to lib.rs #1

Merged
merged 13 commits into from Mar 23, 2016
Merged

Added FFI bindings to lib.rs #1

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7bdb9f8
added basic ffi bindings
ddefisher Mar 18, 2016
abaae23
rust FFI bindings
ddefisher Mar 18, 2016
804380e
add example tinytest
ddefisher Mar 18, 2016
868aeea
add future proof rustc flags
ddefisher Mar 18, 2016
8d04809
remove test block
ddefisher Mar 18, 2016
cf8c4f1
change colorchooser argument types
ddefisher Mar 18, 2016
e09b855
Turn on TravisCI tests.
jdm Mar 21, 2016
b556d69
Rename .travis to .travis.yml
jdm Mar 21, 2016
482a266
Merge pull request #1 from jdm/patch-1
ddefisher Mar 21, 2016
fdd6af7
pull request fixes
ddefisher Mar 22, 2016
ca76776
change function signatures and pull request tweaks
ddefisher Mar 22, 2016
6bb8c89
move maping to as_ptr into local variable
ddefisher Mar 23, 2016
50cd834
move vector as_ptr method to function call argument
ddefisher Mar 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions examples/tinytest/src/main.rs
View file
Open in desktop
Expand Up @@ -33,12 +33,13 @@ fn save_file_dialog(title: &CStr, path: &CStr,
num_patterns: c_int,
filter_pattern_one: &CStr, des: &CStr) -> *const c_char {
let filter_patterns : [&CStr; 1] = [filter_pattern_one];
let ptr_filter_patterns = filter_patterns.iter().map(|c| c.as_ptr()).collect::<Vec<*const c_char>>().as_ptr();
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, this is still unsafe. The as_ptr() is what makes the Vec go out of scope; it should be moved to the actual argument to the function call instead.

unsafe {
let result: *const c_char = tinyfiledialogs::tinyfd_saveFileDialog(
title.as_ptr(),
path.as_ptr(),
num_patterns,
filter_patterns.iter().map(|c| c.as_ptr()).collect::<Vec<*const c_char>>().as_ptr(),
ptr_filter_patterns,
des.as_ptr());

result
Expand All @@ -49,12 +50,13 @@ fn open_file_dialog(title: &CStr, path: &CStr,
num_patterns: c_int, filter_pattern_one: &CStr,
des: &CStr, multi_select: c_int) -> *const c_char {
let filter_patterns : [&CStr; 1] = [filter_pattern_one];
let ptr_filter_patterns = filter_patterns.iter().map(|c| c.as_ptr()).collect::<Vec<*const c_char>>().as_ptr();
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.

unsafe {
let result: *const c_char = tinyfiledialogs::tinyfd_openFileDialog(
title.as_ptr(),
path.as_ptr(),
num_patterns,
filter_patterns.iter().map(|c| c.as_ptr()).collect::<Vec<*const c_char>>().as_ptr(),
ptr_filter_patterns,
des.as_ptr(),
multi_select);

Expand Down