mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-01 00:32:11 +00:00
5bb452d7f6
`HeadlessShell.handleCmdLineArgs` needs to skip arguments starting with a hyphen to search for a URL. This patch also fixes a problem that `nsNativeAppSupportWin::CheckConsole` did not remove processed command options. Differential Revision: https://phabricator.services.mozilla.com/D132987
67 lines
2.0 KiB
C++
67 lines
2.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* 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/. */
|
|
|
|
#include "nsNativeAppSupportBase.h"
|
|
#include "nsNativeAppSupportWin.h"
|
|
|
|
#include "mozilla/CmdLineAndEnvUtils.h"
|
|
#include "mozilla/WindowsConsole.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
/*
|
|
* This code attaches the process to the appropriate console.
|
|
*/
|
|
|
|
class nsNativeAppSupportWin : public nsNativeAppSupportBase {
|
|
public:
|
|
// Utility function to handle a Win32-specific command line
|
|
// option: "--console", which dynamically creates a Windows
|
|
// console.
|
|
void CheckConsole();
|
|
|
|
private:
|
|
~nsNativeAppSupportWin() {}
|
|
}; // nsNativeAppSupportWin
|
|
|
|
void nsNativeAppSupportWin::CheckConsole() {
|
|
if (CheckArg(gArgc, gArgv, "attach-console") == ARG_FOUND) {
|
|
UseParentConsole();
|
|
}
|
|
|
|
if (CheckArg(gArgc, gArgv, "console") == ARG_FOUND) {
|
|
if (AllocConsole()) {
|
|
// Redirect the standard streams to the new console, but
|
|
// only if they haven't been redirected to a valid file.
|
|
// Visual Studio's _fileno() returns -2 for the standard
|
|
// streams if they aren't associated with an output stream.
|
|
if (_fileno(stdout) == -2) {
|
|
freopen("CONOUT$", "w", stdout);
|
|
}
|
|
// There is no CONERR$, so use CONOUT$ for stderr as well.
|
|
if (_fileno(stderr) == -2) {
|
|
freopen("CONOUT$", "w", stderr);
|
|
}
|
|
if (_fileno(stdin) == -2) {
|
|
freopen("CONIN$", "r", stdin);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Create and return an instance of class nsNativeAppSupportWin.
|
|
nsresult NS_CreateNativeAppSupport(nsINativeAppSupport** aResult) {
|
|
nsNativeAppSupportWin* pNative = new nsNativeAppSupportWin;
|
|
if (!pNative) return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
// Check for dynamic console creation request.
|
|
pNative->CheckConsole();
|
|
|
|
*aResult = pNative;
|
|
NS_ADDREF(*aResult);
|
|
|
|
return NS_OK;
|
|
}
|