Support 32-bit subversion fields in base::Version.

content/child/npapi/webplugin_delegate_impl_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/npapi/webplugin_delegate_impl.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 169 matching lines @@
 
   result = func(key, KeyNameInformation, buffer.get(), size, &size);
   if (result != STATUS_SUCCESS)
     return L"";
 
   KEY_NAME_INFORMATION* info =
       reinterpret_cast<KEY_NAME_INFORMATION*>(buffer.get());
   return std::wstring(info->Name, info->NameLength / sizeof(wchar_t));
 }
 
-int GetPluginMajorVersion(const WebPluginInfo& plugin_info) {
+unsigned int GetPluginMajorVersion(const WebPluginInfo& plugin_info) {

[Nico, 2015/03/09 14:21:57]

uint32_t?

[Will Harris, 2015/03/09 22:52:18]

Done.

   Version plugin_version;
   WebPluginInfo::CreateVersionFromString(plugin_info.version, &plugin_version);
 
-  int major_version = 0;
+  unsigned int major_version = 0;
   if (plugin_version.IsValid())
     major_version = plugin_version.components()[0];
 
   return major_version;
 }
 
 }  // namespace
 
 LRESULT CALLBACK WebPluginDelegateImpl::HandleEventMessageFilterHook(
     int code, WPARAM wParam, LPARAM lParam) {
@@ skipping 54 matching lines @@
     // agent.
     instance_->set_use_mozilla_user_agent();
     quirks_ |= PLUGIN_QUIRK_THROTTLE_WM_USER_PLUS_ONE;
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
     quirks_ |= PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS;
     quirks_ |= PLUGIN_QUIRK_HANDLE_MOUSE_CAPTURE;
     quirks_ |= PLUGIN_QUIRK_EMULATE_IME;
     quirks_ |= PLUGIN_QUIRK_FAKE_WINDOW_FROM_POINT;
   } else if (filename == kAcrobatReaderPlugin) {
     // Check for the version number above or equal 9.
-    int major_version = GetPluginMajorVersion(plugin_info);
+    unsigned int major_version = GetPluginMajorVersion(plugin_info);
     if (major_version >= 9) {
       quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
       // 9.2 needs this.
       quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
     }
     quirks_ |= PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS;
   } else if (plugin_info.name.find(L"Windows Media Player") !=
              std::wstring::npos) {
     // Windows Media Player needs two NPP_SetWindow calls.
     quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
@@ skipping 13 matching lines @@
   } else if (instance_->mime_type() == "audio/x-pn-realaudio-plugin" ||
              filename == kRealPlayerPlugin) {
     quirks_ |= PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY;
   } else if (plugin_info.name.find(L"VLC Multimedia Plugin") !=
              std::wstring::npos ||
              plugin_info.name.find(L"VLC Multimedia Plug-in") !=
              std::wstring::npos) {
     // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window
     // handle
     quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY;
-    int major_version = GetPluginMajorVersion(plugin_info);
+    unsigned int major_version = GetPluginMajorVersion(plugin_info);
     if (major_version == 0) {
       // VLC 0.8.6d and 0.8.6e crash if multiple instances are created.
       quirks_ |= PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES;
     }
   } else if (filename == kSilverlightPlugin) {
     // Explanation for this quirk can be found in
     // WebPluginDelegateImpl::Initialize.
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
   } else if (plugin_info.name.find(L"DivX Web Player") !=
              std::wstring::npos) {
@@ skipping 1167 matching lines @@
     case WM_RBUTTONUP:
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace content