diff --git a/DEPS b/DEPS index 66f155b..620009b 100644 --- a/DEPS +++ b/DEPS @@ -3,7 +3,7 @@ # found in the COPYING file. vars = { - "chrev": "@57045" + "chrev": "@56144" } deps = { diff --git a/win/lib/financial_ping.cc b/win/lib/financial_ping.cc index 2ab4efb..ba1fccd 100644 --- a/win/lib/financial_ping.cc +++ b/win/lib/financial_ping.cc @@ -212,7 +212,7 @@ bool FinancialPing::IsPingTime(Product product, const wchar_t* sid, StringAppendF(&key_location, L"%ls\\%ls", kLibKeyName, kPingTimesSubkeyName); uint64 last_ping; - DWORD size = sizeof(last_ping); + DWORD size; DWORD type; RegKey key(user_key.Get(), key_location.c_str(), KEY_READ); if (!key.ReadValue(GetProductName(product), &last_ping, &size, &type)) @@ -277,7 +277,7 @@ bool FinancialPing::ClearLastPingTime(Product product, const wchar_t* sid) { // Verify deletion. uint64 value; DWORD size = sizeof(value); - if (key.ReadValue(value_name, &value, &size, NULL)) { + if (key.ReadValue(value_name, &value, &size)) { ASSERT_STRING("FinancialPing::ClearLastPingTime: Failed to delete value."); return false; } diff --git a/win/lib/machine_deal.cc b/win/lib/machine_deal.cc index 1ac589d..5c76a47 100644 --- a/win/lib/machine_deal.cc +++ b/win/lib/machine_deal.cc @@ -291,7 +291,7 @@ bool MachineDealCode::Clear() { // Verify deletion. wchar_t dcc[kMaxDccLength + 1]; DWORD dcc_size = arraysize(dcc); - if (dcc_key.ReadValue(kDccValueName, dcc, &dcc_size, NULL)) { + if (dcc_key.ReadValue(kDccValueName, dcc, &dcc_size)) { ASSERT_STRING("MachineDealCode::Clear: Could not delete the DCC value."); return false; } diff --git a/win/lib/string_utils.cc b/win/lib/string_utils.cc index 31dde7b..ebbe9f3 100644 --- a/win/lib/string_utils.cc +++ b/win/lib/string_utils.cc @@ -7,7 +7,7 @@ #include "rlz/win/lib/string_utils.h" #include "base/registry.h" -#include "base/utf_string_conversions.h" +#include "base/string_util.h" #include "rlz/win/lib/assert.h" namespace rlz_lib { @@ -105,8 +105,7 @@ bool RegKeyReadValue(RegKey& key, const wchar_t* name, return false; } - // Note that RLZ string are always ASCII by design. - strncpy(value, WideToUTF8(value_string).c_str(), *value_size); + strncpy(value, WideToASCII(value_string).c_str(), *value_size); value[*value_size - 1] = 0; return true; }