#include <cstdlib>
#include <vector>
-#include <string>
-
/* The GetLongPathName macro may be defined on the compiling machine,
* but we must use a bit of trickery if the resulting executable is
* to run on a Win95 machine.
string const get_long_path(string const & short_path)
{
+ // GetLongPathName needs the path in file system encoding.
+ // We can use to_local8bit, since file system encoding and the
+ // local 8 bit encoding are identical on windows.
std::vector<char> long_path(MAX_PATH);
- DWORD result = GetLongPathName(short_path.c_str(),
+ DWORD result = GetLongPathName(to_local8bit(from_utf8(short_path)).c_str(),
&long_path[0], long_path.size());
if (result > long_path.size()) {
BOOST_ASSERT(result <= long_path.size());
}
- return (result == 0) ? short_path : &long_path[0];
+ return (result == 0) ? short_path : to_utf8(from_filesystem8bit(&long_path[0]));
}
} // namespace anon
}
-docstring internal_path(docstring const & p)
-{
- // FIXME UNICODE
- return from_utf8(subst(get_long_path(to_utf8(p)), "\\", "/"));
-}
-
-
string external_path_list(string const & p)
{
return subst(p, '/', '\\');
HRESULT const result = (folder_path_func_)(0, id, 0,
SHGFP_TYPE_CURRENT,
folder_path);
- return (result == 0) ? os::internal_path(folder_path) : string();
+ return (result == 0) ? os::internal_path(to_utf8(from_filesystem8bit(folder_path))) : string();
}
// /platform/shell/reference/functions/shellexecute.asp
char const * action = (mode == VIEW) ? "open" : "edit";
return reinterpret_cast<int>(ShellExecute(NULL, action,
- filename.c_str(), NULL, NULL, 1)) > 32;
+ to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32;
}
string const fonts_dir = addPath(package().system_support(), "fonts");
for (int i = 0 ; i < num_fonts_truetype ; ++i) {
- string const font_current =
+ string const font_current =
addName(fonts_dir, win_fonts_truetype[i] + ".ttf");
- AddFontResource(external_path(font_current).c_str());
+ AddFontResource(to_local8bit(from_utf8(external_path(font_current))).c_str());
}
}
string const fonts_dir = addPath(package().system_support(), "fonts");
for(int i = 0 ; i < num_fonts_truetype ; ++i) {
- string const font_current =
+ string const font_current =
addName(fonts_dir, win_fonts_truetype[i] + ".ttf");
- RemoveFontResource(external_path(font_current).c_str());
+ RemoveFontResource(to_local8bit(from_utf8(external_path(font_current))).c_str());
}
}