From bd95331a3ae4fd7af479a050f7ae559ca6b754a4 Mon Sep 17 00:00:00 2001 From: Jim Mathies Date: Sun, 10 Jan 2010 17:50:36 -0600 Subject: [PATCH] Bug 536303 - OOPP: disable oopp for Windows 2000. r=benjamin. --- modules/plugin/base/src/nsNPAPIPlugin.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp index c4817352077..7b2e6ee5ba5 100644 --- a/modules/plugin/base/src/nsNPAPIPlugin.cpp +++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp @@ -332,6 +332,16 @@ OOPPluginsEnabled() return PR_FALSE; } +#ifdef XP_WIN + OSVERSIONINFO osVerInfo = {0}; + osVerInfo.dwOSVersionInfoSize = sizeof(osVerInfo); + GetVersionEx(&osVerInfo); + // Always disabled on 2K or less. (bug 536303) + if (osVerInfo.dwMajorVersion < 5 || + (osVerInfo.dwMajorVersion == 5 && osVerInfo.dwMinorVersion == 0)) + return PR_FALSE; +#endif + return PR_TRUE; }