townforge/dll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor platform updates and tests fixes

Browse Source
This commit is contained in:
Antony Polukhin 2014-09-24 19:01:55 +04:00
parent 71db3573af
commit 490a670e26
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/dll/detail/posix/shared_library_impl.hpp
View File

@ -101,6 +101,8 @@ public:
boost::system::errc::not_enough_memory,
boost::system::generic_category()
);
return;
} BOOST_CATCH_END
}

20
include/boost/dll/detail/windows/shared_library_impl.hpp
View File

@ -72,18 +72,30 @@ public:
unload();
boost::detail::winapi::DWORD_ flags = static_cast<boost::detail::winapi::DWORD_>(mode);
if (!(mode & load_mode::append_native_decorations)) {
// From MSDN: If the string specifies a module name without a path and the
// file name extension is omitted, the function appends the default library
// extension .dll to the module name.
const bool do_append_deco = (mode & load_mode::append_native_decorations);
if (!do_append_deco && (sl.has_extension() || sl.has_parent_path())) {
handle_ = boost::detail::winapi::LoadLibraryExW(sl.c_str(), 0, flags);
} else {
flags &= ~static_cast<boost::detail::winapi::DWORD_>(load_mode::append_native_decorations);
BOOST_TRY {
handle_ = boost::detail::winapi::LoadLibraryExW((sl.native() + L".dll").c_str(), 0, flags);
// From MSDN: To prevent the function from appending .dll to the module name,
// include a trailing point character (.) in the module name string.
if (!do_append_deco) {
handle_ = boost::detail::winapi::LoadLibraryExW((sl.native() + L".").c_str(), 0, flags);
} else {
flags &= ~static_cast<boost::detail::winapi::DWORD_>(load_mode::append_native_decorations);
handle_ = boost::detail::winapi::LoadLibraryExW((sl.native() + L".dll").c_str(), 0, flags);
}
} BOOST_CATCH (...) {
ec = boost::system::error_code(
boost::system::errc::not_enough_memory,
boost::system::generic_category()
);
return;
} BOOST_CATCH_END
}

8
test/shared_library_load_test.cpp
View File

@ -124,11 +124,15 @@ int test_main(int argc, char* argv[])
boost::filesystem::copy_file(shared_library_path, boost::filesystem::current_path() / shared_library_path.filename());
sl.load("./test_library", load_mode::append_native_decorations);
sl.load("./" / platform_independent_path.filename(), load_mode::append_native_decorations);
BOOST_CHECK(sl.is_loaded());
boost::system::error_code ec;
sl.load("./test_library", ec);
sl.load("./" / platform_independent_path.filename(), ec);
BOOST_CHECK(ec);
BOOST_CHECK(!sl.is_loaded());
sl.load(platform_independent_path.filename(), ec);
BOOST_CHECK(ec);
BOOST_CHECK(!sl.is_loaded());