#include <stdio.h>
#endif
-
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#else
extern "C" {
extern void __wgetmainargs(int * argc, wchar_t *** argv, wchar_t *** envp,
int expand_wildcards, int * new_mode);
}
+#endif
using namespace std;
return FALSE;
}
-} // namespace anon
+} // namespace
-void init(int argc, char * argv[])
+void init(int argc, char ** argv[])
{
/* Note from Angus, 17 Jan 2005:
*
*/
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+ // Removing an argument from argv leads to an assertion on Windows
+ // when compiling with MSVC 2015 in debug mode (see bug #10440).
+ // To avoid this we make a copy of the array of pointers.
+ char ** newargv = (char **) malloc((argc + 1) * sizeof(char *));
+ if (newargv) {
+ memcpy(newargv, *argv, (argc + 1) * sizeof(char *));
+ *argv = newargv;
+ } else {
+ lyxerr << "LyX warning: Cannot make a copy of "
+ "command line arguments!"
+ << endl;
+ }
+#endif
+
+
// Get the wide program arguments array
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+ argv_ = CommandLineToArgvW(GetCommandLineW(), &argc_);
+#else
wchar_t ** envp = 0;
int newmode = 0;
__wgetmainargs(&argc_, &argv_, &envp, -1, &newmode);
+#endif
LATTEST(argc == argc_);
// If Cygwin is detected, query the cygdrive prefix.
{
string const texinputs = os::latex_path_list(
replaceCurdirPath(path, lyxrc.texinputs_prefix));
+ string const otherinputs = os::latex_path_list(path);
string const sep = windows_style_tex_paths_ ? ";" : ":";
- string const oldval = getEnv("TEXINPUTS");
- string const newval = "." + sep + texinputs + sep + oldval;
- if (!path.empty() && !lyxrc.texinputs_prefix.empty())
- setEnv("TEXINPUTS", newval);
+ string const oldtexinputs = getEnv("TEXINPUTS");
+ string const newtexinputs = "." + sep + texinputs + sep + oldtexinputs;
+ string const oldbibinputs = getEnv("BIBINPUTS");
+ string const newbibinputs = "." + sep + otherinputs + sep + oldbibinputs;
+ string const oldbstinputs = getEnv("BSTINPUTS");
+ string const newbstinputs = "." + sep + otherinputs + sep + oldbstinputs;
+ string const oldtexfonts = getEnv("TEXFONTS");
+ string const newtexfonts = "." + sep + otherinputs + sep + oldtexfonts;
+ if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+ setEnv("TEXINPUTS", newtexinputs);
+ setEnv("BIBINPUTS", newbibinputs);
+ setEnv("BSTINPUTS", newbstinputs);
+ setEnv("TEXFONTS", newtexfonts);
+ }
- // reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
- char const * action = (mode == VIEW) ? "open" : "edit";
- bool success = reinterpret_cast<int>(ShellExecute(NULL, action,
- to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32;
+ QString const wname = toqstr(filename);
- if (!path.empty() && !lyxrc.texinputs_prefix.empty())
- setEnv("TEXINPUTS", oldval);
+ // reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
+ wchar_t const * action = (mode == VIEW) ? L"open" : L"edit";
+ bool success = reinterpret_cast<intptr_t>(ShellExecuteW(NULL, action,
+ reinterpret_cast<wchar_t const *>(wname.utf16()),
+ NULL, NULL, 1)) > 32;
+
+ if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+ setEnv("TEXINPUTS", oldtexinputs);
+ setEnv("BIBINPUTS", oldbibinputs);
+ setEnv("BSTINPUTS", oldbstinputs);
+ setEnv("TEXFONTS", oldtexfonts);
+ }
return success;
}