fix compiler warnings about unused parameter

[lyx.git] / src / support / os_win32.C

diff --git a/src/support/os_win32.C b/src/support/os_win32.C
index 3dc6ab652a90316150f957b46867027044dbb771..b5545b85e689db5926d21b8a7ac7e8198d2c6f10 100644 (file)
--- a/src/support/os_win32.C
+++ b/src/support/os_win32.C
@@ -18,18 +18,18 @@
 #include "support/os_win32.h"
 #include "support/lstrings.h"
 #include "support/filetools.h"
+#include "support/ExceptionMessage.h"
 #include "support/package.h"
 #include "support/path.h"
 
 #include "debug.h"
+#include "gettext.h"
 
 #include <boost/assert.hpp>
 
 #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.
@@ -217,8 +217,11 @@ namespace {
 
 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()) {
@@ -228,7 +231,7 @@ string const get_long_path(string const & short_path)
                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
@@ -240,13 +243,6 @@ string internal_path(string const & p)
 }
 
 
-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, '/', '\\');
@@ -330,36 +326,21 @@ void windows_style_tex_paths(bool use_windows_paths)
 }
 
 
-namespace {
-
-void bail_out()
-{
-#ifndef CXX_GLOBAL_CSTD
-       using std::exit;
-#endif
-       exit(1);
-}
-
-} // namespace anon
-
-
 GetFolderPath::GetFolderPath()
        : folder_module_(0),
          folder_path_func_(0)
 {
        folder_module_ = LoadLibrary("shfolder.dll");
        if (!folder_module_) {
-               lyxerr << "Unable to load shfolder.dll\nPlease install."
-                      << std::endl;
-               bail_out();
+               throw ExceptionMessage(ErrorException, _("System file not found"),
+                       _("Unable to load shfolder.dll\nPlease install."));
        }
 
        folder_path_func_ = reinterpret_cast<function_pointer>(::GetProcAddress(folder_module_, "SHGetFolderPathA"));
        if (folder_path_func_ == 0) {
-               lyxerr << "Unable to find SHGetFolderPathA in shfolder.dll\n"
-                         "Don't know how to proceed. Sorry."
-                      << std::endl;
-               bail_out();
+               throw ExceptionMessage(ErrorException, _("System function not found"),
+                       _("Unable to find SHGetFolderPathA in shfolder.dll\n"
+                         "Don't know how to proceed. Sorry."));
        }
 }
 
@@ -391,7 +372,7 @@ string const GetFolderPath::operator()(folder_id _id) const
        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();
 }
 
 
@@ -418,7 +399,7 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode)
        //                 /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;
 }
 
 
@@ -428,9 +409,9 @@ void addFontResources()
        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());
        }
 }
 
@@ -441,9 +422,9 @@ void restoreFontResources()
        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());
        }
 }