diff options
| author | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 20:05:22 +0000 |
|---|---|---|
| committer | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 20:05:22 +0000 |
| commit | d30379c187b8a338a431942ce4f25944578ae26b (patch) | |
| tree | bc8ab8dfc25cdccd5da080e4252ef159d9806fcf /sandbox | |
| parent | 4bcf1c120956613b5f899fb1d6f677961ea8806d (diff) | |
| download | chromium_src-d30379c187b8a338a431942ce4f25944578ae26b.zip chromium_src-d30379c187b8a338a431942ce4f25944578ae26b.tar.gz chromium_src-d30379c187b8a338a431942ce4f25944578ae26b.tar.bz2 | |
sandbox/src -> sandbox/win/src
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
162 files changed, 566 insertions, 566 deletions
diff --git a/sandbox/win/sandbox_poc/main_ui_window.cc b/sandbox/win/sandbox_poc/main_ui_window.cc index ef4d550..5e54606 100644 --- a/sandbox/win/sandbox_poc/main_ui_window.cc +++ b/sandbox/win/sandbox_poc/main_ui_window.cc @@ -15,9 +15,9 @@ #include "sandbox/sandbox_poc/main_ui_window.h" #include "base/logging.h" #include "sandbox/sandbox_poc/resource.h" -#include "sandbox/src/acl.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/acl.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/win_utils.h" HWND MainUIWindow::list_view_ = NULL; diff --git a/sandbox/win/sandbox_poc/sandbox.cc b/sandbox/win/sandbox_poc/sandbox.cc index 4dc0882..13fcc8d 100644 --- a/sandbox/win/sandbox_poc/sandbox.cc +++ b/sandbox/win/sandbox_poc/sandbox.cc @@ -8,8 +8,8 @@ #include "sandbox/sandbox_poc/sandbox.h" #include "base/logging.h" #include "sandbox/sandbox_poc/main_ui_window.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" // Prototype allowed for functions to be called in the POC typedef void(__cdecl *lpfnInit)(HANDLE); diff --git a/sandbox/win/src/Wow64.cc b/sandbox/win/src/Wow64.cc index 5098647..39108e5 100644 --- a/sandbox/win/src/Wow64.cc +++ b/sandbox/win/src/Wow64.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/wow64.h" +#include "sandbox/win/src/wow64.h" #include <sstream> @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/win/scoped_process_information.h" #include "base/win/windows_version.h" -#include "sandbox/src/target_process.h" +#include "sandbox/win/src/target_process.h" namespace { diff --git a/sandbox/win/src/Wow64.h b/sandbox/win/src/Wow64.h index 472297e..e9bbd53 100644 --- a/sandbox/win/src/Wow64.h +++ b/sandbox/win/src/Wow64.h @@ -8,7 +8,7 @@ #include <windows.h> #include "base/basictypes.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_types.h" namespace sandbox { diff --git a/sandbox/win/src/Wow64_64.cc b/sandbox/win/src/Wow64_64.cc index 5218077..f03831b 100644 --- a/sandbox/win/src/Wow64_64.cc +++ b/sandbox/win/src/Wow64_64.cc @@ -4,7 +4,7 @@ // Wow64 implementation for native 64-bit Windows (in other words, never WOW). -#include "sandbox/src/wow64.h" +#include "sandbox/win/src/wow64.h" namespace sandbox { diff --git a/sandbox/win/src/acl.cc b/sandbox/win/src/acl.cc index 4869bb0..70d2a8d 100644 --- a/sandbox/win/src/acl.cc +++ b/sandbox/win/src/acl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/acl.h" +#include "sandbox/win/src/acl.h" #include <aclapi.h> #include <sddl.h> diff --git a/sandbox/win/src/acl.h b/sandbox/win/src/acl.h index d452011..25d5cdb 100644 --- a/sandbox/win/src/acl.h +++ b/sandbox/win/src/acl.h @@ -8,7 +8,7 @@ #include <windows.h> #include "base/memory/scoped_ptr.h" -#include "sandbox/src/sid.h" +#include "sandbox/win/src/sid.h" namespace sandbox { diff --git a/sandbox/win/src/broker_services.cc b/sandbox/win/src/broker_services.cc index 7f46abe..80837b3 100644 --- a/sandbox/win/src/broker_services.cc +++ b/sandbox/win/src/broker_services.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/broker_services.h" +#include "sandbox/win/src/broker_services.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" -#include "sandbox/src/sandbox_policy_base.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/target_process.h" -#include "sandbox/src/win2k_threadpool.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/sandbox_policy_base.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/target_process.h" +#include "sandbox/win/src/win2k_threadpool.h" +#include "sandbox/win/src/win_utils.h" namespace { diff --git a/sandbox/win/src/broker_services.h b/sandbox/win/src/broker_services.h index 1d9c730..0455dca 100644 --- a/sandbox/win/src/broker_services.h +++ b/sandbox/win/src/broker_services.h @@ -10,12 +10,12 @@ #include <set> #include "base/basictypes.h" #include "base/win/scoped_handle.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/job.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sharedmem_ipc_server.h" -#include "sandbox/src/win2k_threadpool.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/job.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sharedmem_ipc_server.h" +#include "sandbox/win/src/win2k_threadpool.h" +#include "sandbox/win/src/win_utils.h" namespace { diff --git a/sandbox/win/src/crosscall_client.h b/sandbox/win/src/crosscall_client.h index e92c1d1..2715f96 100644 --- a/sandbox/win/src/crosscall_client.h +++ b/sandbox/win/src/crosscall_client.h @@ -5,8 +5,8 @@ #ifndef SANDBOX_SRC_CROSSCALL_CLIENT_H_ #define SANDBOX_SRC_CROSSCALL_CLIENT_H_ -#include "sandbox/src/crosscall_params.h" -#include "sandbox/src/sandbox.h" +#include "sandbox/win/src/crosscall_params.h" +#include "sandbox/win/src/sandbox.h" // This header defines the CrossCall(..) family of templated functions // Their purpose is to simulate the syntax of regular call but to generate diff --git a/sandbox/win/src/crosscall_params.h b/sandbox/win/src/crosscall_params.h index e4c047b..c5298ba 100644 --- a/sandbox/win/src/crosscall_params.h +++ b/sandbox/win/src/crosscall_params.h @@ -11,8 +11,8 @@ #include <memory> #include "base/basictypes.h" -#include "sandbox/src/internal_types.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/internal_types.h" +#include "sandbox/win/src/sandbox_types.h" namespace { diff --git a/sandbox/win/src/crosscall_server.cc b/sandbox/win/src/crosscall_server.cc index f40b677..0140580 100644 --- a/sandbox/win/src/crosscall_server.cc +++ b/sandbox/win/src/crosscall_server.cc @@ -5,9 +5,9 @@ #include <string> #include <vector> -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/crosscall_params.h" -#include "sandbox/src/crosscall_client.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/crosscall_params.h" +#include "sandbox/win/src/crosscall_client.h" #include "base/logging.h" // This code performs the ipc message validation. Potential security flaws diff --git a/sandbox/win/src/crosscall_server.h b/sandbox/win/src/crosscall_server.h index 59445f6..2a39507 100644 --- a/sandbox/win/src/crosscall_server.h +++ b/sandbox/win/src/crosscall_server.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" #include "base/callback.h" -#include "sandbox/src/crosscall_params.h" +#include "sandbox/win/src/crosscall_params.h" // This is the IPC server interface for CrossCall: The IPC for the Sandbox // On the server, CrossCall needs two things: diff --git a/sandbox/win/src/dep.cc b/sandbox/win/src/dep.cc index 4995601..0c42050 100644 --- a/sandbox/win/src/dep.cc +++ b/sandbox/win/src/dep.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/dep.h" +#include "sandbox/win/src/dep.h" #include <windows.h> diff --git a/sandbox/win/src/dep_test.cc b/sandbox/win/src/dep_test.cc index 91d4e67..50d82d5 100644 --- a/sandbox/win/src/dep_test.cc +++ b/sandbox/win/src/dep_test.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/dep.h" +#include "sandbox/win/src/dep.h" -#include "sandbox/src/sandbox_utils.h" +#include "sandbox/win/src/sandbox_utils.h" #include "sandbox/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/eat_resolver.cc b/sandbox/win/src/eat_resolver.cc index f057006..8e81820 100644 --- a/sandbox/win/src/eat_resolver.cc +++ b/sandbox/win/src/eat_resolver.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/eat_resolver.h" +#include "sandbox/win/src/eat_resolver.h" #include "base/win/pe_image.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/sandbox_nt_util.h" namespace sandbox { diff --git a/sandbox/win/src/eat_resolver.h b/sandbox/win/src/eat_resolver.h index 0d5b3e0..5e4b6e8 100644 --- a/sandbox/win/src/eat_resolver.h +++ b/sandbox/win/src/eat_resolver.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_EAT_RESOLVER_H__ #include "base/basictypes.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/resolver.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/resolver.h" namespace sandbox { diff --git a/sandbox/win/src/file_policy_test.cc b/sandbox/win/src/file_policy_test.cc index df1e903..3c3ad7da 100644 --- a/sandbox/win/src/file_policy_test.cc +++ b/sandbox/win/src/file_policy_test.cc @@ -9,11 +9,11 @@ #include <winioctl.h> #include "base/win/scoped_handle.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/win_utils.h" #include "sandbox/tests/common/controller.h" #include "sandbox/tests/common/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/filesystem_dispatcher.cc b/sandbox/win/src/filesystem_dispatcher.cc index 71a6f02..22240ff 100644 --- a/sandbox/win/src/filesystem_dispatcher.cc +++ b/sandbox/win/src/filesystem_dispatcher.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/filesystem_dispatcher.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/filesystem_interception.h" -#include "sandbox/src/filesystem_policy.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_broker.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/filesystem_dispatcher.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/filesystem_interception.h" +#include "sandbox/win/src/filesystem_policy.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_broker.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_nt_util.h" namespace sandbox { diff --git a/sandbox/win/src/filesystem_dispatcher.h b/sandbox/win/src/filesystem_dispatcher.h index d828715..b0d9a7a 100644 --- a/sandbox/win/src/filesystem_dispatcher.h +++ b/sandbox/win/src/filesystem_dispatcher.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_FILESYSTEM_DISPATCHER_H__ #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_policy_base.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_policy_base.h" namespace sandbox { diff --git a/sandbox/win/src/filesystem_interception.cc b/sandbox/win/src/filesystem_interception.cc index cdc10ff..33688f0 100644 --- a/sandbox/win/src/filesystem_interception.cc +++ b/sandbox/win/src/filesystem_interception.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/filesystem_interception.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/policy_target.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/filesystem_interception.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/policy_target.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/filesystem_interception.h b/sandbox/win/src/filesystem_interception.h index d8d9e58..2fafb44 100644 --- a/sandbox/win/src/filesystem_interception.h +++ b/sandbox/win/src/filesystem_interception.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_FILESYSTEM_INTERCEPTION_H__ #define SANDBOX_SRC_FILESYSTEM_INTERCEPTION_H__ diff --git a/sandbox/win/src/filesystem_policy.cc b/sandbox/win/src/filesystem_policy.cc index 385f4ae..b3eddab 100644 --- a/sandbox/win/src/filesystem_policy.cc +++ b/sandbox/win/src/filesystem_policy.cc @@ -4,16 +4,16 @@ #include <string> -#include "sandbox/src/filesystem_policy.h" +#include "sandbox/win/src/filesystem_policy.h" #include "base/logging.h" #include "base/win/scoped_handle.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_opcodes.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox_utils.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/win_utils.h" +#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/win_utils.h" namespace { diff --git a/sandbox/win/src/filesystem_policy.h b/sandbox/win/src/filesystem_policy.h index 5010a9f..bcedb63 100644 --- a/sandbox/win/src/filesystem_policy.h +++ b/sandbox/win/src/filesystem_policy.h @@ -8,10 +8,10 @@ #include <string> #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/sandbox_policy.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/sandbox_policy.h" namespace sandbox { diff --git a/sandbox/win/src/handle_closer.cc b/sandbox/win/src/handle_closer.cc index d79f2c1..fc72835 100644 --- a/sandbox/win/src/handle_closer.cc +++ b/sandbox/win/src/handle_closer.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/handle_closer.h" +#include "sandbox/win/src/handle_closer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/win/windows_version.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/internal_types.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/process_thread_interception.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/internal_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/process_thread_interception.h" +#include "sandbox/win/src/win_utils.h" namespace { diff --git a/sandbox/win/src/handle_closer.h b/sandbox/win/src/handle_closer.h index f680169..b43e50f 100644 --- a/sandbox/win/src/handle_closer.h +++ b/sandbox/win/src/handle_closer.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/target_process.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/target_process.h" namespace sandbox { diff --git a/sandbox/win/src/handle_closer_agent.cc b/sandbox/win/src/handle_closer_agent.cc index 2b5ac97..be262e8 100644 --- a/sandbox/win/src/handle_closer_agent.cc +++ b/sandbox/win/src/handle_closer_agent.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/handle_closer_agent.h" +#include "sandbox/win/src/handle_closer_agent.h" #include "base/logging.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/win_utils.h" namespace { diff --git a/sandbox/win/src/handle_closer_agent.h b/sandbox/win/src/handle_closer_agent.h index c74987c..602f327 100644 --- a/sandbox/win/src/handle_closer_agent.h +++ b/sandbox/win/src/handle_closer_agent.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "sandbox/src/handle_closer.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/handle_closer.h" +#include "sandbox/win/src/sandbox_types.h" namespace sandbox { diff --git a/sandbox/win/src/handle_closer_test.cc b/sandbox/win/src/handle_closer_test.cc index 81b6db2..fffe1b0 100644 --- a/sandbox/win/src/handle_closer_test.cc +++ b/sandbox/win/src/handle_closer_test.cc @@ -4,10 +4,10 @@ #include "base/stringprintf.h" #include "base/win/scoped_handle.h" -#include "sandbox/src/handle_closer_agent.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/handle_closer_agent.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/target_services.h" #include "sandbox/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/handle_dispatcher.cc b/sandbox/win/src/handle_dispatcher.cc index 7a18cee..26b8fc3 100644 --- a/sandbox/win/src/handle_dispatcher.cc +++ b/sandbox/win/src/handle_dispatcher.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/handle_dispatcher.h" +#include "sandbox/win/src/handle_dispatcher.h" #include "base/win/scoped_handle.h" -#include "sandbox/src/handle_interception.h" -#include "sandbox/src/handle_policy.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_broker.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sandbox_utils.h" +#include "sandbox/win/src/handle_interception.h" +#include "sandbox/win/src/handle_policy.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_broker.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_utils.h" namespace sandbox { diff --git a/sandbox/win/src/handle_dispatcher.h b/sandbox/win/src/handle_dispatcher.h index c1abc28..a3dc6cf 100644 --- a/sandbox/win/src/handle_dispatcher.h +++ b/sandbox/win/src/handle_dispatcher.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_HANDLE_DISPATCHER_H_ #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_policy_base.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_policy_base.h" namespace sandbox { diff --git a/sandbox/win/src/handle_interception.cc b/sandbox/win/src/handle_interception.cc index 0f7b9f8..af0bebc 100644 --- a/sandbox/win/src/handle_interception.cc +++ b/sandbox/win/src/handle_interception.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/handle_interception.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/handle_interception.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/handle_interception.h b/sandbox/win/src/handle_interception.h index 543c7ba..6f60811 100644 --- a/sandbox/win/src/handle_interception.h +++ b/sandbox/win/src/handle_interception.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_HANDLE_INTERCEPTION_H_ #define SANDBOX_SRC_HANDLE_INTERCEPTION_H_ diff --git a/sandbox/win/src/handle_policy.cc b/sandbox/win/src/handle_policy.cc index 355dda8..eeeea7b 100644 --- a/sandbox/win/src/handle_policy.cc +++ b/sandbox/win/src/handle_policy.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/handle_policy.h" +#include "sandbox/win/src/handle_policy.h" #include <string> #include "base/win/scoped_handle.h" -#include "sandbox/src/broker_services.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_opcodes.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sandbox_utils.h" +#include "sandbox/win/src/broker_services.h" +#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_types.h" +#include "sandbox/win/src/sandbox_utils.h" namespace sandbox { diff --git a/sandbox/win/src/handle_policy.h b/sandbox/win/src/handle_policy.h index c3b7156..d91a039 100644 --- a/sandbox/win/src/handle_policy.h +++ b/sandbox/win/src/handle_policy.h @@ -8,9 +8,9 @@ #include <string> #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/sandbox_policy.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/sandbox_policy.h" namespace sandbox { diff --git a/sandbox/win/src/handle_policy_test.cc b/sandbox/win/src/handle_policy_test.cc index 05eb39b..29028e2 100644 --- a/sandbox/win/src/handle_policy_test.cc +++ b/sandbox/win/src/handle_policy_test.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "base/stringprintf.h" -#include "sandbox/src/handle_policy.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/handle_policy.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/win_utils.h" #include "sandbox/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/handle_table.cc b/sandbox/win/src/handle_table.cc index c7fcf0a..a497f74 100644 --- a/sandbox/win/src/handle_table.cc +++ b/sandbox/win/src/handle_table.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/handle_table.h" +#include "sandbox/win/src/handle_table.h" #include <algorithm> #include <cstdlib> #include "base/memory/scoped_ptr.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/win_utils.h" namespace { diff --git a/sandbox/win/src/handle_table.h b/sandbox/win/src/handle_table.h index e2b2615..acdc88d 100644 --- a/sandbox/win/src/handle_table.h +++ b/sandbox/win/src/handle_table.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/nt_internals.h" namespace sandbox { diff --git a/sandbox/win/src/integrity_level_test.cc b/sandbox/win/src/integrity_level_test.cc index c6e0b64..4f79aea 100644 --- a/sandbox/win/src/integrity_level_test.cc +++ b/sandbox/win/src/integrity_level_test.cc @@ -7,9 +7,9 @@ #include "base/win/windows_version.h" #include "testing/gtest/include/gtest/gtest.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/sandbox_factory.h" #include "sandbox/tests/common/controller.h" namespace sandbox { diff --git a/sandbox/win/src/interception.cc b/sandbox/win/src/interception.cc index a850c6e..929b621 100644 --- a/sandbox/win/src/interception.cc +++ b/sandbox/win/src/interception.cc @@ -7,20 +7,20 @@ #include <set> -#include "sandbox/src/interception.h" +#include "sandbox/win/src/interception.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/win/pe_image.h" #include "base/win/windows_version.h" -#include "sandbox/src/interception_internal.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_utils.h" -#include "sandbox/src/service_resolver.h" -#include "sandbox/src/target_interceptions.h" -#include "sandbox/src/target_process.h" -#include "sandbox/src/wow64.h" +#include "sandbox/win/src/interception_internal.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_utils.h" +#include "sandbox/win/src/service_resolver.h" +#include "sandbox/win/src/target_interceptions.h" +#include "sandbox/win/src/target_process.h" +#include "sandbox/win/src/wow64.h" namespace { diff --git a/sandbox/win/src/interception.h b/sandbox/win/src/interception.h index c02b0ff..02fc592 100644 --- a/sandbox/win/src/interception.h +++ b/sandbox/win/src/interception.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_types.h" namespace sandbox { diff --git a/sandbox/win/src/interception_agent.cc b/sandbox/win/src/interception_agent.cc index b40364f..b2a66c4 100644 --- a/sandbox/win/src/interception_agent.cc +++ b/sandbox/win/src/interception_agent.cc @@ -5,13 +5,13 @@ // For information about interceptions as a whole see // http://dev.chromium.org/developers/design-documents/sandbox . -#include "sandbox/src/interception_agent.h" +#include "sandbox/win/src/interception_agent.h" -#include "sandbox/src/interception_internal.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/eat_resolver.h" -#include "sandbox/src/sidestep_resolver.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/interception_internal.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/eat_resolver.h" +#include "sandbox/win/src/sidestep_resolver.h" +#include "sandbox/win/src/sandbox_nt_util.h" namespace { diff --git a/sandbox/win/src/interception_agent.h b/sandbox/win/src/interception_agent.h index 10679dd..2762c61 100644 --- a/sandbox/win/src/interception_agent.h +++ b/sandbox/win/src/interception_agent.h @@ -10,8 +10,8 @@ #define SANDBOX_SRC_INTERCEPTION_AGENT_H__ #include "base/basictypes.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" namespace sandbox { diff --git a/sandbox/win/src/interception_internal.h b/sandbox/win/src/interception_internal.h index f3c401c..810478a 100644 --- a/sandbox/win/src/interception_internal.h +++ b/sandbox/win/src/interception_internal.h @@ -9,7 +9,7 @@ #ifndef SANDBOX_SRC_INTERCEPTION_INTERNAL_H_ #define SANDBOX_SRC_INTERCEPTION_INTERNAL_H_ -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_types.h" namespace sandbox { diff --git a/sandbox/win/src/interception_unittest.cc b/sandbox/win/src/interception_unittest.cc index a0dd98d..cc76767 100644 --- a/sandbox/win/src/interception_unittest.cc +++ b/sandbox/win/src/interception_unittest.cc @@ -9,10 +9,10 @@ #include <windows.h> #include "base/memory/scoped_ptr.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/interception_internal.h" -#include "sandbox/src/target_process.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/interception_internal.h" +#include "sandbox/win/src/target_process.h" #include "testing/gtest/include/gtest/gtest.h" namespace sandbox { diff --git a/sandbox/win/src/interceptors.h b/sandbox/win/src/interceptors.h index 67b0900..43126d0 100644 --- a/sandbox/win/src/interceptors.h +++ b/sandbox/win/src/interceptors.h @@ -6,7 +6,7 @@ #define SANDBOX_SRC_INTERCEPTORS_H_ #if defined(_WIN64) -#include "sandbox/src/interceptors_64.h" +#include "sandbox/win/src/interceptors_64.h" #endif namespace sandbox { diff --git a/sandbox/win/src/interceptors_64.cc b/sandbox/win/src/interceptors_64.cc index c068010..30843fd 100644 --- a/sandbox/win/src/interceptors_64.cc +++ b/sandbox/win/src/interceptors_64.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/interceptors_64.h" - -#include "sandbox/src/interceptors.h" -#include "sandbox/src/filesystem_interception.h" -#include "sandbox/src/named_pipe_interception.h" -#include "sandbox/src/policy_target.h" -#include "sandbox/src/process_thread_interception.h" -#include "sandbox/src/registry_interception.h" -#include "sandbox/src/sandbox_nt_types.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sync_interception.h" -#include "sandbox/src/target_interceptions.h" +#include "sandbox/win/src/interceptors_64.h" + +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/filesystem_interception.h" +#include "sandbox/win/src/named_pipe_interception.h" +#include "sandbox/win/src/policy_target.h" +#include "sandbox/win/src/process_thread_interception.h" +#include "sandbox/win/src/registry_interception.h" +#include "sandbox/win/src/sandbox_nt_types.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/sync_interception.h" +#include "sandbox/win/src/target_interceptions.h" namespace sandbox { diff --git a/sandbox/win/src/interceptors_64.h b/sandbox/win/src/interceptors_64.h index 50355a0..87c1c50 100644 --- a/sandbox/win/src/interceptors_64.h +++ b/sandbox/win/src/interceptors_64.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_INTERCEPTORS_64_H_ #define SANDBOX_SRC_INTERCEPTORS_64_H_ diff --git a/sandbox/win/src/ipc_ping_test.cc b/sandbox/win/src/ipc_ping_test.cc index 410fd6a..8bfdc95 100644 --- a/sandbox/win/src/ipc_ping_test.cc +++ b/sandbox/win/src/ipc_ping_test.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/target_services.h" #include "sandbox/tests/common/controller.h" namespace sandbox { diff --git a/sandbox/win/src/ipc_unittest.cc b/sandbox/win/src/ipc_unittest.cc index e1fb7c1..daca7bb 100644 --- a/sandbox/win/src/ipc_unittest.cc +++ b/sandbox/win/src/ipc_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/sharedmem_ipc_server.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/sharedmem_ipc_server.h" #include "testing/gtest/include/gtest/gtest.h" namespace sandbox { diff --git a/sandbox/win/src/job.cc b/sandbox/win/src/job.cc index 8ed3a77..060ffa52 100644 --- a/sandbox/win/src/job.cc +++ b/sandbox/win/src/job.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/job.h" +#include "sandbox/win/src/job.h" #include "base/win/windows_version.h" -#include "sandbox/src/restricted_token.h" +#include "sandbox/win/src/restricted_token.h" namespace sandbox { diff --git a/sandbox/win/src/job.h b/sandbox/win/src/job.h index a3f6738..487722f 100644 --- a/sandbox/win/src/job.h +++ b/sandbox/win/src/job.h @@ -6,7 +6,7 @@ #define SANDBOX_SRC_JOB_H_ #include "base/basictypes.h" -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token_utils.h" namespace sandbox { diff --git a/sandbox/win/src/job_unittest.cc b/sandbox/win/src/job_unittest.cc index f386f1f..8d84b78 100644 --- a/sandbox/win/src/job_unittest.cc +++ b/sandbox/win/src/job_unittest.cc @@ -5,7 +5,7 @@ // This file contains unit tests for the job object. #include "base/win/scoped_process_information.h" -#include "sandbox/src/job.h" +#include "sandbox/win/src/job.h" #include "testing/gtest/include/gtest/gtest.h" namespace sandbox { diff --git a/sandbox/win/src/named_pipe_dispatcher.cc b/sandbox/win/src/named_pipe_dispatcher.cc index 0569784..aae1096 100644 --- a/sandbox/win/src/named_pipe_dispatcher.cc +++ b/sandbox/win/src/named_pipe_dispatcher.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/named_pipe_dispatcher.h" +#include "sandbox/win/src/named_pipe_dispatcher.h" #include "base/basictypes.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/named_pipe_interception.h" -#include "sandbox/src/named_pipe_policy.h" -#include "sandbox/src/policy_broker.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/named_pipe_interception.h" +#include "sandbox/win/src/named_pipe_policy.h" +#include "sandbox/win/src/policy_broker.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/sandbox.h" namespace sandbox { diff --git a/sandbox/win/src/named_pipe_dispatcher.h b/sandbox/win/src/named_pipe_dispatcher.h index 87a68b6..0d03b2e 100644 --- a/sandbox/win/src/named_pipe_dispatcher.h +++ b/sandbox/win/src/named_pipe_dispatcher.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_NAMED_PIPE_DISPATCHER_H__ #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_policy_base.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_policy_base.h" namespace sandbox { diff --git a/sandbox/win/src/named_pipe_interception.cc b/sandbox/win/src/named_pipe_interception.cc index 4599441..f437b1c 100644 --- a/sandbox/win/src/named_pipe_interception.cc +++ b/sandbox/win/src/named_pipe_interception.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/named_pipe_interception.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/policy_target.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/named_pipe_interception.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/policy_target.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/named_pipe_interception.h b/sandbox/win/src/named_pipe_interception.h index 5e2b334..fdbee19 100644 --- a/sandbox/win/src/named_pipe_interception.h +++ b/sandbox/win/src/named_pipe_interception.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_NAMED_PIPE_INTERCEPTION_H__ #define SANDBOX_SRC_NAMED_PIPE_INTERCEPTION_H__ diff --git a/sandbox/win/src/named_pipe_policy.cc b/sandbox/win/src/named_pipe_policy.cc index 00182cf..470e823 100644 --- a/sandbox/win/src/named_pipe_policy.cc +++ b/sandbox/win/src/named_pipe_policy.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/named_pipe_policy.h" +#include "sandbox/win/src/named_pipe_policy.h" #include <string> -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_opcodes.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox_types.h" +#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_types.h" namespace { diff --git a/sandbox/win/src/named_pipe_policy.h b/sandbox/win/src/named_pipe_policy.h index 2b6b09d..1ba07b8 100644 --- a/sandbox/win/src/named_pipe_policy.h +++ b/sandbox/win/src/named_pipe_policy.h @@ -8,9 +8,9 @@ #include <string> #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/sandbox_policy.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/sandbox_policy.h" namespace sandbox { diff --git a/sandbox/win/src/named_pipe_policy_test.cc b/sandbox/win/src/named_pipe_policy_test.cc index 11ddbc3..f4cdc1a 100644 --- a/sandbox/win/src/named_pipe_policy_test.cc +++ b/sandbox/win/src/named_pipe_policy_test.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/sandbox_factory.h" #include "sandbox/tests/common/controller.h" namespace sandbox { diff --git a/sandbox/win/src/policy_broker.cc b/sandbox/win/src/policy_broker.cc index 61c64c6..210eb47 100644 --- a/sandbox/win/src/policy_broker.cc +++ b/sandbox/win/src/policy_broker.cc @@ -4,20 +4,20 @@ #include <map> -#include "sandbox/src/policy_broker.h" +#include "sandbox/win/src/policy_broker.h" #include "base/logging.h" #include "base/win/pe_image.h" #include "base/win/windows_version.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/policy_target.h" -#include "sandbox/src/process_thread_interception.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_nt_types.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sandbox_utils.h" -#include "sandbox/src/target_process.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/policy_target.h" +#include "sandbox/win/src/process_thread_interception.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_nt_types.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_utils.h" +#include "sandbox/win/src/target_process.h" // This code executes on the broker side, as a callback from the policy on the // target side (the child). diff --git a/sandbox/win/src/policy_broker.h b/sandbox/win/src/policy_broker.h index fd2602a..1c5cc26 100644 --- a/sandbox/win/src/policy_broker.h +++ b/sandbox/win/src/policy_broker.h @@ -5,7 +5,7 @@ #ifndef SANDBOX_SRC_POLICY_BROKER_H_ #define SANDBOX_SRC_POLICY_BROKER_H_ -#include "sandbox/src/interception.h" +#include "sandbox/win/src/interception.h" namespace sandbox { diff --git a/sandbox/win/src/policy_engine_opcodes.cc b/sandbox/win/src/policy_engine_opcodes.cc index 8d9ceef..e8a39ed 100644 --- a/sandbox/win/src/policy_engine_opcodes.cc +++ b/sandbox/win/src/policy_engine_opcodes.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/policy_engine_opcodes.h" +#include "sandbox/win/src/policy_engine_opcodes.h" #include "base/basictypes.h" -#include "sandbox/src/sandbox_nt_types.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_nt_types.h" +#include "sandbox/win/src/sandbox_types.h" namespace { const unsigned short kMaxUniStrSize = 0xfffc; diff --git a/sandbox/win/src/policy_engine_opcodes.h b/sandbox/win/src/policy_engine_opcodes.h index 6821413..f74ce31 100644 --- a/sandbox/win/src/policy_engine_opcodes.h +++ b/sandbox/win/src/policy_engine_opcodes.h @@ -5,7 +5,7 @@ #ifndef SANDBOX_SRC_POLICY_ENGINE_OPCODES_H__ #define SANDBOX_SRC_POLICY_ENGINE_OPCODES_H__ -#include "sandbox/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_params.h" #include "base/basictypes.h" // The low-level policy is implemented using the concept of policy 'opcodes'. diff --git a/sandbox/win/src/policy_engine_params.h b/sandbox/win/src/policy_engine_params.h index ecf454f..a1566f3 100644 --- a/sandbox/win/src/policy_engine_params.h +++ b/sandbox/win/src/policy_engine_params.h @@ -6,9 +6,9 @@ #define SANDBOX_SRC_POLICY_ENGINE_PARAMS_H__ #include "base/basictypes.h" -#include "sandbox/src/internal_types.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/internal_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_nt_util.h" // This header defines the classes that allow the low level policy to select // the input parameters. In order to better make sense of this header is diff --git a/sandbox/win/src/policy_engine_processor.cc b/sandbox/win/src/policy_engine_processor.cc index d0455d0..a35eabf 100644 --- a/sandbox/win/src/policy_engine_processor.cc +++ b/sandbox/win/src/policy_engine_processor.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/policy_engine_processor.h" +#include "sandbox/win/src/policy_engine_processor.h" namespace sandbox { diff --git a/sandbox/win/src/policy_engine_processor.h b/sandbox/win/src/policy_engine_processor.h index 3327e36..85c999e 100644 --- a/sandbox/win/src/policy_engine_processor.h +++ b/sandbox/win/src/policy_engine_processor.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_POLICY_ENGINE_PROCESSOR_H__ #include "base/basictypes.h" -#include "sandbox/src/policy_engine_params.h" -#include "sandbox/src/policy_engine_opcodes.h" +#include "sandbox/win/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_opcodes.h" namespace sandbox { diff --git a/sandbox/win/src/policy_engine_unittest.cc b/sandbox/win/src/policy_engine_unittest.cc index f988ccc..e6c3435 100644 --- a/sandbox/win/src/policy_engine_unittest.cc +++ b/sandbox/win/src/policy_engine_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/policy_engine_params.h" -#include "sandbox/src/policy_engine_processor.h" +#include "sandbox/win/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_processor.h" #include "testing/gtest/include/gtest/gtest.h" #define POLPARAMS_BEGIN(x) sandbox::ParameterSet x[] = { diff --git a/sandbox/win/src/policy_low_level.cc b/sandbox/win/src/policy_low_level.cc index 401f2e1..8431bc0 100644 --- a/sandbox/win/src/policy_low_level.cc +++ b/sandbox/win/src/policy_low_level.cc @@ -5,7 +5,7 @@ #include <string> #include <map> -#include "sandbox/src/policy_low_level.h" +#include "sandbox/win/src/policy_low_level.h" #include "base/basictypes.h" namespace { diff --git a/sandbox/win/src/policy_low_level.h b/sandbox/win/src/policy_low_level.h index 5bf6a46..025a133 100644 --- a/sandbox/win/src/policy_low_level.h +++ b/sandbox/win/src/policy_low_level.h @@ -8,9 +8,9 @@ #include <list> #include "base/basictypes.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_params.h" -#include "sandbox/src/policy_engine_opcodes.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_opcodes.h" // Low level policy classes. // Built on top of the PolicyOpcode and OpcodeFatory, the low level policy diff --git a/sandbox/win/src/policy_low_level_unittest.cc b/sandbox/win/src/policy_low_level_unittest.cc index 20d1777..4a2cf4b 100644 --- a/sandbox/win/src/policy_low_level_unittest.cc +++ b/sandbox/win/src/policy_low_level_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/policy_engine_params.h" -#include "sandbox/src/policy_engine_processor.h" -#include "sandbox/src/policy_low_level.h" +#include "sandbox/win/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_processor.h" +#include "sandbox/win/src/policy_low_level.h" #include "testing/gtest/include/gtest/gtest.h" #define POLPARAMS_BEGIN(x) sandbox::ParameterSet x[] = { diff --git a/sandbox/win/src/policy_opcodes_unittest.cc b/sandbox/win/src/policy_opcodes_unittest.cc index 37ccd80..e1a7ad6 100644 --- a/sandbox/win/src/policy_opcodes_unittest.cc +++ b/sandbox/win/src/policy_opcodes_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sandbox_nt_types.h" -#include "sandbox/src/policy_engine_params.h" -#include "sandbox/src/policy_engine_opcodes.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_nt_types.h" +#include "sandbox/win/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_opcodes.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/policy_params.h b/sandbox/win/src/policy_params.h index e1fb3fc..686d08f 100644 --- a/sandbox/win/src/policy_params.h +++ b/sandbox/win/src/policy_params.h @@ -5,7 +5,7 @@ #ifndef SANDBOX_SRC_POLICY_PARAMS_H__ #define SANDBOX_SRC_POLICY_PARAMS_H__ -#include "sandbox/src/policy_engine_params.h" +#include "sandbox/win/src/policy_engine_params.h" namespace sandbox { diff --git a/sandbox/win/src/policy_target.cc b/sandbox/win/src/policy_target.cc index aa69892..84b7203 100644 --- a/sandbox/win/src/policy_target.cc +++ b/sandbox/win/src/policy_target.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/policy_target.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_processor.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/policy_target.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_engine_processor.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/policy_target.h b/sandbox/win/src/policy_target.h index 4a77b47..8a2b437 100644 --- a/sandbox/win/src/policy_target.h +++ b/sandbox/win/src/policy_target.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_POLICY_TARGET_H__ #define SANDBOX_SRC_POLICY_TARGET_H__ diff --git a/sandbox/win/src/policy_target_test.cc b/sandbox/win/src/policy_target_test.cc index aef7548..232a806 100644 --- a/sandbox/win/src/policy_target_test.cc +++ b/sandbox/win/src/policy_target_test.cc @@ -4,10 +4,10 @@ #include "base/win/scoped_process_information.h" #include "base/win/windows_version.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_utils.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_utils.h" +#include "sandbox/win/src/target_services.h" #include "sandbox/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/process_policy_test.cc b/sandbox/win/src/process_policy_test.cc index 783446e..1287788 100644 --- a/sandbox/win/src/process_policy_test.cc +++ b/sandbox/win/src/process_policy_test.cc @@ -8,9 +8,9 @@ #include "base/sys_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/sandbox_factory.h" #include "sandbox/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/process_thread_dispatcher.cc b/sandbox/win/src/process_thread_dispatcher.cc index cc137a5..2df203a 100644 --- a/sandbox/win/src/process_thread_dispatcher.cc +++ b/sandbox/win/src/process_thread_dispatcher.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/process_thread_dispatcher.h" +#include "sandbox/win/src/process_thread_dispatcher.h" #include "base/basictypes.h" #include "base/logging.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_broker.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/process_thread_interception.h" -#include "sandbox/src/process_thread_policy.h" -#include "sandbox/src/sandbox.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_broker.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/process_thread_interception.h" +#include "sandbox/win/src/process_thread_policy.h" +#include "sandbox/win/src/sandbox.h" namespace { diff --git a/sandbox/win/src/process_thread_dispatcher.h b/sandbox/win/src/process_thread_dispatcher.h index 45fad03..1cc5743 100644 --- a/sandbox/win/src/process_thread_dispatcher.h +++ b/sandbox/win/src/process_thread_dispatcher.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_PROCESS_THREAD_DISPATCHER_H_ #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_policy_base.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_policy_base.h" namespace sandbox { diff --git a/sandbox/win/src/process_thread_interception.cc b/sandbox/win/src/process_thread_interception.cc index e847908..cb1017b 100644 --- a/sandbox/win/src/process_thread_interception.cc +++ b/sandbox/win/src/process_thread_interception.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/process_thread_interception.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/policy_target.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/process_thread_interception.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/policy_target.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/process_thread_interception.h b/sandbox/win/src/process_thread_interception.h index 37c2c14..7d2d533 100644 --- a/sandbox/win/src/process_thread_interception.h +++ b/sandbox/win/src/process_thread_interception.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_PROCESS_THREAD_INTERCEPTION_H__ #define SANDBOX_SRC_PROCESS_THREAD_INTERCEPTION_H__ diff --git a/sandbox/win/src/process_thread_policy.cc b/sandbox/win/src/process_thread_policy.cc index ca00916..9493b9e 100644 --- a/sandbox/win/src/process_thread_policy.cc +++ b/sandbox/win/src/process_thread_policy.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/process_thread_policy.h" +#include "sandbox/win/src/process_thread_policy.h" #include <string> #include "base/memory/scoped_ptr.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/policy_engine_opcodes.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/policy_engine_opcodes.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/win_utils.h" namespace { diff --git a/sandbox/win/src/process_thread_policy.h b/sandbox/win/src/process_thread_policy.h index 78323cc..c35c52b5 100644 --- a/sandbox/win/src/process_thread_policy.h +++ b/sandbox/win/src/process_thread_policy.h @@ -7,11 +7,11 @@ #include <string> -#include "sandbox/src/policy_low_level.h" +#include "sandbox/win/src/policy_low_level.h" #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_policy.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_policy.h" namespace sandbox { diff --git a/sandbox/win/src/registry_dispatcher.cc b/sandbox/win/src/registry_dispatcher.cc index f86c76a..f4dc5f5 100644 --- a/sandbox/win/src/registry_dispatcher.cc +++ b/sandbox/win/src/registry_dispatcher.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/registry_dispatcher.h" +#include "sandbox/win/src/registry_dispatcher.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/policy_broker.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/registry_interception.h" -#include "sandbox/src/registry_policy.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/policy_broker.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/registry_interception.h" +#include "sandbox/win/src/registry_policy.h" namespace { diff --git a/sandbox/win/src/registry_dispatcher.h b/sandbox/win/src/registry_dispatcher.h index 6d1390d..782a070 100644 --- a/sandbox/win/src/registry_dispatcher.h +++ b/sandbox/win/src/registry_dispatcher.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_REGISTRY_DISPATCHER_H_ #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_policy_base.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_policy_base.h" namespace sandbox { diff --git a/sandbox/win/src/registry_interception.cc b/sandbox/win/src/registry_interception.cc index 3cabf47..936d4ac 100644 --- a/sandbox/win/src/registry_interception.cc +++ b/sandbox/win/src/registry_interception.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/registry_interception.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/registry_interception.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/registry_interception.h b/sandbox/win/src/registry_interception.h index 7036c49..c3cbde0 100644 --- a/sandbox/win/src/registry_interception.h +++ b/sandbox/win/src/registry_interception.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_REGISTRY_INTERCEPTION_H__ #define SANDBOX_SRC_REGISTRY_INTERCEPTION_H__ diff --git a/sandbox/win/src/registry_policy.cc b/sandbox/win/src/registry_policy.cc index 497636f..55f3bcd 100644 --- a/sandbox/win/src/registry_policy.cc +++ b/sandbox/win/src/registry_policy.cc @@ -4,15 +4,15 @@ #include <string> -#include "sandbox/src/registry_policy.h" +#include "sandbox/win/src/registry_policy.h" #include "base/logging.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_opcodes.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox_utils.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/win_utils.h" +#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/win_utils.h" namespace { diff --git a/sandbox/win/src/registry_policy.h b/sandbox/win/src/registry_policy.h index da41d1c..8badde2 100644 --- a/sandbox/win/src/registry_policy.h +++ b/sandbox/win/src/registry_policy.h @@ -8,10 +8,10 @@ #include <string> #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/sandbox_policy.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/sandbox_policy.h" namespace sandbox { diff --git a/sandbox/win/src/registry_policy_test.cc b/sandbox/win/src/registry_policy_test.cc index cdc1577..f791432 100644 --- a/sandbox/win/src/registry_policy_test.cc +++ b/sandbox/win/src/registry_policy_test.cc @@ -5,12 +5,12 @@ #include <shlobj.h> #include "testing/gtest/include/gtest/gtest.h" -#include "sandbox/src/registry_policy.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/registry_policy.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/win_utils.h" #include "sandbox/tests/common/controller.h" namespace { diff --git a/sandbox/win/src/resolver.cc b/sandbox/win/src/resolver.cc index 295bfb2..6616fa5 100644 --- a/sandbox/win/src/resolver.cc +++ b/sandbox/win/src/resolver.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/resolver.h" +#include "sandbox/win/src/resolver.h" #include "base/win/pe_image.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/sandbox_nt_util.h" namespace sandbox { diff --git a/sandbox/win/src/resolver.h b/sandbox/win/src/resolver.h index 7ec0bf5..85f1e91 100644 --- a/sandbox/win/src/resolver.h +++ b/sandbox/win/src/resolver.h @@ -7,7 +7,7 @@ // http://dev.chromium.org/developers/design-documents/sandbox . #include "base/basictypes.h" -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/nt_internals.h" #ifndef SANDBOX_SRC_RESOLVER_H__ #define SANDBOX_SRC_RESOLVER_H__ diff --git a/sandbox/win/src/resolver_32.cc b/sandbox/win/src/resolver_32.cc index ae5c168..e5d7be3 100644 --- a/sandbox/win/src/resolver_32.cc +++ b/sandbox/win/src/resolver_32.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/resolver.h" +#include "sandbox/win/src/resolver.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/sandbox_nt_util.h" namespace { diff --git a/sandbox/win/src/resolver_64.cc b/sandbox/win/src/resolver_64.cc index 96d039b..ca58b20 100644 --- a/sandbox/win/src/resolver_64.cc +++ b/sandbox/win/src/resolver_64.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/resolver.h" +#include "sandbox/win/src/resolver.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/sandbox_nt_util.h" namespace { diff --git a/sandbox/win/src/restricted_token.cc b/sandbox/win/src/restricted_token.cc index bac8816..8a096a1 100644 --- a/sandbox/win/src/restricted_token.cc +++ b/sandbox/win/src/restricted_token.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/restricted_token.h" +#include "sandbox/win/src/restricted_token.h" #include <vector> #include "base/logging.h" -#include "sandbox/src/acl.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/acl.h" +#include "sandbox/win/src/win_utils.h" namespace sandbox { diff --git a/sandbox/win/src/restricted_token.h b/sandbox/win/src/restricted_token.h index 88bd70f..4327856 100644 --- a/sandbox/win/src/restricted_token.h +++ b/sandbox/win/src/restricted_token.h @@ -9,9 +9,9 @@ #include <vector> #include "base/basictypes.h" -#include "sandbox/src/restricted_token_utils.h" -#include "sandbox/src/security_level.h" -#include "sandbox/src/sid.h" +#include "sandbox/win/src/restricted_token_utils.h" +#include "sandbox/win/src/security_level.h" +#include "sandbox/win/src/sid.h" // Flags present in the Group SID list. These 2 flags are new in Windows Vista #ifndef SE_GROUP_INTEGRITY diff --git a/sandbox/win/src/restricted_token_unittest.cc b/sandbox/win/src/restricted_token_unittest.cc index 310b73f..df35f1c 100644 --- a/sandbox/win/src/restricted_token_unittest.cc +++ b/sandbox/win/src/restricted_token_unittest.cc @@ -8,8 +8,8 @@ #include <atlbase.h> #include <atlsecurity.h> #include <vector> -#include "sandbox/src/restricted_token.h" -#include "sandbox/src/sid.h" +#include "sandbox/win/src/restricted_token.h" +#include "sandbox/win/src/sid.h" #include "testing/gtest/include/gtest/gtest.h" namespace sandbox { diff --git a/sandbox/win/src/restricted_token_utils.cc b/sandbox/win/src/restricted_token_utils.cc index df30b40..5f1a246 100644 --- a/sandbox/win/src/restricted_token_utils.cc +++ b/sandbox/win/src/restricted_token_utils.cc @@ -6,16 +6,16 @@ #include <sddl.h> #include <vector> -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token_utils.h" #include "base/logging.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" #include "base/win/windows_version.h" -#include "sandbox/src/job.h" -#include "sandbox/src/restricted_token.h" -#include "sandbox/src/security_level.h" -#include "sandbox/src/sid.h" +#include "sandbox/win/src/job.h" +#include "sandbox/win/src/restricted_token.h" +#include "sandbox/win/src/security_level.h" +#include "sandbox/win/src/sid.h" namespace sandbox { diff --git a/sandbox/win/src/restricted_token_utils.h b/sandbox/win/src/restricted_token_utils.h index 0aade8b..f2a280a 100644 --- a/sandbox/win/src/restricted_token_utils.h +++ b/sandbox/win/src/restricted_token_utils.h @@ -8,8 +8,8 @@ #include <accctrl.h> #include <windows.h> -#include "sandbox/src/restricted_token.h" -#include "sandbox/src/security_level.h" +#include "sandbox/win/src/restricted_token.h" +#include "sandbox/win/src/security_level.h" // Contains the utility functions to be able to create restricted tokens based // on a security profiles. diff --git a/sandbox/win/src/sandbox.cc b/sandbox/win/src/sandbox.cc index f70c702..3344ba4 100644 --- a/sandbox/win/src/sandbox.cc +++ b/sandbox/win/src/sandbox.cc @@ -4,10 +4,10 @@ #include <stdio.h> #include <windows.h> -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/broker_services.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/broker_services.h" +#include "sandbox/win/src/target_services.h" #if defined(_WIN64) && !defined(NACL_WIN64) // We allow building this code for Win64 as part of NaCl to enable development diff --git a/sandbox/win/src/sandbox.h b/sandbox/win/src/sandbox.h index 18c05ce..ee4b7b0 100644 --- a/sandbox/win/src/sandbox.h +++ b/sandbox/win/src/sandbox.h @@ -22,8 +22,8 @@ #include <windows.h> #include "base/basictypes.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/sandbox_types.h" // sandbox: Google User-Land Application Sandbox namespace sandbox { diff --git a/sandbox/win/src/sandbox_factory.h b/sandbox/win/src/sandbox_factory.h index b52bcb6..7a0280f 100644 --- a/sandbox/win/src/sandbox_factory.h +++ b/sandbox/win/src/sandbox_factory.h @@ -5,7 +5,7 @@ #ifndef SANDBOX_SRC_SANDBOX_FACTORY_H__ #define SANDBOX_SRC_SANDBOX_FACTORY_H__ -#include "sandbox/src/sandbox.h" +#include "sandbox/win/src/sandbox.h" // SandboxFactory is a set of static methods to get access to the broker // or target services object. Only one of the two methods (GetBrokerServices, diff --git a/sandbox/win/src/sandbox_nt_types.h b/sandbox/win/src/sandbox_nt_types.h index d0d24f8..1303ac2 100644 --- a/sandbox/win/src/sandbox_nt_types.h +++ b/sandbox/win/src/sandbox_nt_types.h @@ -5,7 +5,7 @@ #ifndef SANDBOX_SRC_SANDBOX_NT_TYPES_H__ #define SANDBOX_SRC_SANDBOX_NT_TYPES_H__ -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/nt_internals.h" namespace sandbox { diff --git a/sandbox/win/src/sandbox_nt_util.cc b/sandbox/win/src/sandbox_nt_util.cc index daa361a..4c937bd 100644 --- a/sandbox/win/src/sandbox_nt_util.cc +++ b/sandbox/win/src/sandbox_nt_util.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/sandbox_nt_util.h" #include "base/win/pe_image.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/sandbox_nt_util.h b/sandbox/win/src/sandbox_nt_util.h index 7a82302..06538cd 100644 --- a/sandbox/win/src/sandbox_nt_util.h +++ b/sandbox/win/src/sandbox_nt_util.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_SANDBOX_NT_UTIL_H_ #include "base/basictypes.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_nt_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_nt_types.h" // Placement new and delete to be used from ntdll interception code. void* __cdecl operator new(size_t size, sandbox::AllocationType type, diff --git a/sandbox/win/src/sandbox_policy.h b/sandbox/win/src/sandbox_policy.h index 288adc45..566351a4 100644 --- a/sandbox/win/src/sandbox_policy.h +++ b/sandbox/win/src/sandbox_policy.h @@ -8,8 +8,8 @@ #include <string> #include "base/basictypes.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/security_level.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/security_level.h" namespace sandbox { diff --git a/sandbox/win/src/sandbox_policy_base.cc b/sandbox/win/src/sandbox_policy_base.cc index 4438641..63e77d5 100644 --- a/sandbox/win/src/sandbox_policy_base.cc +++ b/sandbox/win/src/sandbox_policy_base.cc @@ -2,32 +2,32 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sandbox_policy_base.h" +#include "sandbox/win/src/sandbox_policy_base.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/logging.h" -#include "sandbox/src/filesystem_dispatcher.h" -#include "sandbox/src/filesystem_policy.h" -#include "sandbox/src/handle_dispatcher.h" -#include "sandbox/src/handle_policy.h" -#include "sandbox/src/job.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/named_pipe_dispatcher.h" -#include "sandbox/src/named_pipe_policy.h" -#include "sandbox/src/policy_broker.h" -#include "sandbox/src/policy_engine_processor.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/process_thread_dispatcher.h" -#include "sandbox/src/process_thread_policy.h" -#include "sandbox/src/registry_dispatcher.h" -#include "sandbox/src/registry_policy.h" -#include "sandbox/src/restricted_token_utils.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/sync_dispatcher.h" -#include "sandbox/src/sync_policy.h" -#include "sandbox/src/target_process.h" -#include "sandbox/src/window.h" +#include "sandbox/win/src/filesystem_dispatcher.h" +#include "sandbox/win/src/filesystem_policy.h" +#include "sandbox/win/src/handle_dispatcher.h" +#include "sandbox/win/src/handle_policy.h" +#include "sandbox/win/src/job.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/named_pipe_dispatcher.h" +#include "sandbox/win/src/named_pipe_policy.h" +#include "sandbox/win/src/policy_broker.h" +#include "sandbox/win/src/policy_engine_processor.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/process_thread_dispatcher.h" +#include "sandbox/win/src/process_thread_policy.h" +#include "sandbox/win/src/registry_dispatcher.h" +#include "sandbox/win/src/registry_policy.h" +#include "sandbox/win/src/restricted_token_utils.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/sync_dispatcher.h" +#include "sandbox/win/src/sync_policy.h" +#include "sandbox/win/src/target_process.h" +#include "sandbox/win/src/window.h" namespace { // The standard windows size for one memory page. diff --git a/sandbox/win/src/sandbox_policy_base.h b/sandbox/win/src/sandbox_policy_base.h index b3ea805..8fdfe91 100644 --- a/sandbox/win/src/sandbox_policy_base.h +++ b/sandbox/win/src/sandbox_policy_base.h @@ -13,13 +13,13 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/handle_closer.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_opcodes.h" -#include "sandbox/src/policy_engine_params.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/handle_closer.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_engine_opcodes.h" +#include "sandbox/win/src/policy_engine_params.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/win_utils.h" namespace sandbox { diff --git a/sandbox/win/src/sandbox_utils.cc b/sandbox/win/src/sandbox_utils.cc index 3bfa696..509c7c8 100644 --- a/sandbox/win/src/sandbox_utils.cc +++ b/sandbox/win/src/sandbox_utils.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sandbox_utils.h" +#include "sandbox/win/src/sandbox_utils.h" #include <windows.h> #include "base/logging.h" #include "base/win/windows_version.h" -#include "sandbox/src/internal_types.h" -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/internal_types.h" +#include "sandbox/win/src/nt_internals.h" namespace sandbox { diff --git a/sandbox/win/src/sandbox_utils.h b/sandbox/win/src/sandbox_utils.h index 314330f..8329698 100644 --- a/sandbox/win/src/sandbox_utils.h +++ b/sandbox/win/src/sandbox_utils.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/nt_internals.h" namespace sandbox { diff --git a/sandbox/win/src/service_resolver.cc b/sandbox/win/src/service_resolver.cc index 79579a0..bae698c 100644 --- a/sandbox/win/src/service_resolver.cc +++ b/sandbox/win/src/service_resolver.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/service_resolver.h" +#include "sandbox/win/src/service_resolver.h" #include "base/logging.h" #include "base/win/pe_image.h" diff --git a/sandbox/win/src/service_resolver.h b/sandbox/win/src/service_resolver.h index 99eadb6..3eb9e08 100644 --- a/sandbox/win/src/service_resolver.h +++ b/sandbox/win/src/service_resolver.h @@ -5,8 +5,8 @@ #ifndef SANDBOX_SRC_SERVICE_RESOLVER_H__ #define SANDBOX_SRC_SERVICE_RESOLVER_H__ -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/resolver.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/resolver.h" namespace sandbox { diff --git a/sandbox/win/src/service_resolver_32.cc b/sandbox/win/src/service_resolver_32.cc index 2f5597b..d4d2048 100644 --- a/sandbox/win/src/service_resolver_32.cc +++ b/sandbox/win/src/service_resolver_32.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/service_resolver.h" +#include "sandbox/win/src/service_resolver.h" #include "base/memory/scoped_ptr.h" -#include "sandbox/src/sandbox_utils.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/sandbox_utils.h" +#include "sandbox/win/src/win_utils.h" namespace { #pragma pack(push, 1) diff --git a/sandbox/win/src/service_resolver_64.cc b/sandbox/win/src/service_resolver_64.cc index 01e3b1a..b69d4d8 100644 --- a/sandbox/win/src/service_resolver_64.cc +++ b/sandbox/win/src/service_resolver_64.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/service_resolver.h" +#include "sandbox/win/src/service_resolver.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/win_utils.h" namespace { #pragma pack(push, 1) diff --git a/sandbox/win/src/service_resolver_unittest.cc b/sandbox/win/src/service_resolver_unittest.cc index fc85c86..8c44202 100644 --- a/sandbox/win/src/service_resolver_unittest.cc +++ b/sandbox/win/src/service_resolver_unittest.cc @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/win/windows_version.h" -#include "sandbox/src/resolver.h" -#include "sandbox/src/sandbox_utils.h" -#include "sandbox/src/service_resolver.h" +#include "sandbox/win/src/resolver.h" +#include "sandbox/win/src/sandbox_utils.h" +#include "sandbox/win/src/service_resolver.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/sandbox/win/src/shared_handles.cc b/sandbox/win/src/shared_handles.cc index d07f057..423b67b 100644 --- a/sandbox/win/src/shared_handles.cc +++ b/sandbox/win/src/shared_handles.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/shared_handles.h" +#include "sandbox/win/src/shared_handles.h" namespace sandbox { diff --git a/sandbox/win/src/sharedmem_ipc_client.cc b/sandbox/win/src/sharedmem_ipc_client.cc index 30c03b9..a9eb01f 100644 --- a/sandbox/win/src/sharedmem_ipc_client.cc +++ b/sandbox/win/src/sharedmem_ipc_client.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include <string.h> -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/crosscall_params.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/crosscall_params.h" #include "base/logging.h" namespace sandbox { diff --git a/sandbox/win/src/sharedmem_ipc_client.h b/sandbox/win/src/sharedmem_ipc_client.h index 90d0022..a0c5f2f 100644 --- a/sandbox/win/src/sharedmem_ipc_client.h +++ b/sandbox/win/src/sharedmem_ipc_client.h @@ -5,8 +5,8 @@ #ifndef SANDBOX_SRC_SHAREDMEM_IPC_CLIENT_H__ #define SANDBOX_SRC_SHAREDMEM_IPC_CLIENT_H__ -#include "sandbox/src/crosscall_params.h" -#include "sandbox/src/sandbox.h" +#include "sandbox/win/src/crosscall_params.h" +#include "sandbox/win/src/sandbox.h" // IPC transport implementation that uses shared memory. // This is the client side diff --git a/sandbox/win/src/sharedmem_ipc_server.cc b/sandbox/win/src/sharedmem_ipc_server.cc index ba90d1b..e2a30c72 100644 --- a/sandbox/win/src/sharedmem_ipc_server.cc +++ b/sandbox/win/src/sharedmem_ipc_server.cc @@ -5,12 +5,12 @@ #include "base/callback.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "sandbox/src/sharedmem_ipc_server.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/crosscall_params.h" -#include "sandbox/src/crosscall_server.h" +#include "sandbox/win/src/sharedmem_ipc_server.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/crosscall_params.h" +#include "sandbox/win/src/crosscall_server.h" namespace sandbox { diff --git a/sandbox/win/src/sharedmem_ipc_server.h b/sandbox/win/src/sharedmem_ipc_server.h index 7e10174..94d6959 100644 --- a/sandbox/win/src/sharedmem_ipc_server.h +++ b/sandbox/win/src/sharedmem_ipc_server.h @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "sandbox/src/crosscall_params.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/crosscall_params.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" // IPC transport implementation that uses shared memory. // This is the server side diff --git a/sandbox/win/src/sid.cc b/sandbox/win/src/sid.cc index 6ed9963..261605d 100644 --- a/sandbox/win/src/sid.cc +++ b/sandbox/win/src/sid.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sid.h" +#include "sandbox/win/src/sid.h" #include "base/logging.h" diff --git a/sandbox/win/src/sid_unittest.cc b/sandbox/win/src/sid_unittest.cc index f1ac60a..76d61e8 100644 --- a/sandbox/win/src/sid_unittest.cc +++ b/sandbox/win/src/sid_unittest.cc @@ -8,7 +8,7 @@ #include <atlbase.h> #include <atlsecurity.h> -#include "sandbox/src/sid.h" +#include "sandbox/win/src/sid.h" #include "testing/gtest/include/gtest/gtest.h" namespace sandbox { diff --git a/sandbox/win/src/sidestep/ia32_modrm_map.cpp b/sandbox/win/src/sidestep/ia32_modrm_map.cpp index b22ab1d..89bc189 100644 --- a/sandbox/win/src/sidestep/ia32_modrm_map.cpp +++ b/sandbox/win/src/sidestep/ia32_modrm_map.cpp @@ -6,8 +6,8 @@ // Based on information in the IA-32 Intel Architecture // Software Developer's Manual Volume 2: Instruction Set Reference. -#include "sandbox/src/sidestep/mini_disassembler.h" -#include "sandbox/src/sidestep/mini_disassembler_types.h" +#include "sandbox/win/src/sidestep/mini_disassembler.h" +#include "sandbox/win/src/sidestep/mini_disassembler_types.h" namespace sidestep { diff --git a/sandbox/win/src/sidestep/ia32_opcode_map.cpp b/sandbox/win/src/sidestep/ia32_opcode_map.cpp index 9f37cef..b7d8a60 100644 --- a/sandbox/win/src/sidestep/ia32_opcode_map.cpp +++ b/sandbox/win/src/sidestep/ia32_opcode_map.cpp @@ -7,7 +7,7 @@ // for how to lay out the tables in memory taken from the implementation // in the Bastard disassembly environment. -#include "sandbox/src/sidestep/mini_disassembler.h" +#include "sandbox/win/src/sidestep/mini_disassembler.h" namespace sidestep { diff --git a/sandbox/win/src/sidestep/mini_disassembler.cpp b/sandbox/win/src/sidestep/mini_disassembler.cpp index 514522a..1e8e0bd 100644 --- a/sandbox/win/src/sidestep/mini_disassembler.cpp +++ b/sandbox/win/src/sidestep/mini_disassembler.cpp @@ -8,7 +8,7 @@ #error The code in this file should not be used on 64-bit Windows. #endif -#include "sandbox/src/sidestep/mini_disassembler.h" +#include "sandbox/win/src/sidestep/mini_disassembler.h" namespace sidestep { diff --git a/sandbox/win/src/sidestep/mini_disassembler.h b/sandbox/win/src/sidestep/mini_disassembler.h index 444df36..202c4ec 100644 --- a/sandbox/win/src/sidestep/mini_disassembler.h +++ b/sandbox/win/src/sidestep/mini_disassembler.h @@ -7,7 +7,7 @@ #ifndef SANDBOX_SRC_SIDESTEP_MINI_DISASSEMBLER_H__ #define SANDBOX_SRC_SIDESTEP_MINI_DISASSEMBLER_H__ -#include "sandbox/src/sidestep/mini_disassembler_types.h" +#include "sandbox/win/src/sidestep/mini_disassembler_types.h" namespace sidestep { diff --git a/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp b/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp index 4bdd79c2..999d76b 100644 --- a/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp +++ b/sandbox/win/src/sidestep/preamble_patcher_with_stub.cpp @@ -4,10 +4,10 @@ // Implementation of PreamblePatcher -#include "sandbox/src/sidestep/preamble_patcher.h" +#include "sandbox/win/src/sidestep/preamble_patcher.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sidestep/mini_disassembler.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sidestep/mini_disassembler.h" // Definitions of assembly statements we need #define ASM_JMP32REL 0xE9 diff --git a/sandbox/win/src/sidestep_resolver.cc b/sandbox/win/src/sidestep_resolver.cc index e22ca6b..47c0f56 100644 --- a/sandbox/win/src/sidestep_resolver.cc +++ b/sandbox/win/src/sidestep_resolver.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sidestep_resolver.h" +#include "sandbox/win/src/sidestep_resolver.h" #include "base/win/pe_image.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sidestep/preamble_patcher.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sidestep/preamble_patcher.h" namespace { diff --git a/sandbox/win/src/sidestep_resolver.h b/sandbox/win/src/sidestep_resolver.h index 1e7fdac..30d8cb3 100644 --- a/sandbox/win/src/sidestep_resolver.h +++ b/sandbox/win/src/sidestep_resolver.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_SIDESTEP_RESOLVER_H__ #include "base/basictypes.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/resolver.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/resolver.h" namespace sandbox { diff --git a/sandbox/win/src/sync_dispatcher.cc b/sandbox/win/src/sync_dispatcher.cc index 025fd96..eb1c1e4 100644 --- a/sandbox/win/src/sync_dispatcher.cc +++ b/sandbox/win/src/sync_dispatcher.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sync_dispatcher.h" +#include "sandbox/win/src/sync_dispatcher.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/interception.h" -#include "sandbox/src/interceptors.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_broker.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sync_interception.h" -#include "sandbox/src/sync_policy.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/interception.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_broker.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sync_interception.h" +#include "sandbox/win/src/sync_policy.h" namespace sandbox { diff --git a/sandbox/win/src/sync_dispatcher.h b/sandbox/win/src/sync_dispatcher.h index be9b9a2..13c8b9d3 100644 --- a/sandbox/win/src/sync_dispatcher.h +++ b/sandbox/win/src/sync_dispatcher.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_SYNC_DISPATCHER_H_ #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_policy_base.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_policy_base.h" namespace sandbox { diff --git a/sandbox/win/src/sync_interception.cc b/sandbox/win/src/sync_interception.cc index 4832c79..d235723 100644 --- a/sandbox/win/src/sync_interception.cc +++ b/sandbox/win/src/sync_interception.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/sync_interception.h" - -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/policy_target.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/sync_interception.h" + +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/policy_params.h" +#include "sandbox/win/src/policy_target.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/sync_interception.h b/sandbox/win/src/sync_interception.h index 4ac23e7..6c5c46e 100644 --- a/sandbox/win/src/sync_interception.h +++ b/sandbox/win/src/sync_interception.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_SYNC_INTERCEPTION_H__ #define SANDBOX_SRC_SYNC_INTERCEPTION_H__ diff --git a/sandbox/win/src/sync_policy.cc b/sandbox/win/src/sync_policy.cc index 364cf73..926fc52 100644 --- a/sandbox/win/src/sync_policy.cc +++ b/sandbox/win/src/sync_policy.cc @@ -4,14 +4,14 @@ #include <string> -#include "sandbox/src/sync_policy.h" +#include "sandbox/win/src/sync_policy.h" #include "base/logging.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/policy_engine_opcodes.h" -#include "sandbox/src/policy_params.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sandbox_utils.h" +#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_types.h" +#include "sandbox/win/src/sandbox_utils.h" namespace sandbox { diff --git a/sandbox/win/src/sync_policy.h b/sandbox/win/src/sync_policy.h index 6404f79..2b8b422 100644 --- a/sandbox/win/src/sync_policy.h +++ b/sandbox/win/src/sync_policy.h @@ -8,10 +8,10 @@ #include <string> #include "base/basictypes.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/sandbox_policy.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/sandbox_policy.h" namespace sandbox { diff --git a/sandbox/win/src/sync_policy_test.cc b/sandbox/win/src/sync_policy_test.cc index 3c87243..4b4e022 100644 --- a/sandbox/win/src/sync_policy_test.cc +++ b/sandbox/win/src/sync_policy_test.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/win/scoped_handle.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_policy.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_policy.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/nt_internals.h" #include "sandbox/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/target_interceptions.cc b/sandbox/win/src/target_interceptions.cc index a1d463b..e6b0dcf 100644 --- a/sandbox/win/src/target_interceptions.cc +++ b/sandbox/win/src/target_interceptions.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/target_interceptions.h" +#include "sandbox/win/src/target_interceptions.h" -#include "sandbox/src/interception_agent.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_nt_util.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/interception_agent.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_nt_util.h" +#include "sandbox/win/src/target_services.h" namespace sandbox { diff --git a/sandbox/win/src/target_interceptions.h b/sandbox/win/src/target_interceptions.h index dd6e12c..f4805fe 100644 --- a/sandbox/win/src/target_interceptions.h +++ b/sandbox/win/src/target_interceptions.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/sandbox_types.h" #ifndef SANDBOX_SRC_TARGET_INTERCEPTIONS_H__ #define SANDBOX_SRC_TARGET_INTERCEPTIONS_H__ diff --git a/sandbox/win/src/target_process.cc b/sandbox/win/src/target_process.cc index 88e2751..601d80b 100644 --- a/sandbox/win/src/target_process.cc +++ b/sandbox/win/src/target_process.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/target_process.h" +#include "sandbox/win/src/target_process.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/win/pe_image.h" #include "base/win/windows_version.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/policy_low_level.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sharedmem_ipc_server.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/policy_low_level.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/sharedmem_ipc_server.h" namespace { diff --git a/sandbox/win/src/target_process.h b/sandbox/win/src/target_process.h index 6e462c3..311fa84 100644 --- a/sandbox/win/src/target_process.h +++ b/sandbox/win/src/target_process.h @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" -#include "sandbox/src/crosscall_server.h" -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/crosscall_server.h" +#include "sandbox/win/src/sandbox_types.h" namespace sandbox { diff --git a/sandbox/win/src/target_services.cc b/sandbox/win/src/target_services.cc index e13a3d6..495f108 100644 --- a/sandbox/win/src/target_services.cc +++ b/sandbox/win/src/target_services.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/target_services.h" #include <process.h> #include "base/basictypes.h" -#include "sandbox/src/crosscall_client.h" -#include "sandbox/src/handle_closer_agent.h" -#include "sandbox/src/handle_interception.h" -#include "sandbox/src/ipc_tags.h" -#include "sandbox/src/restricted_token_utils.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_types.h" -#include "sandbox/src/sharedmem_ipc_client.h" -#include "sandbox/src/sandbox_nt_util.h" +#include "sandbox/win/src/crosscall_client.h" +#include "sandbox/win/src/handle_closer_agent.h" +#include "sandbox/win/src/handle_interception.h" +#include "sandbox/win/src/ipc_tags.h" +#include "sandbox/win/src/restricted_token_utils.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_types.h" +#include "sandbox/win/src/sharedmem_ipc_client.h" +#include "sandbox/win/src/sandbox_nt_util.h" namespace { diff --git a/sandbox/win/src/target_services.h b/sandbox/win/src/target_services.h index c4bf4f6..70f173b 100644 --- a/sandbox/win/src/target_services.h +++ b/sandbox/win/src/target_services.h @@ -6,8 +6,8 @@ #define SANDBOX_SRC_TARGET_SERVICES_H__ #include "base/basictypes.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/win_utils.h" namespace sandbox { diff --git a/sandbox/win/src/threadpool_unittest.cc b/sandbox/win/src/threadpool_unittest.cc index 2c85b57..f439810 100644 --- a/sandbox/win/src/threadpool_unittest.cc +++ b/sandbox/win/src/threadpool_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/win2k_threadpool.h" +#include "sandbox/win/src/win2k_threadpool.h" #include "testing/gtest/include/gtest/gtest.h" void __stdcall EmptyCallBack(void*, unsigned char) { diff --git a/sandbox/win/src/unload_dll_test.cc b/sandbox/win/src/unload_dll_test.cc index 2bce1b8..65c1687 100644 --- a/sandbox/win/src/unload_dll_test.cc +++ b/sandbox/win/src/unload_dll_test.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/win/scoped_handle.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/target_services.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/target_services.h" #include "sandbox/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/win2k_threadpool.cc b/sandbox/win/src/win2k_threadpool.cc index fe2473e..24cbacf 100644 --- a/sandbox/win/src/win2k_threadpool.cc +++ b/sandbox/win/src/win2k_threadpool.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/win2k_threadpool.h" +#include "sandbox/win/src/win2k_threadpool.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/win_utils.h" namespace sandbox { diff --git a/sandbox/win/src/win2k_threadpool.h b/sandbox/win/src/win2k_threadpool.h index 8593fa3..0abb358 100644 --- a/sandbox/win/src/win2k_threadpool.h +++ b/sandbox/win/src/win2k_threadpool.h @@ -7,7 +7,7 @@ #include <list> #include <algorithm> -#include "sandbox/src/crosscall_server.h" +#include "sandbox/win/src/crosscall_server.h" namespace sandbox { diff --git a/sandbox/win/src/win_utils.cc b/sandbox/win/src/win_utils.cc index 8a43d97..8e63ac7 100644 --- a/sandbox/win/src/win_utils.cc +++ b/sandbox/win/src/win_utils.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/win_utils.h" #include <map> #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "sandbox/src/internal_types.h" -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/internal_types.h" +#include "sandbox/win/src/nt_internals.h" namespace { diff --git a/sandbox/win/src/win_utils_unittest.cc b/sandbox/win/src/win_utils_unittest.cc index 0f445ef..08f672e 100644 --- a/sandbox/win/src/win_utils_unittest.cc +++ b/sandbox/win/src/win_utils_unittest.cc @@ -5,7 +5,7 @@ #include <windows.h> #include "base/win/scoped_handle.h" -#include "sandbox/src/win_utils.h" +#include "sandbox/win/src/win_utils.h" #include "sandbox/tests/common/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sandbox/win/src/window.cc b/sandbox/win/src/window.cc index 507ae57..445cb17 100644 --- a/sandbox/win/src/window.cc +++ b/sandbox/win/src/window.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/window.h" +#include "sandbox/win/src/window.h" #include <aclapi.h> diff --git a/sandbox/win/src/window.h b/sandbox/win/src/window.h index f65b463..e8233e7 100644 --- a/sandbox/win/src/window.h +++ b/sandbox/win/src/window.h @@ -8,7 +8,7 @@ #include <windows.h> #include <string> -#include "sandbox/src/sandbox_types.h" +#include "sandbox/win/src/sandbox_types.h" namespace sandbox { diff --git a/sandbox/win/tests/common/controller.cc b/sandbox/win/tests/common/controller.cc index 6c73c2d..aa1815f 100644 --- a/sandbox/win/tests/common/controller.cc +++ b/sandbox/win/tests/common/controller.cc @@ -10,8 +10,8 @@ #include "base/process_util.h" #include "base/sys_string_conversions.h" #include "base/win/windows_version.h" -#include "sandbox/src/sandbox_factory.h" -#include "sandbox/src/sandbox_utils.h" +#include "sandbox/win/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox_utils.h" namespace { diff --git a/sandbox/win/tests/common/controller.h b/sandbox/win/tests/common/controller.h index 5c2a471..42a6671 100644 --- a/sandbox/win/tests/common/controller.h +++ b/sandbox/win/tests/common/controller.h @@ -9,7 +9,7 @@ #include <string> #include "base/win/scoped_handle.h" -#include "sandbox/src/sandbox.h" +#include "sandbox/win/src/sandbox.h" namespace sandbox { diff --git a/sandbox/win/tests/integration_tests/integration_tests_test.cc b/sandbox/win/tests/integration_tests/integration_tests_test.cc index b610681..8db79f6 100644 --- a/sandbox/win/tests/integration_tests/integration_tests_test.cc +++ b/sandbox/win/tests/integration_tests/integration_tests_test.cc @@ -5,9 +5,9 @@ // Some tests for the framework itself. #include "testing/gtest/include/gtest/gtest.h" -#include "sandbox/src/sandbox.h" -#include "sandbox/src/target_services.h" -#include "sandbox/src/sandbox_factory.h" +#include "sandbox/win/src/sandbox.h" +#include "sandbox/win/src/target_services.h" +#include "sandbox/win/src/sandbox_factory.h" #include "sandbox/tests/common/controller.h" namespace sandbox { diff --git a/sandbox/win/tools/finder/finder.cc b/sandbox/win/tools/finder/finder.cc index 26fc1b9..4751dbe 100644 --- a/sandbox/win/tools/finder/finder.cc +++ b/sandbox/win/tools/finder/finder.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/restricted_token.h" -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token.h" +#include "sandbox/win/src/restricted_token_utils.h" #include "sandbox/tools/finder/finder.h" Finder::Finder() { diff --git a/sandbox/win/tools/finder/finder.h b/sandbox/win/tools/finder/finder.h index 0686b1d..a418485 100644 --- a/sandbox/win/tools/finder/finder.h +++ b/sandbox/win/tools/finder/finder.h @@ -5,7 +5,7 @@ #ifndef SANDBOX_TOOLS_FINDER_FINDER_H__ #define SANDBOX_TOOLS_FINDER_FINDER_H__ -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token_utils.h" #include "sandbox/tools/finder/ntundoc.h" // Type of stats that we calculate during the Scan operation diff --git a/sandbox/win/tools/finder/finder_fs.cc b/sandbox/win/tools/finder/finder_fs.cc index 7375b86..6a133e3 100644 --- a/sandbox/win/tools/finder/finder_fs.cc +++ b/sandbox/win/tools/finder/finder_fs.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/restricted_token.h" -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token.h" +#include "sandbox/win/src/restricted_token_utils.h" #include "sandbox/tools/finder/finder.h" DWORD Finder::ParseFileSystem(ATL::CString directory) { diff --git a/sandbox/win/tools/finder/finder_kernel.cc b/sandbox/win/tools/finder/finder_kernel.cc index 66ab454..5b73d7d 100644 --- a/sandbox/win/tools/finder/finder_kernel.cc +++ b/sandbox/win/tools/finder/finder_kernel.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/restricted_token.h" -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token.h" +#include "sandbox/win/src/restricted_token_utils.h" #include "sandbox/tools/finder/finder.h" #include "sandbox/tools/finder/ntundoc.h" diff --git a/sandbox/win/tools/finder/finder_registry.cc b/sandbox/win/tools/finder/finder_registry.cc index 4b18625..9ef061c 100644 --- a/sandbox/win/tools/finder/finder_registry.cc +++ b/sandbox/win/tools/finder/finder_registry.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/restricted_token.h" -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token.h" +#include "sandbox/win/src/restricted_token_utils.h" #include "sandbox/tools/finder/finder.h" DWORD Finder::ParseRegistry(HKEY key, ATL::CString print_name) { diff --git a/sandbox/win/tools/finder/main.cc b/sandbox/win/tools/finder/main.cc index 6ffbec3..ad28f8d 100644 --- a/sandbox/win/tools/finder/main.cc +++ b/sandbox/win/tools/finder/main.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token_utils.h" #include "sandbox/tools/finder/finder.h" #define PARAM_IS(y) (argc > i) && (_wcsicmp(argv[i], y) == 0) diff --git a/sandbox/win/tools/launcher/launcher.cc b/sandbox/win/tools/launcher/launcher.cc index 8f913b3..efcc4a4 100644 --- a/sandbox/win/tools/launcher/launcher.cc +++ b/sandbox/win/tools/launcher/launcher.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sandbox/src/restricted_token_utils.h" +#include "sandbox/win/src/restricted_token_utils.h" // launcher.exe is an application used to launch another application with a // restricted token. This is to be used for testing only. diff --git a/sandbox/win/wow_helper/service64_resolver.h b/sandbox/win/wow_helper/service64_resolver.h index f782172..abd7efd 100644 --- a/sandbox/win/wow_helper/service64_resolver.h +++ b/sandbox/win/wow_helper/service64_resolver.h @@ -5,8 +5,8 @@ #ifndef SANDBOX_WOW_HELPER_SERVICE64_RESOLVER_H__ #define SANDBOX_WOW_HELPER_SERVICE64_RESOLVER_H__ -#include "sandbox/src/nt_internals.h" -#include "sandbox/src/resolver.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/resolver.h" namespace sandbox { diff --git a/sandbox/win/wow_helper/target_code.h b/sandbox/win/wow_helper/target_code.h index 56db6fe..c198a85 100644 --- a/sandbox/win/wow_helper/target_code.h +++ b/sandbox/win/wow_helper/target_code.h @@ -5,7 +5,7 @@ #ifndef SANDBOX_WOW_HELPER_TARGET_CODE_H__ #define SANDBOX_WOW_HELPER_TARGET_CODE_H__ -#include "sandbox/src/nt_internals.h" +#include "sandbox/win/src/nt_internals.h" namespace sandbox { @@ -13,7 +13,7 @@ extern "C" { // Holds the information needed for the interception of NtMapViewOfSection. // Changes of this structure must be synchronized with changes of PatchInfo32 -// on sandbox/src/wow64.cc. +// on sandbox/win/src/wow64.cc. struct PatchInfo { HANDLE dll_load; // Event to signal the broker. HANDLE continue_load; // Event to wait for the broker. |