OLD | NEW |
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 | 125 |
126 // Find something we know is a code address and confirm expected memory | 126 // Find something we know is a code address and confirm expected memory |
127 // information settings. | 127 // information settings. |
128 VerifyAddressInInCodePage(process_info, | 128 VerifyAddressInInCodePage(process_info, |
129 reinterpret_cast<WinVMAddress>(_ReturnAddress())); | 129 reinterpret_cast<WinVMAddress>(_ReturnAddress())); |
130 } | 130 } |
131 | 131 |
132 void TestOtherProcess(const base::string16& directory_modification) { | 132 void TestOtherProcess(const base::string16& directory_modification) { |
133 ProcessInfo process_info; | 133 ProcessInfo process_info; |
134 | 134 |
135 UUID done_uuid(UUID::InitializeWithNewTag{}); | 135 UUID done_uuid; |
| 136 done_uuid.InitializeWithNew(); |
136 | 137 |
137 ScopedKernelHANDLE done( | 138 ScopedKernelHANDLE done( |
138 CreateEvent(nullptr, true, false, done_uuid.ToString16().c_str())); | 139 CreateEvent(nullptr, true, false, done_uuid.ToString16().c_str())); |
139 ASSERT_TRUE(done.get()); | 140 ASSERT_TRUE(done.get()); |
140 | 141 |
141 base::FilePath test_executable = Paths::Executable(); | 142 base::FilePath test_executable = Paths::Executable(); |
142 | 143 |
143 std::wstring child_test_executable = | 144 std::wstring child_test_executable = |
144 test_executable.DirName() | 145 test_executable.DirName() |
145 .Append(directory_modification) | 146 .Append(directory_modification) |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
640 EXPECT_TRUE( | 641 EXPECT_TRUE( |
641 info.LoggingRangeIsFullyReadable(CheckedRange<WinVMAddress, WinVMSize>( | 642 info.LoggingRangeIsFullyReadable(CheckedRange<WinVMAddress, WinVMSize>( |
642 reinterpret_cast<WinVMAddress>(safe_memory.get()), kAllocationSize))); | 643 reinterpret_cast<WinVMAddress>(safe_memory.get()), kAllocationSize))); |
643 EXPECT_FALSE(info.LoggingRangeIsFullyReadable( | 644 EXPECT_FALSE(info.LoggingRangeIsFullyReadable( |
644 CheckedRange<WinVMAddress, WinVMSize>(0, 1024))); | 645 CheckedRange<WinVMAddress, WinVMSize>(0, 1024))); |
645 } | 646 } |
646 | 647 |
647 } // namespace | 648 } // namespace |
648 } // namespace test | 649 } // namespace test |
649 } // namespace crashpad | 650 } // namespace crashpad |
OLD | NEW |