Fix for Windows 7

Review URL: http://codereview.chromium.org/150182

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19764 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 5 deletions

diff --git a/o3d/plugin/cross/config_common.cc b/o3d/plugin/cross/config_common.cc
index de375c0..35d02f7 100644
--- a/o3d/plugin/cross/config_common.cc
+++ b/o3d/plugin/cross/config_common.cc
@@ -75,7 +75,7 @@ bool AskUser(NPP npp, const std::string &error) {
   GLUE_PROFILE_START(npp, "NPN_GetStringIdentifier");
   NPIdentifier alert_id = NPN_GetStringIdentifier("confirm");
   GLUE_PROFILE_STOP(npp, "NPN_GetStringIdentifier");
-  std::string message = error;
+  std::string message = std::string("O3D: ") + error;
   // TODO: internationalize message.
   // TODO: Should this change to call some hardcoded javascript function
   //    like "o3djs.util.confirmContinuation" or even a global name like
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc
index d064f00..63c8a60 100644
--- a/o3d/plugin/cross/o3d_glue.cc
+++ b/o3d/plugin/cross/o3d_glue.cc
@@ -231,12 +231,12 @@ void PluginObject::TearDown() {
 }
 
 void PluginObject::CreateRenderer(const o3d::DisplayWindow& display_window) {
-  renderer_ = o3d::Renderer::CreateDefaultRenderer(&service_locator_);
-  DCHECK(renderer_);
-
   if (!CheckConfig(npp_)) {
     renderer_init_status_ = o3d::Renderer::GPU_NOT_UP_TO_SPEC;
   } else {
+    renderer_ = o3d::Renderer::CreateDefaultRenderer(&service_locator_);
+    DCHECK(renderer_);
+
     // Attempt to initialize renderer.
     renderer_init_status_ = renderer_->Init(display_window, false);
     if (renderer_init_status_ != o3d::Renderer::SUCCESS) {
diff --git a/o3d/plugin/win/config.cc b/o3d/plugin/win/config.cc
index ef1fb39..dd08101 100644
--- a/o3d/plugin/win/config.cc
+++ b/o3d/plugin/win/config.cc
@@ -68,7 +68,8 @@ bool CheckOSVersion(NPP npp) {
       std::string error = std::string("Windows XP Service Pack 2 is required.");
       if (!AskUser(npp, error)) return false;
     }
-  } else if (version.dwMajorVersion == 6 && version.dwMinorVersion == 0) {
+  } else if (version.dwMajorVersion > 5 ||
+	         (version.dwMajorVersion == 5 && version.dwMinorVersion >= 2)) {
     // 6.0 is Vista or Server 2008; it's now worth a try.
   } else {
     std::string error = std::string("Unsupported Windows version.");