| Index: chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
|
| ===================================================================
|
| --- chrome_frame/ready_mode/internal/registry_ready_mode_state.cc (revision 70414)
|
| +++ chrome_frame/ready_mode/internal/registry_ready_mode_state.cc (working copy)
|
| @@ -72,46 +72,45 @@
|
| *value = 0;
|
|
|
| base::win::RegKey config_key;
|
| - if (!config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(), KEY_QUERY_VALUE)) {
|
| - DLOG(ERROR) << "Failed to open registry key " << key_name_;
|
| + LONG result = config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(),
|
| + KEY_QUERY_VALUE);
|
| + if (result != ERROR_SUCCESS) {
|
| + DLOG(ERROR) << "Failed to open registry key: " << key_name_ <<
|
| + " Error: " << result;
|
| return false;
|
| }
|
|
|
| if (!config_key.ValueExists(kReadyModeStateValue))
|
| return true;
|
|
|
| - int64 temp;
|
| - DWORD value_size = sizeof(temp);
|
| - DWORD type = 0;
|
| - if (!config_key.ReadValue(kReadyModeStateValue, &temp, &value_size, &type)) {
|
| - DLOG(ERROR) << "Failed to open registry key " << key_name_;
|
| + result = config_key.ReadValueQW(kReadyModeStateValue, value);
|
| + if (result != ERROR_SUCCESS) {
|
| + DLOG(ERROR) << "Failed to open registry key: " << key_name_ <<
|
| + " Error: " << result;
|
| return false;
|
| }
|
|
|
| - if (value_size != sizeof(temp) || type != REG_QWORD) {
|
| - DLOG(ERROR) << "Unexpected state found under registry key " << key_name_
|
| - << " and value " << kReadyModeStateValue;
|
| - config_key.DeleteValue(kReadyModeStateValue);
|
| - return true;
|
| - }
|
| -
|
| - *value = temp;
|
| *exists = true;
|
| return true;
|
| }
|
|
|
| -bool RegistryReadyModeState::StoreValue(int64 value) {
|
| +bool RegistryReadyModeState::StoreValue(const int64& value) {
|
| base::win::RegKey config_key;
|
| - if (config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(), KEY_SET_VALUE) &&
|
| - config_key.WriteValue(kReadyModeStateValue, &value, sizeof(value),
|
| - REG_QWORD)) {
|
| - return true;
|
| + LONG result = config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(),
|
| + KEY_SET_VALUE);
|
| + if (result == ERROR_SUCCESS) {
|
| + result = config_key.WriteValue(kReadyModeStateValue, &value, sizeof(value),
|
| + REG_QWORD);
|
| }
|
|
|
| - DLOG(ERROR) << "Failed to open or write to registry key " << key_name_
|
| - << " and value " << kReadyModeStateValue;
|
| + if (result != ERROR_SUCCESS) {
|
| + DLOG(ERROR) << "Failed to open or write to registry key " << key_name_
|
| + << " and value " << kReadyModeStateValue << " Error: "
|
| + << result;
|
| + return false;
|
| + }
|
|
|
| - return false;
|
| + return true;
|
| }
|
|
|
| void RegistryReadyModeState::TemporarilyDeclineChromeFrame() {
|
|
|