Cleanup code used to diagnose and fix bug 81449.

base/process_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/process.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "base/win/windows_version.h"
 
 namespace base {
 
 void Process::Close() {
   if (!process_)
     return;
+
   // Don't call CloseHandle on a pseudo-handle.
-  if (process_ != ::GetCurrentProcess()) {
-    // TODO(apatrick): Call NtCloseHandle directly, without going through the
-    // import table to determine if CloseHandle is being hooked.
-    // http://crbug.com/81449.
-    HMODULE module = GetModuleHandle(L"ntdll.dll");
-    typedef UINT (WINAPI *CloseHandlePtr)(HANDLE handle);
-    CloseHandlePtr close_handle = reinterpret_cast<CloseHandlePtr>(
-        GetProcAddress(module, "NtClose"));
-    close_handle(process_);
-
-    // It used to look like this:
-    // ::CloseHandle(process_);
-  }
+  if (process_ != ::GetCurrentProcess())
+    ::CloseHandle(process_);
 
   process_ = NULL;
 }
 
 void Process::Terminate(int result_code) {
   if (!process_)
     return;
 
-  // TODO(apatrick): Call NtTerminateProcess directly, without going through the
-  // import table to determine if TerminateProcess is being hooked.
-  // http://crbug.com/81449.
+  // Call NtTerminateProcess directly, without going through the import table,
+  // which might have been hooked with a buggy replacement by third party
+  // software. http://crbug.com/81449.
   HMODULE module = GetModuleHandle(L"ntdll.dll");
   typedef UINT (WINAPI *TerminateProcessPtr)(HANDLE handle, UINT code);
   TerminateProcessPtr terminate_process = reinterpret_cast<TerminateProcessPtr>(
       GetProcAddress(module, "NtTerminateProcess"));
   terminate_process(process_, result_code);
-
-  // It used to look like this:
-  // ::TerminateProcess(process_, result_code);
 }
 
 bool Process::IsProcessBackgrounded() const {
   if (!process_)
     return false;  // Failure case.
   DWORD priority = GetPriority();
   if (priority == 0)
     return false;  // Failure case.
   return ((priority == BELOW_NORMAL_PRIORITY_CLASS) ||
           (priority == IDLE_PRIORITY_CLASS));
@@ skipping 32 matching lines @@
 Process Process::Current() {
   return Process(::GetCurrentProcess());
 }
 
 int Process::GetPriority() const {
   DCHECK(process_);
   return ::GetPriorityClass(process_);
 }
 
 }  // namespace base