diff --git a/source/nvda.pyw b/source/nvda.pyw index 74f7c5687d6..6c602e51bdd 100755 --- a/source/nvda.pyw +++ b/source/nvda.pyw @@ -60,7 +60,7 @@ except: # Check OS version requirements import winVersion -if not winVersion.canRunVc2010Builds(): +if not winVersion.isSupportedOS(): winUser.MessageBox(0, unicode(ctypes.FormatError(winUser.ERROR_OLD_WIN_VERSION)), None, winUser.MB_ICONERROR) sys.exit(1) diff --git a/source/winVersion.py b/source/winVersion.py index a2a39b59c1e..e32e0e6b755 100644 --- a/source/winVersion.py +++ b/source/winVersion.py @@ -16,20 +16,12 @@ winVersionText+=".%d"%winVersion.service_pack_minor winVersionText+=" %s" % ("workstation","domain controller","server")[winVersion.product_type-1] +def isSupportedOS(): + # NVDA can only run on Windows 7 Service pack 1 and above + return (winVersion.major,winVersion.minor,winVersion.service_pack_major) >= (6,1,1) + def canRunVc2010Builds(): - if (winVersion.major, winVersion.minor) < (5, 1): - # Earlier than Windows XP. - return False - if winVersion.major == 5: - if winVersion.minor == 1: - # Windows XP for x86. - return winVersion.service_pack_major >= 2 - if winVersion.minor == 2 and winVersion.product_type!=1: - # Windows Server 2003. - # (5.2 x64 is Windows XP x64. Its RTM is based on Server 2003 sp1, - # so all versions should be fine.) - return winVersion.service_pack_major >= 1 - return True + return isSupportedOS() UWP_OCR_DATA_PATH = os.path.expandvars(r"$windir\OCR") def isUwpOcrAvailable(): diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t index 0197a548cba..9fc632c95d1 100644 --- a/user_docs/en/userGuide.t2t +++ b/user_docs/en/userGuide.t2t @@ -59,11 +59,9 @@ This applies to both original and modified copies of this software, plus any der For further details, you can [view the full licence. http://www.gnu.org/licenses/old-licenses/gpl-2.0.html] + System Requirements + -- Operating Systems: all 32-bit and 64-bit editions of Windows XP, Windows Vista, Windows 7, Windows 8, Windows 8.1 and Windows 10 (including Server operating Systems) - - For Windows XP 32-bit, NVDA requires Service Pack 2 or higher. - - For Windows Server 2003, NVDA requires Service Pack 1 or higher. - - For Windows Vista, NVDA requires Service Pack 2 and the [KB2763674 https://support.microsoft.com/en-us/kb/2763674] update. - Both of these should be installed if all available updates are applied via Windows Update. +- Operating Systems: all 32-bit and 64-bit editions of Windows 7, Windows 8, Windows 8.1, Windows 10, and all Server Operating Systems starting from Windows Server 2008 R2. + - For Windows 7, NVDA requires Service Pack 1 or higher. + - For Windows Server 2008 R2, NVDA requires Service Pack 1 or higher. - Memory: 256 mb or more of RAM - Processor speed: 1.0 ghz or above - About 90 MB of storage space.