diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index a85fdbfebe0f..819475717ffb 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -156,19 +156,30 @@ static bool IsArg(const char* arg, const char* s) { #endif return false; } MOZ_RUNINIT Bootstrap::UniquePtr gBootstrap; static int do_main(int argc, char* argv[], char* envp[]) { + // Allow profile downgrade for Zotero + _putenv_s("MOZ_ALLOW_DOWNGRADE", "1"); + // Don't create dedicated profile (default-esr) + _putenv_s("MOZ_LEGACY_PROFILES", "1"); + // Allow firefox.exe to launch XULRunner apps via -app // Note that -app must be the *first* argument. - const char* appDataFile = getenv("XUL_APP_FILE"); + UniqueFreePtr iniPath = BinaryPath::GetApplicationIni(); + if (!iniPath) { + Output("Couldn't find application.ini.\n"); + return 255; + + } + char *appDataFile = iniPath.get(); if ((!appDataFile || !*appDataFile) && (argc > 1 && IsArg(argv[1], "app"))) { if (argc == 2) { Output("Incorrect number of arguments passed to -app"); return 255; } appDataFile = argv[2]; char appEnv[MAXPATHLEN]; diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp index 8167d2b81c91..a1ef657232bf 100644 --- a/browser/app/winlauncher/LauncherProcessWin.cpp +++ b/browser/app/winlauncher/LauncherProcessWin.cpp @@ -156,17 +156,31 @@ static mozilla::LauncherFlags ProcessCmdLine(int& aArgc, wchar_t* aArgv[]) { mozilla::CheckArgFlag::None) == mozilla::ARG_FOUND || mozilla::CheckArg(aArgc, aArgv, "remote-debugging-port", nullptr, mozilla::CheckArgFlag::None) == mozilla::ARG_FOUND || mozilla::EnvHasValue("MOZ_AUTOMATION") || mozilla::EnvHasValue("MOZ_HEADLESS")) { result |= mozilla::LauncherFlags::eWaitForBrowser; } - if (mozilla::CheckArg(aArgc, aArgv, "no-deelevate") == mozilla::ARG_FOUND) { + // Disable deelevation for Zotero + // + // If people are running as Administrator, or in some cases running with + // UAC disabled, Word runs at integrity level High and deelevation drops + // Zotero down to Medium, which causes 'Could not find a running Word + // instance' errors. + // + // Even when not running as administrator, the process switch involved in + // deelevation also seems to be causing various security software, such as + // Cisco Secure Endpoint, to block Zotero from running: + // https://forums.zotero.org/discussion/116762 + // + // Disabling deelevation returns us to the behavior of Zotero 6, Word, and + // most other programs + if (true || mozilla::CheckArg(aArgc, aArgv, "no-deelevate") == mozilla::ARG_FOUND) { result |= mozilla::LauncherFlags::eNoDeelevate; } if (mozilla::CheckArg(aArgc, aArgv, ATTEMPTING_DEELEVATION_FLAG) == mozilla::ARG_FOUND) { result |= mozilla::LauncherFlags::eDeelevating; } diff --git a/toolkit/mozapps/update/common/commonupdatedir.cpp b/toolkit/mozapps/update/common/commonupdatedir.cpp index 0ba9fcef9417..ed286476fec3 100644 --- a/toolkit/mozapps/update/common/commonupdatedir.cpp +++ b/toolkit/mozapps/update/common/commonupdatedir.cpp @@ -38,17 +38,17 @@ // (i.e. C:\ProgramData\) // It is really important that we properly set the permissions on this // directory at creation time. Thus, it is really important that this code be // the creator of this directory. We had many problems with the old update // directory having been previously created by old versions of Firefox. To avoid // this problem in the future, we are including a UUID in the root update // directory name to attempt to ensure that it will be created by this code and // won't already exist with the wrong permissions. -# define ROOT_UPDATE_DIR_NAME "Mozilla-1de4eec8-1241-4177-a864-e594e8d1fb38" +# define ROOT_UPDATE_DIR_NAME "Zotero" // This describes the directory between the "Mozilla" directory and the install // path hash (i.e. C:\ProgramData\Mozilla\\) # define UPDATE_PATH_MID_DIR_NAME "updates" enum class WhichUpdateDir { CurrentUpdateDir, UnmigratedUpdateDir, }; diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h index 1718caa3c66d..10fa59c0cd80 100644 --- a/xpcom/build/BinaryPath.h +++ b/xpcom/build/BinaryPath.h @@ -283,16 +283,43 @@ class BinaryPath { if (NS_FAILED(Get(path))) { return nullptr; } UniqueFreePtr result; result.reset(strdup(path)); return result; } + static UniqueFreePtr GetApplicationIni() { + char path[MAXPATHLEN]; + if (NS_FAILED(Get(path))) { + return nullptr; + } + + char *c = path + strlen(path); + while (c >= path && *c != '\\' && *c != '/') { + *c = NULL; + c--; + } + + if (c < path) { + return nullptr; + } + + char iniPath[MAXPATHLEN]; + int n = snprintf(iniPath, MAXPATHLEN, "%s\\app\\application.ini", path); + if (n < 0 || n >= MAXPATHLEN) { + return nullptr; + } + + UniqueFreePtr result; + result.reset(strdup(iniPath)); + return result; + } + #ifdef MOZILLA_INTERNAL_API static nsresult GetFile(nsIFile** aResult) { nsCOMPtr lf; # ifdef XP_WIN wchar_t exePath[MAXPATHLEN]; nsresult rv = GetW(exePath); # else char exePath[MAXPATHLEN]; diff --git a/toolkit/components/remote/WinRemoteMessage.cpp b/toolkit/components/remote/WinRemoteMessage.cpp --- a/toolkit/components/remote/WinRemoteMessage.cpp +++ b/toolkit/components/remote/WinRemoteMessage.cpp @@ -33,6 +33,31 @@ COPYDATASTRUCT* WinRemoteMessageSender::CopyData() { return &mData; } +nsresult WinRemoteMessageReceiver::ParseV0(const nsACString& aBuffer) { + CommandLineParserWin parser; + parser.HandleCommandLine(aBuffer); + + mCommandLine = new nsCommandLine(); + return mCommandLine->Init(parser.Argc(), parser.Argv(), nullptr, + nsICommandLine::STATE_REMOTE_AUTO); +} + +nsresult WinRemoteMessageReceiver::ParseV1(const nsACString& aBuffer) { + CommandLineParserWin parser; + size_t cch = parser.HandleCommandLine(aBuffer); + ++cch; // skip a null char + + nsCOMPtr workingDir; + if (cch < aBuffer.Length()) { + (void)NS_NewLocalFile(NS_ConvertUTF8toUTF16(Substring(aBuffer, cch)), + getter_AddRefs(workingDir)); + } + + mCommandLine = new nsCommandLine(); + return mCommandLine->Init(parser.Argc(), parser.Argv(), workingDir, + nsICommandLine::STATE_REMOTE_AUTO); +} + nsresult WinRemoteMessageReceiver::ParseV2(const nsAString& aBuffer) { CommandLineParserWin parser; size_t cch = parser.HandleCommandLine(aBuffer); @@ -111,6 +136,12 @@ nsresult WinRemoteMessageReceiver::Parse(const COPYDATASTRUCT* aMessageData) { switch (static_cast(aMessageData->dwData)) { + case WinRemoteMessageVersion::CommandLineOnly: + return ParseV0(nsDependentCSubstring( + reinterpret_cast(aMessageData->lpData), aMessageData->cbData)); + case WinRemoteMessageVersion::CommandLineAndWorkingDir: + return ParseV1(nsDependentCSubstring( + reinterpret_cast(aMessageData->lpData), aMessageData->cbData)); case WinRemoteMessageVersion::CommandLineAndWorkingDirInUtf16: return ParseV2( nsDependentSubstring(reinterpret_cast(aMessageData->lpData), diff --git a/toolkit/components/remote/WinRemoteMessage.h b/toolkit/components/remote/WinRemoteMessage.h --- a/toolkit/components/remote/WinRemoteMessage.h +++ b/toolkit/components/remote/WinRemoteMessage.h @@ -29,10 +29,10 @@ // some sort, as v3 does, to reduce the chances of variants of bug 1847458. enum class WinRemoteMessageVersion : uint32_t { // "\0" in utf8 - /* CommandLineOnly = 0, */ + CommandLineOnly = 0, // "\0\0" in utf8 - /* CommandLineAndWorkingDir = 1, */ + CommandLineAndWorkingDir = 1, // L"\0\0" in utf16, used by ESR 128 CommandLineAndWorkingDirInUtf16 = 2, @@ -62,6 +62,8 @@ class WinRemoteMessageReceiver final { nsCOMPtr mCommandLine; + nsresult ParseV0(const nsACString& aBuffer); + nsresult ParseV1(const nsACString& aBuffer); nsresult ParseV2(const nsAString& aBuffer); nsresult ParseV3(const nsACString& aBuffer);