Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: sandbox/win/src/service_resolver.cc

Issue 84063004: Restructure sandbox code to reduce dependencies pulled in by intercept code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix presubmit warning. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sandbox/win/src/service_resolver.h ('k') | sandbox/win/src/service_resolver_64.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sandbox/win/src/service_resolver.h" 5 #include "sandbox/win/src/service_resolver.h"
6 6
7 #include "base/logging.h"
8 #include "base/win/pe_image.h" 7 #include "base/win/pe_image.h"
8 #include "sandbox/win/src/internal_types.h"
9 #include "sandbox/win/src/sandbox_nt_util.h"
9 10
10 namespace sandbox { 11 namespace sandbox {
11 12
12 NTSTATUS ServiceResolverThunk::ResolveInterceptor( 13 NTSTATUS ServiceResolverThunk::ResolveInterceptor(
13 const void* interceptor_module, 14 const void* interceptor_module,
14 const char* interceptor_name, 15 const char* interceptor_name,
15 const void** address) { 16 const void** address) {
16 // After all, we are using a locally mapped version of the exe, so the 17 // After all, we are using a locally mapped version of the exe, so the
17 // action is the same as for a target function. 18 // action is the same as for a target function.
18 return ResolveTarget(interceptor_module, interceptor_name, 19 return ResolveTarget(interceptor_module, interceptor_name,
19 const_cast<void**>(address)); 20 const_cast<void**>(address));
20 } 21 }
21 22
22 // In this case all the work is done from the parent, so resolve is 23 // In this case all the work is done from the parent, so resolve is
23 // just a simple GetProcAddress. 24 // just a simple GetProcAddress.
24 NTSTATUS ServiceResolverThunk::ResolveTarget(const void* module, 25 NTSTATUS ServiceResolverThunk::ResolveTarget(const void* module,
25 const char* function_name, 26 const char* function_name,
26 void** address) { 27 void** address) {
27 DCHECK(address);
28 if (NULL == module) 28 if (NULL == module)
29 return STATUS_UNSUCCESSFUL; 29 return STATUS_UNSUCCESSFUL;
30 30
31 base::win::PEImage module_image(module); 31 base::win::PEImage module_image(module);
32 *address = module_image.GetProcAddress(function_name); 32 *address = module_image.GetProcAddress(function_name);
33 33
34 if (NULL == *address) { 34 if (NULL == *address) {
35 NOTREACHED(); 35 NOTREACHED_NT();
36 return STATUS_UNSUCCESSFUL; 36 return STATUS_UNSUCCESSFUL;
37 } 37 }
38 38
39 return STATUS_SUCCESS; 39 return STATUS_SUCCESS;
40 } 40 }
41 41
42 void ServiceResolverThunk::AllowLocalPatches() {
43 ntdll_base_ = ::GetModuleHandle(kNtdllName);
44 }
45
42 } // namespace sandbox 46 } // namespace sandbox
OLDNEW
« no previous file with comments | « sandbox/win/src/service_resolver.h ('k') | sandbox/win/src/service_resolver_64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698