back out my sbox change

TBR=nsylvain


Review URL: http://codereview.chromium.org/3132

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2353 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 18 deletions

diff --git a/sandbox/src/target_interceptions.cc b/sandbox/src/target_interceptions.cc
index 466c9ba..0bf9cd6 100644
--- a/sandbox/src/target_interceptions.cc
+++ b/sandbox/src/target_interceptions.cc
@@ -11,8 +11,6 @@
 
 namespace sandbox {
 
-SANDBOX_INTERCEPT NtExports g_nt;
-
 // Hooks NtMapViewOfSection to detect the load of DLLs. If hot patching is
 // required for this dll, this functions patches it.
 NTSTATUS WINAPI TargetNtMapViewOfSection(
@@ -43,26 +41,18 @@ NTSTATUS WINAPI TargetNtMapViewOfSection(
     if (!IsValidImageSection(section, base, offset, view_size))
       break;
 
-    UINT image_flags;
-    UNICODE_STRING* module_name =
-        GetImageInfoFromModule(reinterpret_cast<HMODULE>(*base), &image_flags);
-    UNICODE_STRING* file_name = GetBackingFilePath(*base);
+    UNICODE_STRING* module_name = GetImageNameFromModule(
+                                      reinterpret_cast<HMODULE>(*base));
 
-    if ((!module_name) && (image_flags & MODULE_HAS_CODE)) {
-      // If the module has no exports we retrieve the module name from the
-      // full path of the mapped section.
-      module_name = ExtractModuleName(file_name);
-    }
+    if (!module_name)
+      break;
+
+    UNICODE_STRING* file_name = GetBackingFilePath(*base);
 
     InterceptionAgent* agent = InterceptionAgent::GetInterceptionAgent();
 
-    if (agent) {
-      if (!agent->OnDllLoad(file_name, module_name, image_flags, *base)) {
-        // Interception agent is demanding to un-map the module.
-        g_nt.UnmapViewOfSection(process, *base);
-        ret = STATUS_UNSUCCESSFUL;
-      }
-    }
+    if (agent)
+      agent->OnDllLoad(file_name, module_name, *base);
 
     if (module_name)
       operator delete(module_name, NT_ALLOC);