diff options
| author | nsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 16:18:10 +0000 |
|---|---|---|
| committer | nsylvain@google.com <nsylvain@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 16:18:10 +0000 |
| commit | edd909b4e2e3869676b4a1720088803065a63653 (patch) | |
| tree | 038b0316a43f39b4eec7ba9b087f2d25f1aaff04 /sandbox/src | |
| parent | 9394fa97725f4f4af43d445c29c71fbd6e555283 (diff) | |
| download | chromium_src-edd909b4e2e3869676b4a1720088803065a63653.zip chromium_src-edd909b4e2e3869676b4a1720088803065a63653.tar.gz chromium_src-edd909b4e2e3869676b4a1720088803065a63653.tar.bz2 | |
Fix the sandbox when used with the SANDBOX_EXPORTS define.
Review URL: http://codereview.chromium.org/266
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src')
| -rw-r--r-- | sandbox/src/filesystem_interception.h | 6 | ||||
| -rw-r--r-- | sandbox/src/policy_broker.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sandbox/src/filesystem_interception.h b/sandbox/src/filesystem_interception.h index faac0a4..2c336e2 100644 --- a/sandbox/src/filesystem_interception.h +++ b/sandbox/src/filesystem_interception.h @@ -28,20 +28,20 @@ SANDBOX_INTERCEPT NTSTATUS WINAPI TargetNtOpenFile( // Interception of NtQueryAtttributesFile on the child process. // It should never be called directly. -NTSTATUS WINAPI TargetNtQueryAttributesFile( +SANDBOX_INTERCEPT NTSTATUS WINAPI TargetNtQueryAttributesFile( NtQueryAttributesFileFunction orig_QueryAttributes, POBJECT_ATTRIBUTES object_attributes, PFILE_BASIC_INFORMATION file_attributes); // Interception of NtQueryFullAtttributesFile on the child process. // It should never be called directly. -NTSTATUS WINAPI TargetNtQueryFullAttributesFile( +SANDBOX_INTERCEPT NTSTATUS WINAPI TargetNtQueryFullAttributesFile( NtQueryFullAttributesFileFunction orig_QueryAttributes, POBJECT_ATTRIBUTES object_attributes, PFILE_NETWORK_OPEN_INFORMATION file_attributes); // Interception of NtSetInformationFile on the child process. -NTSTATUS WINAPI TargetNtSetInformationFile( +SANDBOX_INTERCEPT NTSTATUS WINAPI TargetNtSetInformationFile( NtSetInformationFileFunction orig_SetInformationFile, HANDLE file, PIO_STATUS_BLOCK io_status, PVOID file_information, ULONG length, FILE_INFORMATION_CLASS file_information_class); diff --git a/sandbox/src/policy_broker.h b/sandbox/src/policy_broker.h index 84ced58..8f0adc3 100644 --- a/sandbox/src/policy_broker.h +++ b/sandbox/src/policy_broker.h @@ -25,15 +25,15 @@ bool SetupNtdllImports(TargetProcess *child); // underscore and the number of bytes to pop out of the stack) #if SANDBOX_EXPORTS #define INTERCEPT_NT(manager, service, exported_target) \ - (&Target##service) ? \ + ((&Target##service) ? \ manager->AddToPatchedFunctions(kNtdllName, #service, \ sandbox::INTERCEPTION_SERVICE_CALL, \ - exported_target) : false + exported_target) : false) #define INTERCEPT_EAT(manager, dll, function, exported_target) \ - (&Target##function) ? \ + ((&Target##function) ? \ manager->AddToPatchedFunctions(dll, #function, sandbox::INTERCEPTION_EAT, \ - exported_target) : false + exported_target) : false) #else #define INTERCEPT_NT(manager, service, exported_target) \ manager->AddToPatchedFunctions(kNtdllName, #service, \ |