tiger support on mac snow leopard, include Qt4 frameworks, smart build script with...

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

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 72612e2b6e576de8b5a3a4f10f5a6c055fa13d2e..5577221689d3841b634959080ade3766c0282a62 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -6,6 +6,7 @@
  * \author Ruurd A. Reitsma
  * \author Claus Hentschel
  * \author Angus Leeming
+ * \author Enrico Forestieri
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -32,25 +33,6 @@
 
 #include <QString>
 
-/* 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.
- * Fortunately, Microsoft provide the trickery. All we need is the
- * NewAPIs.h header file, available for download from Microsoft as
- * part of the Platform SDK.
- */
-#if defined (HAVE_NEWAPIS_H)
-// This should be defined already to keep Boost.Filesystem happy.
-# if !defined (WANT_GETFILEATTRIBUTESEX_WRAPPER)
-#   error Expected WANT_GETFILEATTRIBUTESEX_WRAPPER to be defined!
-# endif
-# define WANT_GETLONGPATHNAME_WRAPPER 1
-# define COMPILE_NEWAPIS_STUBS
-# include <NewAPIs.h>
-# undef COMPILE_NEWAPIS_STUBS
-# undef WANT_GETLONGPATHNAME_WRAPPER
-#endif
-
 #include <io.h>
 #include <direct.h> // _getdrive
 #include <shlobj.h>  // SHGetFolderPath
@@ -71,6 +53,11 @@
 #define ASSOCF_INIT_IGNOREUNKNOWN 0
 #endif
 
+extern "C" {
+extern void __wgetmainargs(int * argc, wchar_t *** argv, wchar_t *** envp,
+                          int expand_wildcards, int * new_mode);
+}
+
 using namespace std;
 
 namespace lyx {
@@ -82,6 +69,9 @@ namespace os {
 
 namespace {
 
+int argc_ = 0;
+wchar_t ** argv_ = 0;
+
 bool windows_style_tex_paths_ = true;
 
 string cygdrive = "/cygdrive";
@@ -99,7 +89,7 @@ BOOL terminate_handler(DWORD event)
 
 } // namespace anon
 
-void init(int /* argc */, char * argv[])
+void init(int argc, char * argv[])
 {
        /* Note from Angus, 17 Jan 2005:
         *
@@ -157,6 +147,13 @@ void init(int /* argc */, char * argv[])
         * lyx is invoked as a parameter of hidecmd.exe.
         */
 
+
+       // Get the wide program arguments array
+       wchar_t ** envp = 0;
+       int newmode = 0;
+       __wgetmainargs(&argc_, &argv_, &envp, -1, &newmode);
+       LASSERT(argc == argc_, /**/);
+
        // If Cygwin is detected, query the cygdrive prefix.
        // The cygdrive prefix is needed for translating windows style paths
        // to posix style paths in LaTeX files when the Cygwin teTeX is used.
@@ -205,6 +202,21 @@ void init(int /* argc */, char * argv[])
 }
 
 
+string utf8_argv(int i)
+{
+       LASSERT(i < argc_, /**/);
+       return fromqstr(QString::fromWCharArray(argv_[i]));
+}
+
+
+void remove_internal_args(int i, int num)
+{
+       argc_ -= num;
+       for (int j = i; j < argc_; ++j)
+               argv_[j] = argv_[j + num];
+}
+
+
 string current_root()
 {
        // _getdrive returns the current drive (1=A, 2=B, and so on).
@@ -299,9 +311,18 @@ static QString const get_long_path(QString const & short_path)
 }
 
 
-static QString const get_short_path(QString const & long_path)
+static QString const get_short_path(QString const & long_path, file_access how)
 {
-       // GetShortPathNameW needs the path in utf16 encoding.
+       // CreateFileW and GetShortPathNameW need the path in utf16 encoding.
+       if (how == CREATE) {
+               HANDLE h = CreateFileW((wchar_t *) long_path.utf16(),
+                               GENERIC_WRITE, 0, NULL, CREATE_NEW,
+                               FILE_ATTRIBUTE_NORMAL, NULL);
+               if (h == INVALID_HANDLE_VALUE
+                   && GetLastError() != ERROR_FILE_EXISTS)
+                       return long_path;
+               CloseHandle(h);
+       }
        vector<wchar_t> short_path(MAX_PATH);
        DWORD result = GetShortPathNameW((wchar_t *) long_path.utf16(),
                                       &short_path[0], short_path.size());
@@ -323,9 +344,9 @@ string internal_path(string const & p)
 }
 
 
-string safe_internal_path(string const & p)
+string safe_internal_path(string const & p, file_access how)
 {
-       return subst(fromqstr(get_short_path(toqstr(p))), "\\", "/");
+       return subst(fromqstr(get_short_path(toqstr(p), how)), "\\", "/");
 }