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

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

Issue 1405323003: win: Add and use GET_FUNCTION() and GET_FUNCTION_REQUIRED() (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Address review feedback Created 5 years, 2 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/get_function.h ('k') | util/win/get_function_test.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,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "snapshot/minidump/minidump_string_reader.h" 15 #include "util/win/get_function.h"
16 16
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "minidump/minidump_extensions.h" 18 #include "base/strings/utf_string_conversions.h"
19 19
20 namespace crashpad { 20 namespace crashpad {
21 namespace internal { 21 namespace internal {
22 22
23 bool ReadMinidumpUTF8String(FileReaderInterface* file_reader, 23 FARPROC GetFunctionInternal(
24 RVA rva, 24 const wchar_t* library, const char* function, bool required) {
25 std::string* string) { 25 HMODULE module = LoadLibrary(library);
26 if (rva == 0) { 26 DPCHECK(!required || module) << "LoadLibrary " << base::UTF16ToUTF8(library);
27 string->clear(); 27 if (!module) {
28 return true; 28 return nullptr;
29 } 29 }
30 30
31 if (!file_reader->SeekSet(rva)) { 31 // Strip off any leading :: that may have come from stringifying the
32 return false; 32 // function’s name.
33 if (function[0] == ':' && function[1] == ':' &&
34 function[2] && function[2] != ':') {
35 function += 2;
33 } 36 }
34 37
35 uint32_t string_size; 38 FARPROC proc = GetProcAddress(module, function);
36 if (!file_reader->ReadExactly(&string_size, sizeof(string_size))) { 39 DPCHECK(!required || proc) << "GetProcAddress " << function;
37 return false; 40 return proc;
38 }
39
40 std::string local_string(string_size, '\0');
41 if (!file_reader->ReadExactly(&local_string[0], string_size)) {
42 return false;
43 }
44
45 string->swap(local_string);
46 return true;
47 } 41 }
48 42
49 } // namespace internal 43 } // namespace internal
50 } // namespace crashpad 44 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/win/get_function.h ('k') | util/win/get_function_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698