diff options
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 4 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 7 | ||||
| -rw-r--r-- | chrome_frame/utils.h | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 46287fd7..7808bd5 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -257,8 +257,8 @@ END_MSG_MAP() UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.IEVersion", GetIEVersion(), IE_INVALID, - IE_9, - IE_9 + 1); + IE_10, + IE_10 + 1); } return S_OK; diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index b80511e..b9dcc5a 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -409,8 +409,11 @@ IEVersion GetIEVersion() { case 8: ie_version = IE_8; break; + case 9: + ie_version = IE_9; + break; default: - ie_version = major_version >= 9 ? IE_9 : IE_UNSUPPORTED; + ie_version = (major_version >= 10) ? IE_10 : IE_UNSUPPORTED; break; } } @@ -513,8 +516,8 @@ bool GetModuleVersion(HMODULE module, uint32* high, uint32* low) { // Copy data as VerQueryValue tries to modify the data. This causes // exceptions and heap corruption errors if debugger is attached. scoped_array<char> data(new char[version_resource_size]); - memcpy(data.get(), readonly_resource_data, version_resource_size); if (data.get()) { + memcpy(data.get(), readonly_resource_data, version_resource_size); VS_FIXEDFILEINFO* ver_info = NULL; UINT info_size = 0; if (VerQueryValue(data.get(), L"\\", diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index a41978e..6d6a5d6 100644 --- a/chrome_frame/utils.h +++ b/chrome_frame/utils.h @@ -162,6 +162,7 @@ typedef enum IEVersion { IE_7, IE_8, IE_9, + IE_10, }; // The renderer to be used for a page. Values for Chrome also convey the |