mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 15:55:36 +00:00
6955347be6
nsSetDllDirectory.h consists of just one function definition, SanitizeEnvironmentVariables, which is now only called from nsWindowsMain.cpp. nsSetDllDirectory.h used to define its namesake NS_SetDllDirectory, but the function was removed in bug 699247. Also remove some #includes that are no longer necessary. MozReview-Commit-ID: E8OsXycdfO8 --HG-- extra : rebase_source : d9e63a50a782ab1fb0fde24646a777b882860fb9 extra : histedit_source : 63c41846db2bb6a1def03c343e6f336373f1fba6
137 lines
3.2 KiB
C++
137 lines
3.2 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
// This file is a .cpp file meant to be included in nsBrowserApp.cpp and other
|
|
// similar bootstrap code. It converts wide-character windows wmain into UTF-8
|
|
// narrow-character strings.
|
|
|
|
#ifndef XP_WIN
|
|
#error This file only makes sense on Windows.
|
|
#endif
|
|
|
|
#include "mozilla/Char16.h"
|
|
#include "nsUTF8Utils.h"
|
|
|
|
#include <windows.h>
|
|
|
|
#ifdef __MINGW32__
|
|
|
|
/* MingW currently does not implement a wide version of the
|
|
startup routines. Workaround is to implement something like
|
|
it ourselves. See bug 411826 */
|
|
|
|
#include <shellapi.h>
|
|
|
|
int wmain(int argc, WCHAR **argv);
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
LPWSTR commandLine = GetCommandLineW();
|
|
int argcw = 0;
|
|
LPWSTR *argvw = CommandLineToArgvW(commandLine, &argcw);
|
|
if (!argvw)
|
|
return 127;
|
|
|
|
int result = wmain(argcw, argvw);
|
|
LocalFree(argvw);
|
|
return result;
|
|
}
|
|
#endif /* __MINGW32__ */
|
|
|
|
#define main NS_internal_main
|
|
|
|
#ifndef XRE_WANT_ENVIRON
|
|
int main(int argc, char **argv);
|
|
#else
|
|
int main(int argc, char **argv, char **envp);
|
|
#endif
|
|
|
|
static void
|
|
SanitizeEnvironmentVariables()
|
|
{
|
|
DWORD bufferSize = GetEnvironmentVariableW(L"PATH", nullptr, 0);
|
|
if (bufferSize) {
|
|
wchar_t* originalPath = new wchar_t[bufferSize];
|
|
if (bufferSize - 1 == GetEnvironmentVariableW(L"PATH", originalPath,
|
|
bufferSize)) {
|
|
bufferSize = ExpandEnvironmentStringsW(originalPath, nullptr, 0);
|
|
if (bufferSize) {
|
|
wchar_t* newPath = new wchar_t[bufferSize];
|
|
if (ExpandEnvironmentStringsW(originalPath,
|
|
newPath,
|
|
bufferSize)) {
|
|
SetEnvironmentVariableW(L"PATH", newPath);
|
|
}
|
|
delete[] newPath;
|
|
}
|
|
}
|
|
delete[] originalPath;
|
|
}
|
|
}
|
|
|
|
static char*
|
|
AllocConvertUTF16toUTF8(char16ptr_t arg)
|
|
{
|
|
// be generous... UTF16 units can expand up to 3 UTF8 units
|
|
int len = wcslen(arg);
|
|
char *s = new char[len * 3 + 1];
|
|
if (!s)
|
|
return nullptr;
|
|
|
|
ConvertUTF16toUTF8 convert(s);
|
|
convert.write(arg, len);
|
|
convert.write_terminator();
|
|
return s;
|
|
}
|
|
|
|
static void
|
|
FreeAllocStrings(int argc, char **argv)
|
|
{
|
|
while (argc) {
|
|
--argc;
|
|
delete [] argv[argc];
|
|
}
|
|
|
|
delete [] argv;
|
|
}
|
|
|
|
int wmain(int argc, WCHAR **argv)
|
|
{
|
|
SanitizeEnvironmentVariables();
|
|
SetDllDirectoryW(L"");
|
|
|
|
char **argvConverted = new char*[argc + 1];
|
|
if (!argvConverted)
|
|
return 127;
|
|
|
|
for (int i = 0; i < argc; ++i) {
|
|
argvConverted[i] = AllocConvertUTF16toUTF8(argv[i]);
|
|
if (!argvConverted[i]) {
|
|
return 127;
|
|
}
|
|
}
|
|
argvConverted[argc] = nullptr;
|
|
|
|
// need to save argvConverted copy for later deletion.
|
|
char **deleteUs = new char*[argc+1];
|
|
if (!deleteUs) {
|
|
FreeAllocStrings(argc, argvConverted);
|
|
return 127;
|
|
}
|
|
for (int i = 0; i < argc; i++)
|
|
deleteUs[i] = argvConverted[i];
|
|
#ifndef XRE_WANT_ENVIRON
|
|
int result = main(argc, argvConverted);
|
|
#else
|
|
// Force creation of the multibyte _environ variable.
|
|
getenv("PATH");
|
|
int result = main(argc, argvConverted, _environ);
|
|
#endif
|
|
|
|
delete[] argvConverted;
|
|
FreeAllocStrings(argc, deleteUs);
|
|
|
|
return result;
|
|
}
|