Enable handle tracing in Canary, Dev, and all debug builds of Chrome (Windows only).

BUG=131699,153148


Review URL: https://chromiumcodereview.appspot.com/11035012

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

1 files changed, 11 insertions, 6 deletions

diff --git a/sandbox/win/src/handle_closer_agent.cc b/sandbox/win/src/handle_closer_agent.cc
index be262e8..b7e872c 100644
--- a/sandbox/win/src/handle_closer_agent.cc
+++ b/sandbox/win/src/handle_closer_agent.cc
@@ -10,6 +10,12 @@
 
 namespace {
 
+int QueryObjectTypeInformationFilter(EXCEPTION_POINTERS* exception_pointers,
+                                     NTSTATUS* exception_code) {
+  *exception_code = exception_pointers->ExceptionRecord->ExceptionCode;
+  return EXCEPTION_EXECUTE_HANDLER;
+}
+
 // Returns type infomation for an NT object. This routine is expected to be
 // called for invalid handles so it catches STATUS_INVALID_HANDLE exceptions
 // that can be generated when handle tracing is enabled.
@@ -20,14 +26,13 @@ NTSTATUS QueryObjectTypeInformation(HANDLE handle,
   if (!QueryObject)
     ResolveNTFunctionPtr("NtQueryObject", &QueryObject);
 
-  NTSTATUS status = STATUS_UNSUCCESSFUL;
+  NTSTATUS exception_code = STATUS_UNSUCCESSFUL;
   __try {
-    status = QueryObject(handle, ObjectTypeInformation, buffer, *size, size);
-  } __except(GetExceptionCode() == STATUS_INVALID_HANDLE ?
-                 EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) {
-    status = STATUS_INVALID_HANDLE;
+    return QueryObject(handle, ObjectTypeInformation, buffer, *size, size);
+  } __except(QueryObjectTypeInformationFilter(GetExceptionInformation(),
+                                              &exception_code)) {
+    return exception_code;
   }
-  return status;
 }
 
 }  // namespace