diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/base/win/win_util.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/win/win_util.cc')
| -rw-r--r-- | chromium/base/win/win_util.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/chromium/base/win/win_util.cc b/chromium/base/win/win_util.cc index 00f4e23c957..30a7a3a1e87 100644 --- a/chromium/base/win/win_util.cc +++ b/chromium/base/win/win_util.cc @@ -43,6 +43,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/win/registry.h" +#include "base/win/scoped_co_mem.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_propvariant.h" @@ -63,7 +64,19 @@ bool SetPropVariantValueForPropertyStore( HRESULT result = property_store->SetValue(property_key, property_value.get()); if (result == S_OK) result = property_store->Commit(); - return SUCCEEDED(result); + if (SUCCEEDED(result)) + return true; +#if DCHECK_IS_ON() + ScopedCoMem<OLECHAR> guidString; + ::StringFromCLSID(property_key.fmtid, &guidString); + if (HRESULT_FACILITY(result) == FACILITY_WIN32) + ::SetLastError(HRESULT_CODE(result)); + // See third_party/perl/c/i686-w64-mingw32/include/propkey.h for GUID and + // PID definitions. + DPLOG(ERROR) << "Failed to set property with GUID " << guidString << " PID " + << property_key.pid; +#endif + return false; } void __cdecl ForceCrashOnSigAbort(int) { |