| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/app/hard_error_handler_win.h" | 5 #include "chrome/app/hard_error_handler_win.h" |
| 6 | 6 |
| 7 #if _MSC_VER <= 1600 | 7 #if defined(_WIN32_WINNT_WIN8) |
| 8 // The windows SDK now defines in FACILITY_VISUALCPP winerror.h which | 8 // The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h. |
| 9 // clashes with the older crt's definition of the same. | |
| 10 #undef FACILITY_VISUALCPP | 9 #undef FACILITY_VISUALCPP |
| 10 #endif |
| 11 #include <DelayIMP.h> | 11 #include <DelayIMP.h> |
| 12 #endif | |
| 13 | 12 |
| 14 #include <ntsecapi.h> | 13 #include <ntsecapi.h> |
| 15 #include <string> | 14 #include <string> |
| 16 | 15 |
| 17 #include "base/basictypes.h" | 16 #include "base/basictypes.h" |
| 18 #include "base/logging.h" | 17 #include "base/logging.h" |
| 19 #include "base/string_piece.h" | 18 #include "base/string_piece.h" |
| 20 #include "base/sys_string_conversions.h" | 19 #include "base/sys_string_conversions.h" |
| 21 | 20 |
| 22 namespace { | 21 namespace { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 } | 124 } |
| 126 if (ex_info->ExceptionRecord->ExceptionCode == kExceptionEntryPtNotFound) { | 125 if (ex_info->ExceptionRecord->ExceptionCode == kExceptionEntryPtNotFound) { |
| 127 if (dli->dlp.fImportByName) { | 126 if (dli->dlp.fImportByName) { |
| 128 EntryPointNotFoundHardError(dli->dlp.szProcName, dli->szDll); | 127 EntryPointNotFoundHardError(dli->dlp.szProcName, dli->szDll); |
| 129 return true; | 128 return true; |
| 130 } | 129 } |
| 131 } | 130 } |
| 132 return false; | 131 return false; |
| 133 } | 132 } |
| 134 | 133 |
| OLD | NEW |