Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chrome472 #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Chrome472 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3485928
Creating a branch for changes needed specifically for chrome 6.0.472.x
Sep 9, 2010
04ac244
Backpatching r17 from trunk to chrome472 branch
Sep 10, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# found in the COPYING file.

vars = {
"chrev": "@57045"
"chrev": "@56144"
}

deps = {
Expand Down
4 changes: 2 additions & 2 deletions win/lib/financial_ping.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion win/lib/machine_deal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 2 additions & 3 deletions win/lib/string_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down