Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: util/win/module_version.cc

Issue 1357833002: win: Get Crashpad compiling under VS2015 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: include Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « util/win/exception_handler_server.cc ('k') | util/win/process_info.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 17 matching lines...) Expand all
28 if (!size) { 28 if (!size) {
29 PLOG(WARNING) << "GetFileVersionInfoSize: " 29 PLOG(WARNING) << "GetFileVersionInfoSize: "
30 << base::UTF16ToUTF8(path.value()); 30 << base::UTF16ToUTF8(path.value());
31 } else { 31 } else {
32 scoped_ptr<uint8_t[]> data(new uint8_t[size]); 32 scoped_ptr<uint8_t[]> data(new uint8_t[size]);
33 if (!GetFileVersionInfo(path.value().c_str(), 0, size, data.get())) { 33 if (!GetFileVersionInfo(path.value().c_str(), 0, size, data.get())) {
34 PLOG(WARNING) << "GetFileVersionInfo: " 34 PLOG(WARNING) << "GetFileVersionInfo: "
35 << base::UTF16ToUTF8(path.value()); 35 << base::UTF16ToUTF8(path.value());
36 } else { 36 } else {
37 VS_FIXEDFILEINFO* fixed_file_info; 37 VS_FIXEDFILEINFO* fixed_file_info;
38 UINT size; 38 UINT ffi_size;
39 if (!VerQueryValue(data.get(), 39 if (!VerQueryValue(data.get(),
40 L"\\", 40 L"\\",
41 reinterpret_cast<void**>(&fixed_file_info), 41 reinterpret_cast<void**>(&fixed_file_info),
42 &size)) { 42 &ffi_size)) {
43 PLOG(WARNING) << "VerQueryValue"; 43 PLOG(WARNING) << "VerQueryValue";
44 } else { 44 } else {
45 *vs_fixedfileinfo = *fixed_file_info; 45 *vs_fixedfileinfo = *fixed_file_info;
46 vs_fixedfileinfo->dwFileFlags &= vs_fixedfileinfo->dwFileFlagsMask; 46 vs_fixedfileinfo->dwFileFlags &= vs_fixedfileinfo->dwFileFlagsMask;
47 return true; 47 return true;
48 } 48 }
49 } 49 }
50 } 50 }
51 51
52 return false; 52 return false;
53 } 53 }
54 54
55 } // namespace crashpad 55 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/win/exception_handler_server.cc ('k') | util/win/process_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698