| Index: util/win/module_version.cc
|
| diff --git a/util/win/module_version.cc b/util/win/module_version.cc
|
| index bcd98c0e4205251cc96b86d6c9263a023ea2b307..f49df0cddabc5cfe093f08280d2f8f2e4c20cce4 100644
|
| --- a/util/win/module_version.cc
|
| +++ b/util/win/module_version.cc
|
| @@ -26,30 +26,31 @@ bool GetModuleVersionAndType(const base::FilePath& path,
|
| VS_FIXEDFILEINFO* vs_fixedfileinfo) {
|
| DWORD size = GetFileVersionInfoSize(path.value().c_str(), nullptr);
|
| if (!size) {
|
| - PLOG(WARNING) << "GetFileVersionInfoSize: "
|
| + PLOG_IF(WARNING, GetLastError() != ERROR_RESOURCE_TYPE_NOT_FOUND)
|
| + << "GetFileVersionInfoSize: " << base::UTF16ToUTF8(path.value());
|
| + return false;
|
| + }
|
| +
|
| + scoped_ptr<uint8_t[]> data(new uint8_t[size]);
|
| + if (!GetFileVersionInfo(path.value().c_str(), 0, size, data.get())) {
|
| + PLOG(WARNING) << "GetFileVersionInfo: "
|
| << base::UTF16ToUTF8(path.value());
|
| - } else {
|
| - scoped_ptr<uint8_t[]> data(new uint8_t[size]);
|
| - if (!GetFileVersionInfo(path.value().c_str(), 0, size, data.get())) {
|
| - PLOG(WARNING) << "GetFileVersionInfo: "
|
| - << base::UTF16ToUTF8(path.value());
|
| - } else {
|
| - VS_FIXEDFILEINFO* fixed_file_info;
|
| - UINT ffi_size;
|
| - if (!VerQueryValue(data.get(),
|
| - L"\\",
|
| - reinterpret_cast<void**>(&fixed_file_info),
|
| - &ffi_size)) {
|
| - PLOG(WARNING) << "VerQueryValue";
|
| - } else {
|
| - *vs_fixedfileinfo = *fixed_file_info;
|
| - vs_fixedfileinfo->dwFileFlags &= vs_fixedfileinfo->dwFileFlagsMask;
|
| - return true;
|
| - }
|
| - }
|
| + return false;
|
| + }
|
| +
|
| + VS_FIXEDFILEINFO* fixed_file_info;
|
| + UINT ffi_size;
|
| + if (!VerQueryValue(data.get(),
|
| + L"\\",
|
| + reinterpret_cast<void**>(&fixed_file_info),
|
| + &ffi_size)) {
|
| + PLOG(WARNING) << "VerQueryValue";
|
| + return false;
|
| }
|
|
|
| - return false;
|
| + *vs_fixedfileinfo = *fixed_file_info;
|
| + vs_fixedfileinfo->dwFileFlags &= vs_fixedfileinfo->dwFileFlagsMask;
|
| + return true;
|
| }
|
|
|
| } // namespace crashpad
|
|
|