| Index: sandbox/win/src/registry_policy.cc
|
| diff --git a/sandbox/win/src/registry_policy.cc b/sandbox/win/src/registry_policy.cc
|
| index ec66380814250d00d50a5db1792162ba2979b9ec..58e4e203970fbb405cdffd20b8c460f1e8f14abd 100644
|
| --- a/sandbox/win/src/registry_policy.cc
|
| +++ b/sandbox/win/src/registry_policy.cc
|
| @@ -1,8 +1,6 @@
|
| // Copyright (c) 2006-2008 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 <stdint.h>
|
|
|
| #include <string>
|
|
|
| @@ -12,13 +10,13 @@
|
| #include "sandbox/win/src/ipc_tags.h"
|
| #include "sandbox/win/src/policy_engine_opcodes.h"
|
| #include "sandbox/win/src/policy_params.h"
|
| +#include "sandbox/win/src/sandbox_utils.h"
|
| #include "sandbox/win/src/sandbox_types.h"
|
| -#include "sandbox/win/src/sandbox_utils.h"
|
| #include "sandbox/win/src/win_utils.h"
|
|
|
| namespace {
|
|
|
| -static const uint32_t kAllowedRegFlags =
|
| +static const uint32 kAllowedRegFlags =
|
| KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY | KEY_READ |
|
| GENERIC_READ | GENERIC_EXECUTE | READ_CONTROL;
|
|
|
| @@ -139,7 +137,7 @@
|
| // We consider all flags that are not known to be readonly as potentially
|
| // used for write. Here we also support MAXIMUM_ALLOWED, but we are going
|
| // to expand it to read-only before the call.
|
| - uint32_t restricted_flags = ~(kAllowedRegFlags | MAXIMUM_ALLOWED);
|
| + uint32 restricted_flags = ~(kAllowedRegFlags | MAXIMUM_ALLOWED);
|
| open.AddNumberMatch(IF_NOT, OpenKey::ACCESS, restricted_flags, AND);
|
| create.AddNumberMatch(IF_NOT, OpenKey::ACCESS, restricted_flags, AND);
|
| break;
|
| @@ -168,12 +166,12 @@
|
|
|
| bool RegistryPolicy::CreateKeyAction(EvalResult eval_result,
|
| const ClientInfo& client_info,
|
| - const base::string16& key,
|
| - uint32_t attributes,
|
| + const base::string16 &key,
|
| + uint32 attributes,
|
| HANDLE root_directory,
|
| - uint32_t desired_access,
|
| - uint32_t title_index,
|
| - uint32_t create_options,
|
| + uint32 desired_access,
|
| + uint32 title_index,
|
| + uint32 create_options,
|
| HANDLE* handle,
|
| NTSTATUS* nt_status,
|
| ULONG* disposition) {
|
| @@ -202,10 +200,10 @@
|
|
|
| bool RegistryPolicy::OpenKeyAction(EvalResult eval_result,
|
| const ClientInfo& client_info,
|
| - const base::string16& key,
|
| - uint32_t attributes,
|
| + const base::string16 &key,
|
| + uint32 attributes,
|
| HANDLE root_directory,
|
| - uint32_t desired_access,
|
| + uint32 desired_access,
|
| HANDLE* handle,
|
| NTSTATUS* nt_status) {
|
| // The only action supported is ASK_BROKER which means open the requested
|
|
|