summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-19 16:28:18 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-19 16:28:18 +0100
commit4f82d71df070e813927893fc20aa7954fbae997d (patch)
treed9846eb02855f7931182412652f5f5a8943dd1c5
parent01b1e411bdb042dbc99668e3b6689da799c7828a (diff)
downloadUXP-4f82d71df070e813927893fc20aa7954fbae997d.tar
UXP-4f82d71df070e813927893fc20aa7954fbae997d.tar.gz
UXP-4f82d71df070e813927893fc20aa7954fbae997d.tar.lz
UXP-4f82d71df070e813927893fc20aa7954fbae997d.tar.xz
UXP-4f82d71df070e813927893fc20aa7954fbae997d.zip
Remove Windows shell integration checks for Windows Vista.
Tag #22.
-rw-r--r--browser/components/shell/nsWindowsShellService.cpp5
-rw-r--r--xpcom/io/SpecialSystemDirectory.cpp15
-rw-r--r--xpcom/io/nsLocalFileWin.cpp13
3 files changed, 7 insertions, 26 deletions
diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
index cb13c0910..879b0c7f0 100644
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/browser/components/shell/nsWindowsShellService.cpp
@@ -648,11 +648,6 @@ nsWindowsShellService::LaunchControlPanelDefaultsSelectionUI()
nsresult
nsWindowsShellService::LaunchControlPanelDefaultPrograms()
{
- // This Default Programs feature is Win7+ only.
- if (!IsWin7OrLater()) {
- return NS_ERROR_FAILURE;
- }
-
// Build the path control.exe path safely
WCHAR controlEXEPath[MAX_PATH + 1] = { '\0' };
if (!GetSystemDirectoryW(controlEXEPath, MAX_PATH)) {
diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp
index 347ed186a..ab65d38f9 100644
--- a/xpcom/io/SpecialSystemDirectory.cpp
+++ b/xpcom/io/SpecialSystemDirectory.cpp
@@ -19,9 +19,6 @@
#include <shlobj.h>
#include <knownfolders.h>
#include <guiddef.h>
-#include "mozilla/WindowsVersion.h"
-
-using mozilla::IsWin7OrLater;
#elif defined(XP_UNIX)
@@ -115,19 +112,13 @@ SHLoadLibraryFromKnownFolder(REFKNOWNFOLDERID aFolderId, DWORD aMode,
}
/*
- * Check to see if we're on Win7 and up, and if so, returns the default
- * save-to location for the Windows Library passed in through aFolderId.
- * Otherwise falls back on pre-win7 GetWindowsFolder.
+ * Return the default save-to location for the Windows Library passed in
+ * through aFolderId.
*/
static nsresult
GetLibrarySaveToPath(int aFallbackFolderId, REFKNOWNFOLDERID aFolderId,
nsIFile** aFile)
{
- // Skip off checking for library support if the os is Vista or lower.
- if (!IsWin7OrLater()) {
- return GetWindowsFolder(aFallbackFolderId, aFile);
- }
-
RefPtr<IShellLibrary> shellLib;
RefPtr<IShellItem> savePath;
HRESULT hr =
@@ -716,8 +707,6 @@ GetSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory,
}
#if defined(MOZ_CONTENT_SANDBOX)
case Win_LocalAppdataLow: {
- // This should only really fail on versions pre-Vista, in which case this
- // shouldn't have been used in the first place.
GUID localAppDataLowGuid = FOLDERID_LocalAppDataLow;
return GetKnownFolder(&localAppDataLowGuid, aFile);
}
diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp
index 3a7e570f5..66e267807 100644
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@@ -7,7 +7,6 @@
#include "mozilla/ArrayUtils.h"
#include "mozilla/DebugOnly.h"
#include "mozilla/UniquePtrExtensions.h"
-#include "mozilla/WindowsVersion.h"
#include "nsCOMPtr.h"
#include "nsAutoPtr.h"
@@ -1970,13 +1969,11 @@ nsLocalFile::CopySingleFile(nsIFile* aSourceFile, nsIFile* aDestParent,
// So we only use COPY_FILE_NO_BUFFERING when we have a remote drive.
int copyOK;
DWORD dwCopyFlags = COPY_FILE_ALLOW_DECRYPTED_DESTINATION;
- if (IsVistaOrLater()) {
- bool path1Remote, path2Remote;
- if (!IsRemoteFilePath(filePath.get(), path1Remote) ||
- !IsRemoteFilePath(destPath.get(), path2Remote) ||
- path1Remote || path2Remote) {
- dwCopyFlags |= COPY_FILE_NO_BUFFERING;
- }
+ bool path1Remote, path2Remote;
+ if (!IsRemoteFilePath(filePath.get(), path1Remote) ||
+ !IsRemoteFilePath(destPath.get(), path2Remote) ||
+ path1Remote || path2Remote) {
+ dwCopyFlags |= COPY_FILE_NO_BUFFERING;
}
if (!move) {