summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 18:25:52 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 18:25:52 +0000
commit3e947e0a312fbbf0009e67614d4413857fc0f286 (patch)
tree10de2c6b05480053f34eca852e85769dd8ac84c4 /sandbox
parent992c5b1d5541a8a35ac8b003b3c16cfb2405cd00 (diff)
downloadchromium_src-3e947e0a312fbbf0009e67614d4413857fc0f286.zip
chromium_src-3e947e0a312fbbf0009e67614d4413857fc0f286.tar.gz
chromium_src-3e947e0a312fbbf0009e67614d4413857fc0f286.tar.bz2
Make chrome compile with the win8 sdk
So we can move the metro bits to \src THREAD_INFORMATION_CLASS is now defined with unrelated values as follows: typedef enum _THREAD_INFORMATION_CLASS { ThreadMemoryPriority, ThreadAbsoluteCpuPriority, ThreadInformationClassMax } THREAD_INFORMATION_CLASS; BUG=127799 TEST= it builds, current test suffice Review URL: https://chromiumcodereview.appspot.com/10669027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144217 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/src/interceptors_64.cc2
-rw-r--r--sandbox/src/interceptors_64.h2
-rw-r--r--sandbox/src/nt_internals.h6
-rw-r--r--sandbox/src/policy_target.cc2
-rw-r--r--sandbox/src/policy_target.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/sandbox/src/interceptors_64.cc b/sandbox/src/interceptors_64.cc
index 835818b..c068010 100644
--- a/sandbox/src/interceptors_64.cc
+++ b/sandbox/src/interceptors_64.cc
@@ -41,7 +41,7 @@ NTSTATUS WINAPI TargetNtUnmapViewOfSection64(HANDLE process, PVOID base) {
// -----------------------------------------------------------------------
NTSTATUS WINAPI TargetNtSetInformationThread64(
- HANDLE thread, THREAD_INFORMATION_CLASS thread_info_class,
+ HANDLE thread, NT_THREAD_INFORMATION_CLASS thread_info_class,
PVOID thread_information, ULONG thread_information_bytes) {
NtSetInformationThreadFunction orig_fn = reinterpret_cast<
NtSetInformationThreadFunction>(g_originals[SET_INFORMATION_THREAD_ID]);
diff --git a/sandbox/src/interceptors_64.h b/sandbox/src/interceptors_64.h
index b5134ed..50355a0 100644
--- a/sandbox/src/interceptors_64.h
+++ b/sandbox/src/interceptors_64.h
@@ -31,7 +31,7 @@ SANDBOX_INTERCEPT NTSTATUS WINAPI TargetNtUnmapViewOfSection64(HANDLE process,
// Interception of NtSetInformationThread on the child process.
SANDBOX_INTERCEPT NTSTATUS WINAPI TargetNtSetInformationThread64(
- HANDLE thread, THREAD_INFORMATION_CLASS thread_info_class,
+ HANDLE thread, NT_THREAD_INFORMATION_CLASS thread_info_class,
PVOID thread_information, ULONG thread_information_bytes);
// Interception of NtOpenThreadToken on the child process.
diff --git a/sandbox/src/nt_internals.h b/sandbox/src/nt_internals.h
index e0bc6e3..fe4fcd6 100644
--- a/sandbox/src/nt_internals.h
+++ b/sandbox/src/nt_internals.h
@@ -263,7 +263,7 @@ typedef NTSTATUS (WINAPI *NtOpenProcessFunction) (
IN POBJECT_ATTRIBUTES ObjectAttributes,
IN PCLIENT_ID ClientId);
-typedef enum _THREAD_INFORMATION_CLASS {
+typedef enum _NT_THREAD_INFORMATION_CLASS {
ThreadBasicInformation,
ThreadTimes,
ThreadPriority,
@@ -282,11 +282,11 @@ typedef enum _THREAD_INFORMATION_CLASS {
ThreadSetTlsArrayAddress,
ThreadIsIoPending,
ThreadHideFromDebugger
-} THREAD_INFORMATION_CLASS, *PTHREAD_INFORMATION_CLASS;
+} NT_THREAD_INFORMATION_CLASS, *PNT_THREAD_INFORMATION_CLASS;
typedef NTSTATUS (WINAPI *NtSetInformationThreadFunction) (
IN HANDLE ThreadHandle,
- IN THREAD_INFORMATION_CLASS ThreadInformationClass,
+ IN NT_THREAD_INFORMATION_CLASS ThreadInformationClass,
IN PVOID ThreadInformation,
IN ULONG ThreadInformationLength);
diff --git a/sandbox/src/policy_target.cc b/sandbox/src/policy_target.cc
index 1076d64..aa69892 100644
--- a/sandbox/src/policy_target.cc
+++ b/sandbox/src/policy_target.cc
@@ -72,7 +72,7 @@ bool QueryBroker(int ipc_id, CountedParameterSetBase* params) {
// called before the actual call to LowerToken.
NTSTATUS WINAPI TargetNtSetInformationThread(
NtSetInformationThreadFunction orig_SetInformationThread, HANDLE thread,
- THREAD_INFORMATION_CLASS thread_info_class, PVOID thread_information,
+ NT_THREAD_INFORMATION_CLASS thread_info_class, PVOID thread_information,
ULONG thread_information_bytes) {
do {
if (SandboxFactory::GetTargetServices()->GetState()->RevertedToSelf())
diff --git a/sandbox/src/policy_target.h b/sandbox/src/policy_target.h
index febe395..4a77b47 100644
--- a/sandbox/src/policy_target.h
+++ b/sandbox/src/policy_target.h
@@ -22,7 +22,7 @@ extern "C" {
// It should never be called directly.
SANDBOX_INTERCEPT NTSTATUS WINAPI TargetNtSetInformationThread(
NtSetInformationThreadFunction orig_SetInformationThread, HANDLE thread,
- THREAD_INFORMATION_CLASS thread_info_class, PVOID thread_information,
+ NT_THREAD_INFORMATION_CLASS thread_info_class, PVOID thread_information,
ULONG thread_information_bytes);
// Interception of NtOpenThreadToken on the child process.